Commit 9d2e1fcd authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Mostly bugfixes, plus a patch to mark accelerator MemoryRegions in "info
mtree" that has been lingering for too long.

# gpg: Signature made Fri 19 Jul 2019 22:45:46 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:
  target/i386: sev: fix failed message typos
  i386: indicate that 'pconfig' feature was removed intentionally
  build-sys: do no support modules on Windows
  qmp: don't emit the RESET event on wakeup
  hmp: Print if memory section is registered with an accelerator
  test-bitmap: add test for bitmap_set
  scsi-generic: Check sense key before request snooping and patching
  vhost-user-scsi: Call virtio_scsi_common_unrealize() when device realize failed
  vhost-scsi: Call virtio_scsi_common_unrealize() when device realize failed
  virtio-scsi: remove unused argument to virtio_scsi_common_realize
  target/i386: skip KVM_GET/SET_NESTED_STATE if VMX disabled, or for SVM
  target/i386: kvm: Demand nested migration kernel capabilities only when vCPU may have enabled VMX

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b9e02bb3 d4b976c0

accel/kvm/kvm-all.c

+38 −0
Original line number Diff line number Diff line
@@ -111,6 +111,13 @@ struct KVMState 
    /* memory encryption */

    void *memcrypt_handle;

    int (*memcrypt_encrypt_data)(void *handle, uint8_t *ptr, uint64_t len);



    /* For "info mtree -f" to tell if an MR is registered in KVM */

    int nr_as;

    struct KVMAs {

        KVMMemoryListener *ml;

        AddressSpace *as;

    } *as;

};



KVMState *kvm_state;
@@ -1159,6 +1166,14 @@ void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml, 
    kml->listener.priority = 10;



    memory_listener_register(&kml->listener, as);



    for (i = 0; i < s->nr_as; ++i) {

        if (!s->as[i].as) {

            s->as[i].as = as;

            s->as[i].ml = kml;

            break;

        }

    }

}



static MemoryListener kvm_io_listener = {
@@ -1809,6 +1824,12 @@ static int kvm_init(MachineState *ms) 
        s->nr_slots = 32;

    }



    s->nr_as = kvm_check_extension(s, KVM_CAP_MULTI_ADDRESS_SPACE);

    if (s->nr_as <= 1) {

        s->nr_as = 1;

    }

    s->as = g_new0(struct KVMAs, s->nr_as);



    kvm_type = qemu_opt_get(qemu_get_machine_opts(), "kvm-type");

    if (mc->kvm_type) {

        type = mc->kvm_type(ms, kvm_type);
@@ -2828,11 +2849,28 @@ int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target) 
    return r;

}



static bool kvm_accel_has_memory(MachineState *ms, AddressSpace *as,

                                 hwaddr start_addr, hwaddr size)

{

    KVMState *kvm = KVM_STATE(ms->accelerator);

    int i;



    for (i = 0; i < kvm->nr_as; ++i) {

        if (kvm->as[i].as == as && kvm->as[i].ml) {

            return NULL != kvm_lookup_matching_slot(kvm->as[i].ml,

                                                    start_addr, size);

        }

    }



    return false;

}



static void kvm_accel_class_init(ObjectClass *oc, void *data)

{

    AccelClass *ac = ACCEL_CLASS(oc);

    ac->name = "KVM";

    ac->init_machine = kvm_init;

    ac->has_memory = kvm_accel_has_memory;

    ac->allowed = &kvm_allowed;

}

configure

+6 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  guest-agent     build the QEMU Guest Agent

  guest-agent-msi build guest agent Windows MSI installation package

  pie             Position Independent Executables

  modules         modules support

  modules         modules support (non-Windows)

  debug-tcg       TCG debugging (default is disabled)

  debug-info      debugging information

  sparse          sparse checker
@@ -2007,6 +2007,11 @@ else 
  QEMU_CFLAGS="$QEMU_CFLAGS -Wno-missing-braces"

fi



# Our module code doesn't support Windows

if test "$modules" = "yes" && test "$mingw32" = "yes" ; then

  error_exit "Modules are not available for Windows"

fi



# Static linking is not possible with modules or PIE

if test "$static" = "yes" ; then

  if test "$modules" = "yes" ; then

hw/scsi/scsi-generic.c

+16 −12
Original line number Diff line number Diff line
@@ -254,24 +254,28 @@ static void scsi_read_complete(void * opaque, int ret) 


    r->len = -1;



    if (r->io_header.driver_status & SG_ERR_DRIVER_SENSE) {

        SCSISense sense =

            scsi_parse_sense_buf(r->req.sense, r->io_header.sb_len_wr);



        /*

         * Check if this is a VPD Block Limits request that

         * resulted in sense error but would need emulation.

         * In this case, emulate a valid VPD response.

         */

    if (s->needs_vpd_bl_emulation && ret == 0 &&

        (r->io_header.driver_status & SG_ERR_DRIVER_SENSE) &&

        if (sense.key == ILLEGAL_REQUEST &&

            s->needs_vpd_bl_emulation &&

            r->req.cmd.buf[0] == INQUIRY &&

            (r->req.cmd.buf[1] & 0x01) &&

            r->req.cmd.buf[2] == 0xb0) {

        SCSISense sense =

            scsi_parse_sense_buf(r->req.sense, r->io_header.sb_len_wr);

        if (sense.key == ILLEGAL_REQUEST) {

            len = scsi_generic_emulate_block_limits(r, s);

            /*

             * No need to let scsi_read_complete go on and handle an

             * It's okay to jup to req_complete: no need to

             * let scsi_handle_inquiry_reply handle an

             * INQUIRY VPD BL request we created manually.

             */

        }

        if (sense.key) {

            goto req_complete;

        }

    }

hw/scsi/vhost-scsi.c

+4 −2
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp) 
        if (err) {

            error_propagate(errp, err);

            error_free(vsc->migration_blocker);

            goto close_fd;

            goto free_virtio;

        }

    }
@@ -240,6 +240,8 @@ static void vhost_scsi_realize(DeviceState *dev, Error **errp) 
        migrate_del_blocker(vsc->migration_blocker);

    }

    g_free(vsc->dev.vqs);

 free_virtio:

    virtio_scsi_common_unrealize(dev);

 close_fd:

    close(vhostfd);

    return;
@@ -262,7 +264,7 @@ static void vhost_scsi_unrealize(DeviceState *dev, Error **errp) 
    vhost_dev_cleanup(&vsc->dev);

    g_free(vqs);



    virtio_scsi_common_unrealize(dev, errp);

    virtio_scsi_common_unrealize(dev);

}



static Property vhost_scsi_properties[] = {

hw/scsi/vhost-user-scsi.c

+11 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) 
    }



    if (!vhost_user_init(&s->vhost_user, &vs->conf.chardev, errp)) {

        return;

        goto free_virtio;

    }



    vsc->dev.nvqs = 2 + vs->conf.num_queues;
@@ -101,15 +101,21 @@ static void vhost_user_scsi_realize(DeviceState *dev, Error **errp) 
    if (ret < 0) {

        error_setg(errp, "vhost-user-scsi: vhost initialization failed: %s",

                   strerror(-ret));

        vhost_user_cleanup(&s->vhost_user);

        g_free(vqs);

        return;

        goto free_vhost;

    }



    /* Channel and lun both are 0 for bootable vhost-user-scsi disk */

    vsc->channel = 0;

    vsc->lun = 0;

    vsc->target = vs->conf.boot_tpgt;



    return;



free_vhost:

    vhost_user_cleanup(&s->vhost_user);

    g_free(vqs);

free_virtio:

    virtio_scsi_common_unrealize(dev);

}



static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp)
@@ -125,7 +131,7 @@ static void vhost_user_scsi_unrealize(DeviceState *dev, Error **errp) 
    vhost_dev_cleanup(&vsc->dev);

    g_free(vqs);



    virtio_scsi_common_unrealize(dev, errp);

    virtio_scsi_common_unrealize(dev);

    vhost_user_cleanup(&s->vhost_user);

}