[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 30/74] ahci: Move QOM macros to header
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 30/74] ahci: Move QOM macros to header |
Date: |
Tue, 25 Aug 2020 15:20:26 -0400 |
The TYPE_* constants and the typedefs are defined in ahci.h, so
we can move the type checking macros there too.
This will make future conversion to OBJECT_DECLARE* easier.
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: John Snow <jsnow@redhat.com>
Cc: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org
---
hw/ide/ahci_internal.h | 5 -----
include/hw/ide/ahci.h | 3 +++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
index bab0459774..ac9bdead7b 100644
--- a/hw/ide/ahci_internal.h
+++ b/hw/ide/ahci_internal.h
@@ -332,9 +332,6 @@ struct AHCIPCIState {
AHCIState ahci;
};
-#define ICH_AHCI(obj) \
- OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)
-
extern const VMStateDescription vmstate_ahci;
#define VMSTATE_AHCI(_field, _state) { \
@@ -394,6 +391,4 @@ void ahci_uninit(AHCIState *s);
void ahci_reset(AHCIState *s);
-#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)
-
#endif /* HW_IDE_AHCI_INTERNAL_H */
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index b44e3000cf..ce2bf8a5f8 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -53,11 +53,14 @@ typedef struct AHCIState {
typedef struct AHCIPCIState AHCIPCIState;
#define TYPE_ICH9_AHCI "ich9-ahci"
+#define ICH_AHCI(obj) \
+ OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)
int32_t ahci_get_num_ports(PCIDevice *dev);
void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd);
#define TYPE_SYSBUS_AHCI "sysbus-ahci"
+#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)
typedef struct SysbusAHCIState {
/*< private >*/
--
2.26.2
- [PATCH v3 20/74] mcf_fec: Move mcf_fec_state typedef to header, (continued)
- [PATCH v3 20/74] mcf_fec: Move mcf_fec_state typedef to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 21/74] s390_flic: Move KVMS390FLICState typedef to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 22/74] can_emu: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/25
- [PATCH v3 24/74] platform-bus: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/25
- [PATCH v3 26/74] xen-legacy-backend: Add missing typedef XenLegacyDevice, Eduardo Habkost, 2020/08/25
- [PATCH v3 28/74] s390x: Move typedef SCLPEventFacility to event-facility.h, Eduardo Habkost, 2020/08/25
- [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 <=
- [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, 2020/08/25
- [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