Commit 7ea53245 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



Two more bugfix patches + 1 doc fix.

# gpg: Signature made Wed 24 Jul 2019 10:22:06 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  docs: correct kconfig option
  i386/kvm: Do not sync nested state during runtime
  virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bf8b0243 6baabe5c

docs/devel/kconfig.rst

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ the default configuration by uncommenting lines in the first group, 
or commenting out lines in the second group.



It is also possible to run QEMU's configure script with the

``--with-default-devices`` option.  When this is done, everything defaults

``--without-default-devices`` option.  When this is done, everything defaults

to ``n`` unless it is ``select``ed or explicitly switched on in the

``.mak`` files.  In other words, ``default`` and ``imply`` directives

are disabled.  When QEMU is built with this option, the user will probably

hw/scsi/virtio-scsi.c

+5 −2
Original line number Diff line number Diff line
@@ -832,6 +832,7 @@ static void virtio_scsi_hotunplug(HotplugHandler *hotplug_dev, DeviceState *dev, 
    VirtIODevice *vdev = VIRTIO_DEVICE(hotplug_dev);

    VirtIOSCSI *s = VIRTIO_SCSI(vdev);

    SCSIDevice *sd = SCSI_DEVICE(dev);

    AioContext *ctx = s->ctx ?: qemu_get_aio_context();



    if (virtio_vdev_has_feature(vdev, VIRTIO_SCSI_F_HOTPLUG)) {

        virtio_scsi_acquire(s);
@@ -841,14 +842,16 @@ static void virtio_scsi_hotunplug(HotplugHandler *hotplug_dev, DeviceState *dev, 
        virtio_scsi_release(s);

    }



    aio_disable_external(ctx);

    qdev_simple_device_unplug_cb(hotplug_dev, dev, errp);

    aio_enable_external(ctx);



    if (s->ctx) {

        virtio_scsi_acquire(s);

        /* If other users keep the BlockBackend in the iothread, that's ok */

        blk_set_aio_context(sd->conf.blk, qemu_get_aio_context(), NULL);

        virtio_scsi_release(s);

    }



    qdev_simple_device_unplug_cb(hotplug_dev, dev, errp);

}



static struct SCSIBusInfo virtio_scsi_scsi_info = {

target/i386/kvm.c

+5 −5
Original line number Diff line number Diff line
@@ -3563,12 +3563,12 @@ int kvm_arch_put_registers(CPUState *cpu, int level) 


    assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu));



    if (level >= KVM_PUT_RESET_STATE) {

        ret = kvm_put_nested_state(x86_cpu);

        if (ret < 0) {

            return ret;

        }



    if (level >= KVM_PUT_RESET_STATE) {

        ret = kvm_put_msr_feature_control(x86_cpu);

        if (ret < 0) {

            return ret;