Commit fa272574 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* icount fix (Clement)
* dumping fixes for non-volatile memory (Marc-André, myself)
* x86 emulation fix (Rudolf)
* recent Hyper-V CPUID flag (Vitaly)
* Q35 doc fix (Daniel)
* lsi fix (Prasad)
* SCSI block limits emulation fixes (myself)
* qemu_thread_atexit rework (Peter)
* ivshmem memory leak fix (Igor)

# gpg: Signature made Tue 06 Nov 2018 21:34:30 GMT
# 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:
  util/qemu-thread-posix: Fix qemu_thread_atexit* for OSX
  include/qemu/thread.h: Document qemu_thread_atexit* API
  scsi-generic: do not do VPD emulation for sense other than ILLEGAL_REQUEST
  scsi-generic: avoid invalid access to struct when emulating block limits
  scsi-generic: avoid out-of-bounds access to VPD page list
  scsi-generic: keep VPD page list sorted
  lsi53c895a: check message length value is valid
  scripts/dump-guest-memory: Synchronize with guest_phys_blocks_region_add
  memory-mapping: skip non-volatile memory regions in GuestPhysBlockList
  nvdimm: set non-volatile on the memory region
  memory: learn about non-volatile memory region
  target/i386: Clear RF on SYSCALL instruction
  MAINTAINERS: remove or downgrade myself to reviewer from some subsystems
  ivshmem: fix memory backend leak
  i386: clarify that the Q35 machine type implements a P35 chipset
  x86: hv_evmcs CPU flag support
  icount: fix deadlock when all cpus are sleeping

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4de6bb0c a458774a

MAINTAINERS

+6 −7
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ Guest CPU cores (TCG): 
----------------------

Overall

L: qemu-devel@nongnu.org

M: Paolo Bonzini <pbonzini@redhat.com>

M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

M: Richard Henderson <rth@twiddle.net>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: cpus.c

F: exec.c
@@ -1141,7 +1141,8 @@ F: hw/pci-host/ppce500.c 
F: hw/net/fsl_etsec/



Character devices

M: Paolo Bonzini <pbonzini@redhat.com>

M: Marc-André Lureau <marcandre.lureau@redhat.com>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Odd Fixes

F: hw/char/
@@ -1528,8 +1529,8 @@ T: git git://github.com/famz/qemu.git bitmaps 
T: git git://github.com/jnsnow/qemu.git bitmaps



Character device backends

M: Paolo Bonzini <pbonzini@redhat.com>

M: Marc-André Lureau <marcandre.lureau@redhat.com>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: chardev/

F: include/chardev/
@@ -1762,9 +1763,9 @@ F: tests/qmp-cmd-test.c 
T: git git://repo.or.cz/qemu/armbru.git qapi-next



qtest

M: Paolo Bonzini <pbonzini@redhat.com>

M: Thomas Huth <thuth@redhat.com>

M: Laurent Vivier <lvivier@redhat.com>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: qtest.c

F: tests/libqtest.*
@@ -1871,7 +1872,6 @@ F: tests/test-io-* 
Sockets

M: Daniel P. Berrange <berrange@redhat.com>

M: Gerd Hoffmann <kraxel@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: include/qemu/sockets.h

F: util/qemu-sockets.c
@@ -2058,13 +2058,12 @@ M: Ronnie Sahlberg <ronniesahlberg@gmail.com> 
M: Paolo Bonzini <pbonzini@redhat.com>

M: Peter Lieven <pl@kamp.de>

L: qemu-block@nongnu.org

S: Supported

S: Odd Fixes

F: block/iscsi.c

F: block/iscsi-opts.c



Network Block Device (NBD)

M: Eric Blake <eblake@redhat.com>

M: Paolo Bonzini <pbonzini@redhat.com>

L: qemu-block@nongnu.org

S: Maintained

F: block/nbd*

cpus.c

+8 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,14 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) 
            atomic_mb_set(&cpu->exit_request, 0);

        }



        if (use_icount && all_cpu_threads_idle()) {

            /*

             * When all cpus are sleeping (e.g in WFI), to avoid a deadlock

             * in the main_loop, wake it up in order to start the warp timer.

             */

            qemu_notify_event();

        }



        qemu_tcg_rr_wait_io_event(cpu ? cpu : first_cpu);

        deal_with_unplugged_cpus();

    }

docs/devel/migration.rst

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ Examples of such memory API functions are: 
  - memory_region_add_subregion()

  - memory_region_del_subregion()

  - memory_region_set_readonly()

  - memory_region_set_nonvolatile()

  - memory_region_set_enabled()

  - memory_region_set_address()

  - memory_region_set_alias_offset()

hw/mem/nvdimm.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp) 
    nvdimm->nvdimm_mr = g_new(MemoryRegion, 1);

    memory_region_init_alias(nvdimm->nvdimm_mr, OBJECT(dimm),

                             "nvdimm-memory", mr, 0, pmem_size);

    memory_region_set_nonvolatile(nvdimm->nvdimm_mr, true);

    nvdimm->nvdimm_mr->align = align;

}

hw/misc/ivshmem.c

+1 −0
Original line number Diff line number Diff line
@@ -1279,6 +1279,7 @@ static void desugar_shm(IVShmemState *s) 
    object_property_set_bool(obj, true, "share", &error_abort);

    object_property_add_child(OBJECT(s), "internal-shm-backend", obj,

                              &error_abort);

    object_unref(obj);

    user_creatable_complete(obj, &error_abort);

    s->hostmem = MEMORY_BACKEND(obj);

}