[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 32/74] ahci: Move QOM macro to header
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 32/74] ahci: Move QOM macro to header |
Date: |
Tue, 25 Aug 2020 15:20:28 -0400 |
Move the ALLWINNER_AHCI macro close to the TYPE_ALLWINNER_AHCI
define.
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
---
include/hw/ide/ahci.h | 2 ++
hw/ide/ahci-allwinner.c | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index ce2bf8a5f8..41bb517047 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -72,6 +72,8 @@ typedef struct SysbusAHCIState {
} SysbusAHCIState;
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
+#define ALLWINNER_AHCI(obj) \
+ OBJECT_CHECK(AllwinnerAHCIState, (obj), TYPE_ALLWINNER_AHCI)
#define ALLWINNER_AHCI_MMIO_OFF 0x80
#define ALLWINNER_AHCI_MMIO_SIZE 0x80
diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index 8536b9eb5a..227e747ba7 100644
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -25,9 +25,6 @@
#include "trace.h"
-#define ALLWINNER_AHCI(obj) \
- OBJECT_CHECK(AllwinnerAHCIState, (obj), TYPE_ALLWINNER_AHCI)
-
#define ALLWINNER_AHCI_BISTAFR ((0xa0 - ALLWINNER_AHCI_MMIO_OFF) / 4)
#define ALLWINNER_AHCI_BISTCR ((0xa4 - ALLWINNER_AHCI_MMIO_OFF) / 4)
#define ALLWINNER_AHCI_BISTFCTR ((0xa8 - ALLWINNER_AHCI_MMIO_OFF) / 4)
--
2.26.2
- [PATCH v3 22/74] can_emu: Delete macros for non-existing typedef, (continued)
- [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, 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 <=
- [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
- [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