diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-22 10:32:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-22 10:32:58 +0000 |
| commit | f7c6b96c3e639e871bb929038a1b82ded7f39437 (patch) | |
| tree | 685e6f29252f91934753e6f703f9bf6f5b8f6b12 /include/hw | |
| parent | b384cd95eb9c6f73ad84ed1bb0717a26e29cc78f (diff) | |
| parent | 3161906df88a471b09c38fff9a618ff83beea0c3 (diff) | |
| download | qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.zip qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.tar.gz qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri 19 Jan 2018 22:31:27 GMT
# gpg: using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
hw/ide: Remove duplicated definitions from ahci_internal.h
ide: abort TRIM operation for invalid range
ide: move ide_sect_range_ok() up
ide: pass IDEState to trim AIO callback
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/ide/ahci.h | 6 |
1 files changed, 0 insertions, 6 deletions
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 |