From: Thomas Huth Date: Mon, 25 Feb 2019 11:59:30 +0000 (+0100) Subject: block/nvme: Remove QEMU_PACKED from naturally aligned NVMeRegs struct X-Git-Tag: v4.0.0~133^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=83c68e149a9365a3db6de751f219ad1d79928462;p=mirror_qemu.git block/nvme: Remove QEMU_PACKED from naturally aligned NVMeRegs struct The QEMU_PACKED is causing a compiler warning/error with GCC 9: CC block/nvme.o block/nvme.c: In function ‘nvme_create_queue_pair’: block/nvme.c:209:22: error: taking address of packed member of ‘struct ’ may result in an unaligned pointer value [-Werror=address-of-packed-member] 209 | q->sq.doorbell = &s->regs->doorbells[idx * 2 * s->doorbell_scale]; All members of the struct are naturally aligned, so there should not be the need for QEMU_PACKED here, and the following QEMU_BUILD_BUG_ON also ensures that there is no padding. Thus simply remove the QEMU_PACKED here. Buglink: https://bugs.launchpad.net/qemu/+bug/1817525 Reported-by: Satheesh Rajendran Signed-off-by: Thomas Huth Reviewed-by: Peter Maydell Signed-off-by: Kevin Wolf --- diff --git a/block/nvme.c b/block/nvme.c index b5952c9b08..6c2ce7dfa5 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -82,7 +82,7 @@ typedef volatile struct { uint8_t reserved1[0xec0]; uint8_t cmd_set_specfic[0x100]; uint32_t doorbells[]; -} QEMU_PACKED NVMeRegs; +} NVMeRegs; QEMU_BUILD_BUG_ON(offsetof(NVMeRegs, doorbells) != 0x1000);