diff options
| author | John Snow <jsnow@redhat.com> | 2017-12-08 15:04:02 -0500 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2018-01-19 16:04:57 -0500 |
| commit | 3161906df88a471b09c38fff9a618ff83beea0c3 (patch) | |
| tree | 685e6f29252f91934753e6f703f9bf6f5b8f6b12 | |
| parent | 947858b0ba97f4ec097de667e45eff99212867c3 (diff) | |
| download | qemu-3161906df88a471b09c38fff9a618ff83beea0c3.zip qemu-3161906df88a471b09c38fff9a618ff83beea0c3.tar.gz qemu-3161906df88a471b09c38fff9a618ff83beea0c3.tar.bz2 | |
hw/ide: Remove duplicated definitions from ahci_internal.h
The same definitions can also be found in include/hw/ide/ahci.h
so let's remove these #defines from ahci_internal.h.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1512457825-3847-1-git-send-email-thuth@redhat.com
[Maintainer edit: publicize object names, privatize object macros.]
Signed-off-by: John Snow <jsnow@redhat.com>
| -rw-r--r-- | hw/ide/ahci_internal.h | 4 | ||||
| -rw-r--r-- | include/hw/ide/ahci.h | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index ce2e818..8c755d4 100644 --- a/hw/ide/ahci_internal.h +++ b/hw/ide/ahci_internal.h @@ -311,8 +311,6 @@ struct AHCIPCIState { AHCIState ahci; }; -#define TYPE_ICH9_AHCI "ich9-ahci" - #define ICH_AHCI(obj) \ OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI) @@ -375,10 +373,8 @@ void ahci_uninit(AHCIState *s); void ahci_reset(AHCIState *s); -#define TYPE_SYSBUS_AHCI "sysbus-ahci" #define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI) -#define TYPE_ALLWINNER_AHCI "allwinner-ahci" #define ALLWINNER_AHCI(obj) OBJECT_CHECK(AllwinnerAHCIState, (obj), \ TYPE_ALLWINNER_AHCI) diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index 5a06537..b7bb2b0 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -54,14 +54,10 @@ 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 >*/ @@ -73,8 +69,6 @@ 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 |