diff options
| author | Peter Maydell | 2018-01-22 11:32:58 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-22 11:32:58 +0100 |
| commit | f7c6b96c3e639e871bb929038a1b82ded7f39437 (patch) | |
| tree | 685e6f29252f91934753e6f703f9bf6f5b8f6b12 /hw/ide/ahci_internal.h | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request... (diff) | |
| parent | hw/ide: Remove duplicated definitions from ahci_internal.h (diff) | |
| download | qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.tar.gz qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.tar.xz qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.zip | |
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 'hw/ide/ahci_internal.h')
| -rw-r--r-- | hw/ide/ahci_internal.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h index ce2e818c8c..8c755d4ca1 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) |