[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 35/53] piix: Move QOM macros to header
From: |
Eduardo Habkost |
Subject: |
[PULL 35/53] piix: Move QOM macros to header |
Date: |
Thu, 27 Aug 2020 15:21:04 -0400 |
This will make future conversion to OBJECT_DECLARE* easier.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-37-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/southbridge/piix.h | 4 ++++
hw/isa/piix3.c | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index 02bd741209..ac1d04ddc2 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -64,6 +64,10 @@ typedef struct PIIXState {
MemoryRegion rcr_mem;
} PIIX3State;
+#define TYPE_PIIX3_PCI_DEVICE "pci-piix3"
+#define PIIX3_PCI_DEVICE(obj) \
+ OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE)
+
extern PCIDevice *piix4_dev;
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index 1a5267e19f..587850b888 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -36,10 +36,6 @@
#define XEN_PIIX_NUM_PIRQS 128ULL
-#define TYPE_PIIX3_PCI_DEVICE "pci-piix3"
-#define PIIX3_PCI_DEVICE(obj) \
- OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE)
-
#define TYPE_PIIX3_DEVICE "PIIX3"
#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
--
2.26.2
- [PULL 28/53] vhost-user-gpu: Move QOM macro to header, (continued)
- [PULL 28/53] vhost-user-gpu: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 29/53] ahci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 24/53] armsse: Rename QOM macros to avoid conflicts, Eduardo Habkost, 2020/08/27
- [PULL 30/53] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 31/53] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 32/53] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 33/53] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/27
- [PULL 37/53] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 34/53] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 36/53] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 35/53] piix: Move QOM macros to header,
Eduardo Habkost <=
- [PULL 38/53] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 39/53] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 41/53] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 40/53] kvm: Move QOM macros to kvm.h, Eduardo Habkost, 2020/08/27
- [PULL 43/53] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro, Eduardo Habkost, 2020/08/27
- [PULL 42/53] nubus: Rename class type checking macros, Eduardo Habkost, 2020/08/27
- [PULL 44/53] swim: Rename struct SWIM to Swim, Eduardo Habkost, 2020/08/27
- [PULL 45/53] migration: Rename class type checking macros, Eduardo Habkost, 2020/08/27
- [PULL 47/53] nios2_iic: Use TYPE_ALTERA_IIC constant, Eduardo Habkost, 2020/08/27
- [PULL 46/53] etsec: Use TYPE_ETSEC_COMMON constant, Eduardo Habkost, 2020/08/27