Commit 5142ca07 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Bugfixes for 5.0-rc2.

# gpg: Signature made Thu 02 Apr 2020 19:57:47 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:
  xen: fixup RAM memory region initialization
  object-add: don't create return value if failed
  qmp: fix leak on callbacks that return both value and error
  migration: fix cleanup_bh leak on resume
  target/i386: do not set unsupported VMX secondary execution controls
  serial: Fix double migration data
  i386: hvf: Reset IRQ inhibition after moving RIP
  vl: fix broken IPA range for ARM -M virt with KVM enabled
  util/bufferiszero: improve avx2 accelerator
  util/bufferiszero: assign length_to_accel value for each accelerator case
  MAINTAINERS: Add an entry for the HVF accelerator
  softmmu: fix crash with invalid -M memory-backend=
  virtio-iommu: depend on PCI
  hw/isa/superio: Correct the license text
  hw/scsi/vmw_pvscsi: Remove assertion for kick after reset

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2833ad48 0dc0389f

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -412,6 +412,13 @@ S: Supported 
F: target/i386/kvm.c

F: scripts/kvm/vmxcap



X86 HVF CPUs

M: Roman Bolshakov <r.bolshakov@yadro.com>

S: Maintained

F: accel/stubs/hvf-stub.c

F: target/i386/hvf/

F: include/sysemu/hvf.h



WHPX CPUs

M: Sunil Muthuswamy <sunilmut@microsoft.com>

S: Supported

hw/char/serial.c

+11 −1
Original line number Diff line number Diff line
@@ -1043,7 +1043,6 @@ static void serial_class_init(ObjectClass *klass, void* data) 
    dc->user_creatable = false;

    dc->realize = serial_realize;

    dc->unrealize = serial_unrealize;

    dc->vmsd = &vmstate_serial;

    device_class_set_props(dc, serial_properties);

}
@@ -1113,6 +1112,16 @@ static void serial_mm_realize(DeviceState *dev, Error **errp) 
    sysbus_init_irq(SYS_BUS_DEVICE(smm), &smm->serial.irq);

}



static const VMStateDescription vmstate_serial_mm = {

    .name = "serial",

    .version_id = 3,

    .minimum_version_id = 2,

    .fields = (VMStateField[]) {

        VMSTATE_STRUCT(serial, SerialMM, 0, vmstate_serial, SerialState),

        VMSTATE_END_OF_LIST()

    }

};



SerialMM *serial_mm_init(MemoryRegion *address_space,

                         hwaddr base, int regshift,

                         qemu_irq irq, int baudbase,
@@ -1162,6 +1171,7 @@ static void serial_mm_class_init(ObjectClass *oc, void *data) 


    device_class_set_props(dc, serial_mm_properties);

    dc->realize = serial_mm_realize;

    dc->vmsd = &vmstate_serial_mm;

}



static const TypeInfo serial_mm_info = {

hw/isa/isa-superio.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright (c) 2011-2012 Andreas Färber

 * Copyright (c) 2018 Philippe Mathieu-Daudé

 *

 * This code is licensed under the GNU GPLv2 and later.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 * SPDX-License-Identifier: GPL-2.0-or-later

 */

hw/isa/smc37c669-superio.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Copyright (c) 2018 Philippe Mathieu-Daudé

 *

 * This code is licensed under the GNU GPLv2 and later.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 * SPDX-License-Identifier: GPL-2.0-or-later

 */

hw/scsi/vmw_pvscsi.c

+4 −1
Original line number Diff line number Diff line
@@ -719,7 +719,10 @@ pvscsi_process_io(PVSCSIState *s) 
    PVSCSIRingReqDesc descr;

    hwaddr next_descr_pa;



    assert(s->rings_info_valid);

    if (!s->rings_info_valid) {

        return;

    }



    while ((next_descr_pa = pvscsi_ring_pop_req_descr(&s->rings)) != 0) {



        /* Only read after production index verification */