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

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



* lsi HBA reselection fix (George)
* Small cleanups (Li Qiang)
* bugfixes for vhost-user-bridge and hostmem (Marc-André)
* single-thread TCG fix (me)
* VMX migration blocker (me)
* target/i386 fix for LOCK (Richard)
* MAINTAINERS update (Philippe, Thomas)

# gpg: Signature made Wed 28 Nov 2018 10:51:36 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:
  hostmem: no need to check for host_memory_backend_mr_inited() in alloc()
  hostmem-memfd: honour share=on/off property
  MAINTAINERS: Add an entry for the Firmware Configuration (fw_cfg) device
  MAINTAINERS: Add some missing entries related to accelerators
  target/i386: Generate #UD when applying LOCK to a register destination
  checkpatch: g_test_message does not need a trailing newline
  vl.c: remove outdated comment
  vhost-user-bridge: fix recvmsg iovlen
  vl: Improve error message when we can't load fw_cfg from file
  vmstate: constify VMStateField
  migration: savevm: consult migration blockers
  lsi: Reselection needed to remove pending commands from queue
  cpus: run work items for all vCPUs if single-threaded
  target/i386: kvm: add VMX migration blocker

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 039d4e3d 86100290

MAINTAINERS

+18 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ S: Maintained 
F: cpus.c

F: exec.c

F: accel/tcg/

F: accel/stubs/tcg-stub.c

F: include/exec/cpu*.h

F: include/exec/exec-all.h

F: include/exec/helper*.h
@@ -341,7 +342,10 @@ L: kvm@vger.kernel.org 
S: Supported

F: */kvm.*

F: accel/kvm/

F: accel/stubs/kvm-stub.c

F: include/hw/kvm/

F: include/sysemu/kvm*.h

F: scripts/kvm/kvm_flightrecorder



ARM

M: Peter Maydell <peter.maydell@linaro.org>
@@ -384,6 +388,7 @@ M: Marcelo Tosatti <mtosatti@redhat.com> 
L: kvm@vger.kernel.org

S: Supported

F: target/i386/kvm.c

F: scripts/kvm/vmxcap



Guest CPU Cores (Xen):

----------------------
@@ -1559,6 +1564,19 @@ F: hw/display/edid* 
F: include/hw/display/edid.h

F: qemu-edid.c



Firmware configuration (fw_cfg)

M: Philippe Mathieu-Daudé <philmd@redhat.com>

R: Laszlo Ersek <lersek@redhat.com>

R: Gerd Hoffmann <kraxel@redhat.com>

S: Supported

F: docs/specs/fw_cfg.txt

F: hw/nvram/fw_cfg.c

F: include/hw/nvram/fw_cfg.h

F: include/standard-headers/linux/qemu_fw_cfg.h

F: tests/libqos/fw_cfg.c

F: tests/fw_cfg-test.c

T: git https://github.com/philmd/qemu.git fw_cfg-next



Subsystems

----------

Audio

backends/hostmem-file.c

+12 −12
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ static void 
file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)

{

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend);

#ifdef CONFIG_POSIX

    gchar *path;

#endif



    if (!backend->size) {

        error_setg(errp, "can't create backend with size 0");
@@ -54,8 +57,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
#ifndef CONFIG_POSIX

    error_setg(errp, "-mem-path not supported on this host");

#else

    if (!host_memory_backend_mr_inited(backend)) {

        gchar *path;

    backend->force_prealloc = mem_prealloc;

    path = object_get_canonical_path(OBJECT(backend));

    memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),
@@ -65,7 +66,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
                                     (fb->is_pmem ? RAM_PMEM : 0),

                                     fb->mem_path, errp);

    g_free(path);

    }

#endif

}

backends/hostmem-memfd.c

+3 −5
Original line number Diff line number Diff line
@@ -44,10 +44,6 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
        return;

    }



    if (host_memory_backend_mr_inited(backend)) {

        return;

    }



    backend->force_prealloc = mem_prealloc;

    fd = qemu_memfd_create(TYPE_MEMORY_BACKEND_MEMFD, backend->size,

                           m->hugetlb, m->hugetlbsize, m->seal ?
@@ -59,7 +55,8 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 


    name = object_get_canonical_path(OBJECT(backend));

    memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend),

                                   name, backend->size, true, fd, errp);

                                   name, backend->size,

                                   backend->share, fd, errp);

    g_free(name);

}
@@ -131,6 +128,7 @@ memfd_backend_instance_init(Object *obj) 


    /* default to sealed file */

    m->seal = true;

    MEMORY_BACKEND(m)->share = true;

}



static void

cpus.c

+8 −4
Original line number Diff line number Diff line
@@ -1220,17 +1220,21 @@ static void qemu_wait_io_event_common(CPUState *cpu) 
    process_queued_cpu_work(cpu);

}



static void qemu_tcg_rr_wait_io_event(CPUState *cpu)

static void qemu_tcg_rr_wait_io_event(void)

{

    CPUState *cpu;



    while (all_cpu_threads_idle()) {

        stop_tcg_kick_timer();

        qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex);

        qemu_cond_wait(first_cpu->halt_cond, &qemu_global_mutex);

    }



    start_tcg_kick_timer();



    CPU_FOREACH(cpu) {

        qemu_wait_io_event_common(cpu);

    }

}



static void qemu_wait_io_event(CPUState *cpu)

{
@@ -1562,7 +1566,7 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) 
            qemu_notify_event();

        }



        qemu_tcg_rr_wait_io_event(cpu ? cpu : first_cpu);

        qemu_tcg_rr_wait_io_event();

        deal_with_unplugged_cpus();

    }

hw/display/virtio-gpu.c

+2 −2
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = { 
};



static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size,

                           VMStateField *field, QJSON *vmdesc)

                           const VMStateField *field, QJSON *vmdesc)

{

    VirtIOGPU *g = opaque;

    struct virtio_gpu_simple_resource *res;
@@ -1101,7 +1101,7 @@ static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, 
}



static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,

                           VMStateField *field)

                           const VMStateField *field)

{

    VirtIOGPU *g = opaque;

    struct virtio_gpu_simple_resource *res;