diff options
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/ahci.h | 6 | ||||
| -rw-r--r-- | hw/ide/atapi.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 832539c..3c29d93 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -244,13 +244,13 @@ typedef struct AHCICmdHdr { uint32_t status; uint64_t tbl_addr; uint32_t reserved[4]; -} __attribute__ ((packed)) AHCICmdHdr; +} QEMU_PACKED AHCICmdHdr; typedef struct AHCI_SG { uint64_t addr; uint32_t reserved; uint32_t flags_size; -} __attribute__ ((packed)) AHCI_SG; +} QEMU_PACKED AHCI_SG; typedef struct AHCIDevice AHCIDevice; @@ -321,7 +321,7 @@ typedef struct NCQFrame { uint8_t reserved8; uint8_t reserved9; uint8_t reserved10; -} __attribute__ ((packed)) NCQFrame; +} QEMU_PACKED NCQFrame; void ahci_init(AHCIState *s, DeviceState *qdev, int ports); void ahci_uninit(AHCIState *s); diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index c552320..f38d289 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -557,13 +557,13 @@ static void cmd_get_event_status_notification(IDEState *s, uint8_t reserved3[2]; uint16_t len; uint8_t control; - } __attribute__((packed)) *gesn_cdb; + } QEMU_PACKED *gesn_cdb; struct { uint16_t len; uint8_t notification_class; uint8_t supported_events; - } __attribute((packed)) *gesn_event_header; + } QEMU_PACKED *gesn_event_header; enum notification_class_request_type { NCR_RESERVED1 = 1 << 0, |