Commit c36ed06e authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'mst/tags/for_upstream' into staging 



virtio, vhost, pc: fixes

Most notably this fixes a regression with vhost introduced by the pull before
last.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Fri 18 Nov 2016 03:51:55 PM GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* mst/tags/for_upstream:
  acpi: Use apic_id_limit when calculating legacy ACPI table size
  ipmi: fix qemu crash while migrating with ipmi
  ivshmem: Fix 64 bit memory bar configuration
  virtio: set ISR on dataplane notifications
  virtio: access ISR atomically
  virtio: introduce grab/release_ioeventfd to fix vhost
  virtio-crypto: fix virtio_queue_set_notification() race

Message-id: 1479484366-7977-1-git-send-email-mst@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents d93b1fb0 4b5b47ab

hw/block/dataplane/virtio-blk.c

+1 −3
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ static void notify_guest_bh(void *opaque) 
            unsigned i = j + ctzl(bits);

            VirtQueue *vq = virtio_get_queue(s->vdev, i);



            if (virtio_should_notify(s->vdev, vq)) {

                event_notifier_set(virtio_queue_get_guest_notifier(vq));

            }

            virtio_notify_irqfd(s->vdev, vq);



            bits &= bits - 1; /* clear right-most bit */

        }

hw/i386/acpi-build.c

+1 −1
Original line number Diff line number Diff line
@@ -2860,7 +2860,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
         */

        int legacy_aml_len =

            pcmc->legacy_acpi_table_size +

            ACPI_BUILD_LEGACY_CPU_AML_SIZE * max_cpus;

            ACPI_BUILD_LEGACY_CPU_AML_SIZE * pcms->apic_id_limit;

        int legacy_table_size =

            ROUND_UP(tables_blob->len - aml_len + legacy_aml_len,

                     ACPI_BUILD_ALIGN_SIZE);

hw/ipmi/isa_ipmi_kcs.c

+2 −4
Original line number Diff line number Diff line
@@ -433,10 +433,8 @@ const VMStateDescription vmstate_ISAIPMIKCSDevice = { 
        VMSTATE_BOOL(kcs.use_irq, ISAIPMIKCSDevice),

        VMSTATE_BOOL(kcs.irqs_enabled, ISAIPMIKCSDevice),

        VMSTATE_UINT32(kcs.outpos, ISAIPMIKCSDevice),

        VMSTATE_VBUFFER_UINT32(kcs.outmsg, ISAIPMIKCSDevice, 1, NULL, 0,

                               kcs.outlen),

        VMSTATE_VBUFFER_UINT32(kcs.inmsg, ISAIPMIKCSDevice, 1, NULL, 0,

                               kcs.inlen),

        VMSTATE_UINT8_ARRAY(kcs.outmsg, ISAIPMIKCSDevice, MAX_IPMI_MSG_SIZE),

        VMSTATE_UINT8_ARRAY(kcs.inmsg, ISAIPMIKCSDevice, MAX_IPMI_MSG_SIZE),

        VMSTATE_BOOL(kcs.write_end, ISAIPMIKCSDevice),

        VMSTATE_UINT8(kcs.status_reg, ISAIPMIKCSDevice),

        VMSTATE_UINT8(kcs.data_out_reg, ISAIPMIKCSDevice),

hw/scsi/virtio-scsi-dataplane.c

+0 −7
Original line number Diff line number Diff line
@@ -95,13 +95,6 @@ static int virtio_scsi_vring_init(VirtIOSCSI *s, VirtQueue *vq, int n, 
    return 0;

}



void virtio_scsi_dataplane_notify(VirtIODevice *vdev, VirtIOSCSIReq *req)

{

    if (virtio_should_notify(vdev, req->vq)) {

        event_notifier_set(virtio_queue_get_guest_notifier(req->vq));

    }

}



/* assumes s->ctx held */

static void virtio_scsi_clear_aio(VirtIOSCSI *s)

{

hw/scsi/virtio-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void virtio_scsi_complete_req(VirtIOSCSIReq *req) 
    qemu_iovec_from_buf(&req->resp_iov, 0, &req->resp, req->resp_size);

    virtqueue_push(vq, &req->elem, req->qsgl.size + req->resp_iov.size);

    if (s->dataplane_started && !s->dataplane_fenced) {

        virtio_scsi_dataplane_notify(vdev, req);

        virtio_notify_irqfd(vdev, vq);

    } else {

        virtio_notify(vdev, vq);

    }