Commit d94a6587 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging 



* remotes/bonzini/scsi-next:
  configure: Fix -lm test, so that tools can be compiled on hosts that require -lm
  virtio-scsi: scsi events must be converted to target endianness
  virtio-scsi: virtio_scsi_push_event() lacks VirtIOSCSIReq parsing

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 53a259da f80ea986

Makefile.target

+0 −4
Original line number Diff line number Diff line
@@ -163,10 +163,6 @@ dummy := $(call unnest-vars,.., \ 
all-obj-y += $(common-obj-y)

all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)



ifndef CONFIG_HAIKU

LIBS+=-lm

endif



# build either PROG or PROGW

$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a

	$(call LINK,$^)

configure

+1 −1
Original line number Diff line number Diff line
@@ -3453,7 +3453,7 @@ fi 
# Do we need libm

cat > $TMPC << EOF

#include <math.h>

int main(void) { return isnan(sin(0.0)); }

int main(int argc, char **argv) { return isnan(sin((double)argc)); }

EOF

if compile_prog "" "" ; then

  :

hw/scsi/virtio-scsi.c

+3 −9
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev, 
    VirtIOSCSIReq *req;

    VirtIOSCSIEvent *evt;

    VirtIODevice *vdev = VIRTIO_DEVICE(s);

    int in_size;



    if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) {

        return;
@@ -577,24 +576,19 @@ static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev, 
        return;

    }



    if (req->elem.out_num) {

        virtio_scsi_bad_req();

    }



    if (s->events_dropped) {

        event |= VIRTIO_SCSI_T_EVENTS_MISSED;

        s->events_dropped = false;

    }



    in_size = iov_size(req->elem.in_sg, req->elem.in_num);

    if (in_size < sizeof(VirtIOSCSIEvent)) {

    if (virtio_scsi_parse_req(req, 0, sizeof(VirtIOSCSIEvent))) {

        virtio_scsi_bad_req();

    }



    evt = &req->resp.event;

    memset(evt, 0, sizeof(VirtIOSCSIEvent));

    evt->event = event;

    evt->reason = reason;

    evt->event = virtio_tswap32(vdev, event);

    evt->reason = virtio_tswap32(vdev, reason);

    if (!dev) {

        assert(event == VIRTIO_SCSI_T_EVENTS_MISSED);

    } else {