Commit 915d34c5 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Miscellaneous bugfixes, including crash fixes from Alexey, Peter M. and
Thomas.

# gpg: Signature made Mon 09 Apr 2018 15:37:15 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# 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:
  Add missing bit for SSE instr in VEX decoding
  maint: Add .mailmap entries for patches claiming list authorship
  dump: Fix build with newer gcc
  device-crash-test: Remove fixed isa-fdc entry
  qemu-pr-helper: Write pidfile more often
  qemu-pr-helper: Daemonize before dropping privileges
  virtio-serial: fix heapover-flow
  kvmclock: fix clock_is_reliable on migration from QEMU < 2.9
  hw/dma/i82374: Avoid double creation of the 82374 controller
  hw/scsi: support SCSI-2 passthrough without PI
  scsi-disk: allow customizing the SCSI version
  scsi-disk: Don't enlarge min_io_size to max_io_size
  configure: Add missing configure options to help text
  i386/hyperv: error out if features requested but unsupported
  i386/hyperv: add hv-frequencies cpu property
  target/i386: WHPX: set CPUID_EXT_HYPERVISOR bit
  memfd: fix vhost-user-test on non-memfd capable host
  scripts/checkpatch.pl: Bug fix
  target/i386: Fix andn instruction
  sys_membarrier: fix up include directives

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

.mailmap

+14 −4
Original line number Diff line number Diff line 
# This mailmap just translates the weird addresses from the original import into git

# into proper addresses so that they are counted properly in git shortlog output.

#

# This mailmap fixes up author names/addresses.



# The first section translates weird addresses from the original git import

# into proper addresses so that they are counted properly by git shortlog.

Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>

Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>

Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
@@ -15,10 +16,19 @@ Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com> 
Paul Burton <paul.burton@mips.com> <paul@archlinuxmips.org>

Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>

malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>



# There is also a:

#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>

# for the cvs2svn initialization commit e63c3dc74bf.

#



# Next, translate a few commits where mailman rewrote the From: line due

# to strict SPF, although we prefer to avoid adding more entries like that.

Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>

Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>

Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>

Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>





# Also list preferred name forms where people have changed their

# git author config

Daniel P. Berrangé <berrange@redhat.com>

configure

+3 −0
Original line number Diff line number Diff line
@@ -1497,16 +1497,19 @@ Advanced options (experts only): 
  --install=INSTALL        use specified install [$install]

  --python=PYTHON          use specified python [$python]

  --smbd=SMBD              use specified smbd [$smbd]

  --with-git=GIT           use specified git [$git]

  --static                 enable static build [$static]

  --mandir=PATH            install man pages in PATH

  --datadir=PATH           install firmware in PATH$confsuffix

  --docdir=PATH            install documentation in PATH$confsuffix

  --bindir=PATH            install binaries in PATH

  --libdir=PATH            install libraries in PATH

  --libexecdir=PATH        install helper binaries in PATH

  --sysconfdir=PATH        install config in PATH$confsuffix

  --localstatedir=PATH     install local state in PATH (set at runtime on win32)

  --firmwarepath=PATH      search PATH for firmware files

  --with-confsuffix=SUFFIX suffix for QEMU data inside datadir/libdir/sysconfdir [$confsuffix]

  --with-pkgversion=VERS   use specified string as sub-version of the package

  --enable-debug           enable common debug build options

  --enable-sanitizers      enable default sanitizers

  --disable-strip          disable stripping binaries

dump.c

+2 −2
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static void create_header32(DumpState *s, Error **errp) 
    size = sizeof(DiskDumpHeader32);

    dh = g_malloc0(size);



    strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE));

    memcpy(dh->signature, KDUMP_SIGNATURE, SIG_LEN);

    dh->header_version = cpu_to_dump32(s, 6);

    block_size = s->dump_info.page_size;

    dh->block_size = cpu_to_dump32(s, block_size);
@@ -926,7 +926,7 @@ static void create_header64(DumpState *s, Error **errp) 
    size = sizeof(DiskDumpHeader64);

    dh = g_malloc0(size);



    strncpy(dh->signature, KDUMP_SIGNATURE, strlen(KDUMP_SIGNATURE));

    memcpy(dh->signature, KDUMP_SIGNATURE, SIG_LEN);

    dh->header_version = cpu_to_dump32(s, 6);

    block_size = s->dump_info.page_size;

    dh->block_size = cpu_to_dump32(s, block_size);

hw/dma/i82374.c

+8 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/isa/isa.h"

#include "hw/dma/i8257.h"
@@ -118,13 +119,19 @@ static const MemoryRegionPortio i82374_portio_list[] = { 
static void i82374_realize(DeviceState *dev, Error **errp)

{

    I82374State *s = I82374(dev);

    ISABus *isa_bus = isa_bus_from_device(ISA_DEVICE(dev));



    if (isa_get_dma(isa_bus, 0)) {

        error_setg(errp, "DMA already initialized on ISA bus");

        return;

    }

    i8257_dma_init(isa_bus, true);



    portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s,

                     "i82374");

    portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj),

                    s->iobase);



    i8257_dma_init(isa_bus_from_device(ISA_DEVICE(dev)), true);

    memset(s->commands, 0, sizeof(s->commands));

}

hw/i386/kvm/clock.c

+14 −0
Original line number Diff line number Diff line
@@ -241,6 +241,19 @@ static const VMStateDescription kvmclock_reliable_get_clock = { 
    }

};



/*

 * When migrating, assume the source has an unreliable

 * KVM_GET_CLOCK unless told otherwise.

 */

static int kvmclock_pre_load(void *opaque)

{

    KVMClockState *s = opaque;



    s->clock_is_reliable = false;



    return 0;

}



/*

 * When migrating, read the clock just before migration,

 * so that the guest clock counts during the events
@@ -268,6 +281,7 @@ static const VMStateDescription kvmclock_vmsd = { 
    .name = "kvmclock",

    .version_id = 1,

    .minimum_version_id = 1,

    .pre_load = kvmclock_pre_load,

    .pre_save = kvmclock_pre_save,

    .fields = (VMStateField[]) {

        VMSTATE_UINT64(clock, KVMClockState),