[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 11/31] virtio-scsi: Fix build with gcc 9
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL v2 11/31] virtio-scsi: Fix build with gcc 9 |
Date: |
Mon, 11 Mar 2019 17:55:15 +0100 |
From: Greg Kurz <address@hidden>
Build fails with gcc 9:
CC ppc64-softmmu/hw/scsi/virtio-scsi.o
hw/scsi/virtio-scsi.c: In function ‘virtio_scsi_do_tmf’:
hw/scsi/virtio-scsi.c:265:39: error: taking address of packed member of
‘struct virtio_scsi_ctrl_tmf_req’ may result in an unaligned pointer value
[-Werror=address-of-packed-member]
265 | virtio_tswap32s(VIRTIO_DEVICE(s), &req->req.tmf.subtype);
| ^~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
All the fields in struct virtio_scsi_ctrl_tmf_req are naturally aligned,
so we could in theory drop QEMU_PACKED. Unfortunately, the header file
is imported from linux which already has the packed attribute. Trying to
fix that in the update-linux-headers.sh script is likely to produce
ugliness. Turn the call to virtio_tswap32s() into an assignment instead.
Signed-off-by: Greg Kurz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index ce99d28..839f120 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -262,7 +262,13 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq
*req)
/* Here VIRTIO_SCSI_S_OK means "FUNCTION COMPLETE". */
req->resp.tmf.response = VIRTIO_SCSI_S_OK;
- virtio_tswap32s(VIRTIO_DEVICE(s), &req->req.tmf.subtype);
+ /*
+ * req->req.tmf has the QEMU_PACKED attribute. Don't use virtio_tswap32s()
+ * to avoid compiler errors.
+ */
+ req->req.tmf.subtype =
+ virtio_tswap32(VIRTIO_DEVICE(s), req->req.tmf.subtype);
+
switch (req->req.tmf.subtype) {
case VIRTIO_SCSI_T_TMF_ABORT_TASK:
case VIRTIO_SCSI_T_TMF_QUERY_TASK:
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/31] Misc patches for 2019-03-09, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 01/31] memory: Do not update coalesced IO range in the case of NOP, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 03/31] riscv/Kconfig: enable PCI_DEVICES, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 02/31] vfio-pci: enable by default, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 04/31] tests: test-qgraph: fix a memory leak, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 05/31] hw/i386/pc: run the multiboot loader before the PVH loader, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 06/31] block/iscsi: Restrict Linux-specific code, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 07/31] contrib/elf2dmp: add kernel start address checking, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 08/31] configure: Enable werror for git worktrees, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 10/31] i386: extended the cpuid_level when Intel PT is enabled, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 11/31] virtio-scsi: Fix build with gcc 9,
Paolo Bonzini <=
- [Qemu-devel] [PULL v2 15/31] build: get rid of target-obj-y, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 12/31] lsi: implement basic SBCL functionality, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 09/31] target-i386: add kvm stubs to user-mode emulators, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 13/31] lsi: check if SIGP bit is already set in Wait reselect, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 14/31] update copyright notice, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 16/31] build: remove unnecessary assignments from Makefile.target, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 17/31] build: clean trace/generated-helpers.c, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 19/31] oslib-posix: Ignore fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 18/31] accel: Allow to build QEMU without TCG or KVM support, Paolo Bonzini, 2019/03/11
- [Qemu-devel] [PULL v2 21/31] scsi-disk: Fix crash if request is invaild or disk is no medium, Paolo Bonzini, 2019/03/11