[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 36/58] piix: Move QOM macros to header
From: |
Eduardo Habkost |
Subject: |
[PATCH v2 36/58] piix: Move QOM macros to header |
Date: |
Wed, 19 Aug 2020 20:12:14 -0400 |
This will make future conversion to OBJECT_DECLARE* easier.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
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 v2 31/58] i8257: Move QOM macro to header, (continued)
- [PATCH v2 31/58] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 32/58] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 33/58] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 34/58] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/19
- [PATCH v2 35/58] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 36/58] piix: Move QOM macros to header,
Eduardo Habkost <=
- [PATCH v2 37/58] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 38/58] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 39/58] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 40/58] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/19