[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 36/74] piix: Move QOM macros to header
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 36/74] piix: Move QOM macros to header |
Date: |
Tue, 25 Aug 2020 15:20:32 -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>
---
Changes v2 -> v3: none
Changes series v1 -> v2: new patch in series v2
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: "Hervé Poussineau" <hpoussin@reactos.org>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: qemu-devel@nongnu.org
---
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
- [PATCH v3 27/74] spapr: Move typedef SpaprMachineState to spapr.h, (continued)
- [PATCH v3 27/74] spapr: Move typedef SpaprMachineState to spapr.h, Eduardo Habkost, 2020/08/25
- [PATCH v3 25/74] armsse: Rename QOM macros to avoid conflicts, Eduardo Habkost, 2020/08/25
- [PATCH v3 23/74] nubus: Delete unused NUBUS_BRIDGE macro, Eduardo Habkost, 2020/08/25
- [PATCH v3 29/74] vhost-user-gpu: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 30/74] ahci: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 31/74] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 32/74] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 33/74] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 34/74] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/25
- [PATCH v3 35/74] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 36/74] piix: Move QOM macros to header,
Eduardo Habkost <=
- [PATCH v3 37/74] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 38/74] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 40/74] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 39/74] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 41/74] kvm: Move QOM macros to kvm.h, Eduardo Habkost, 2020/08/25
- [PATCH v3 42/74] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 43/74] nubus: Rename class type checking macros, Eduardo Habkost, 2020/08/25
- [PATCH v3 44/74] imx_ccm: Rename IMX_GET_CLASS macro, Eduardo Habkost, 2020/08/25