| Message ID | 20200921155638.1328200-1-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 21 Sep 2020 at 16:59, Paolo Bonzini <pbonzini@redhat.com> wrote: > > The following changes since commit 053a4177817db307ec854356e95b5b350800a216: > > Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +0100) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to 6b58f5adc256c7b7f61f1b22fba75b4c6218ed0b: > > oss-fuzz: move linker arg to fix coverage-build (2020-09-21 10:23:09 -0400) > > v1->v2: rebased, couple new patches > > ---------------------------------------------------------------- > * SCSI fix (Dmitry, Li Feng, Li Qiang) > * memory API fixes (Eduardo) > * removal of deprecated '-numa node' (Igor) > * ACPI fix for VMBus (Jon) > * relocatable install (myself) > * always remove docker containers (myself) > * serial cleanups (Philippe) > * vmware cpuid leaf for tsc and apic frequency (Sunil) > * KVM_FEATURE_ASYNC_PF_INT support (Vitaly) > * i386 XSAVE bugfix (Xiaoyao) > > meson: > * fixes (Marc-André, Max, Stefan, Alexander, myself) > * moved libmpathpersist, cocoa, malloc tests (myself) > * support for 0.56 introspected test dependencies (myself) Conflicts on merge -- could you rebase and fix up, please? thanks -- PMM
The following changes since commit 053a4177817db307ec854356e95b5b350800a216: Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20200918' into staging (2020-09-18 16:34:26 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 6b58f5adc256c7b7f61f1b22fba75b4c6218ed0b: oss-fuzz: move linker arg to fix coverage-build (2020-09-21 10:23:09 -0400) v1->v2: rebased, couple new patches ---------------------------------------------------------------- * SCSI fix (Dmitry, Li Feng, Li Qiang) * memory API fixes (Eduardo) * removal of deprecated '-numa node' (Igor) * ACPI fix for VMBus (Jon) * relocatable install (myself) * always remove docker containers (myself) * serial cleanups (Philippe) * vmware cpuid leaf for tsc and apic frequency (Sunil) * KVM_FEATURE_ASYNC_PF_INT support (Vitaly) * i386 XSAVE bugfix (Xiaoyao) meson: * fixes (Marc-André, Max, Stefan, Alexander, myself) * moved libmpathpersist, cocoa, malloc tests (myself) * support for 0.56 introspected test dependencies (myself) ---------------------------------------------------------------- Alexander Bulekov (1): oss-fuzz: move linker arg to fix coverage-build Anthony PERARD (1): meson: fix installation of keymaps Claudio Fontana (1): tests: add missing genh dependency Dmitry Fomichev (1): scsi-generic: Fix HM-zoned device scan Eduardo Habkost (1): memory: Convert IOMMUMemoryRegionClass doc comment to kernel-doc Igor Mammedov (3): numa: drop support for '-numa node' (without memory specified) doc: Cleanup "'-mem-path' fallback to RAM" deprecation text numa: remove fixup numa_state->num_nodes to MAX_NODES Jon Doron (1): acpi: i386: Move VMBus DSDT entry to SB Li Feng (1): vhost-scsi: support inflight io track Li Qiang (2): hw: megasas: return -1 when 'megasas_map_sgl' fails hw: megasas: consider 'iov_count=0' is an error in megasas_map_sgl Marc-André Lureau (2): meson: fix MSI rule meson: error out if qemu_suffix starts with / Paolo Bonzini (26): meson: clean up build_by_default ninjatool: rebuild multi-output targets if outputs are missing meson: move libudev test meson: move libmpathpersist test meson: extend libmpathpersist test for static linking configure: move malloc_trim/tcmalloc/jemalloc to meson configure: fix --meson=/path/to/meson configure: move cocoa option to Meson configure: do not limit Hypervisor.framework test to Darwin meson: qtest: set "depends" correctly mtest2make: add support for introspected test dependencies meson: report accelerator support oslib: do not call g_strdup from qemu_get_exec_dir fuzz: use qemu_get_exec_dir oslib-posix: default exec_dir to bindir cutils: introduce get_relocated_path oslib-posix: relocate path to /var module: relocate path to modules net: relocate paths to helpers and scripts vl: relocate paths to data directories vl: relocate path to configuration file qemu-bridge-helper: relocate path to default ACL qga: relocate path to default configuration and hook ui: relocate paths to icons and translations configure: use a platform-neutral prefix configure: fix performance regression due to PIC objects Philippe Mathieu-Daudé (11): configure: Do not intent to build WHPX on 32-bit host hw/mips/mipssim: Use MMIO serial device on fake ISA I/O hw/char/serial: Remove TYPE_SERIAL_IO hw/char/serial: Assert serial_ioport_read/write offset fits 8 bytes hw/char/serial: Replace commented DPRINTF() by trace event hw/char/serial: Remove old DEBUG_SERIAL commented code hw/char/serial: Rename I/O read/write trace events hw/char/serial: Make 'wakeup' property boolean hw/char/serial-{isa, pci}: Alias QDEV properties from generic serial object hw/i386/q35: Remove unreachable Xen code on Q35 machine exec: Remove MemoryRegion::global_locking field Stefan Hajnoczi (2): MAINTAINERS: add Paolo Bonzini as RCU maintainer configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI Stefano Garzarella (1): checkpatch: avoid error on cover letter files Sunil Muthuswamy (1): WHPX: vmware cpuid leaf for tsc and apic frequency Vitaly Kuznetsov (1): target/i386: support KVM_FEATURE_ASYNC_PF_INT Xiaoyao Li (1): i386/cpu: Clear FEAT_XSAVE_COMP_{LO,HI} when XSAVE is not available MAINTAINERS | 8 ++ Makefile | 4 +- accel/tcg/cputlb.c | 4 +- configure | 238 ++++++---------------------------- docs/devel/build-system.rst | 5 + docs/system/deprecated.rst | 44 ++++--- exec.c | 2 +- hw/char/serial-isa.c | 4 +- hw/char/serial-pci.c | 3 +- hw/char/serial.c | 65 +--------- hw/char/trace-events | 5 +- hw/core/machine.c | 1 - hw/core/numa.c | 59 --------- hw/i386/acpi-build.c | 12 +- hw/i386/pc_piix.c | 1 - hw/i386/pc_q35.c | 14 +- hw/mips/mipssim.c | 5 +- hw/ppc/spapr.c | 1 - hw/scsi/megasas.c | 6 +- hw/scsi/scsi-generic.c | 10 +- hw/scsi/vhost-scsi-common.c | 27 ++++ include/exec/memory.h | 64 +++++---- include/hw/boards.h | 2 - include/hw/char/serial.h | 13 +- include/hw/virtio/vhost-scsi-common.h | 2 + include/net/net.h | 4 +- include/qemu-common.h | 1 - include/qemu/cutils.h | 12 ++ include/qemu/osdep.h | 8 +- include/scsi/constants.h | 1 + include/sysemu/numa.h | 4 - include/sysemu/sysemu.h | 2 +- meson.build | 202 +++++++++++++++++++++++------ meson_options.txt | 9 ++ net/tap.c | 26 +++- os-posix.c | 24 ---- os-win32.c | 11 -- pc-bios/keymaps/meson.build | 2 + qemu-bridge-helper.c | 9 +- qga/main.c | 8 +- qga/meson.build | 1 + scripts/checkpatch.pl | 2 +- scripts/mtest2make.py | 19 ++- scripts/ninjatool.py | 3 + softmmu/memory.c | 6 - softmmu/vl.c | 43 ++++-- target/i386/cpu.c | 6 +- target/i386/cpu.h | 1 + target/i386/kvm.c | 10 ++ target/i386/machine.c | 19 +++ target/i386/whp-dispatch.h | 3 +- target/i386/whpx-all.c | 96 ++++++++++++-- tests/fp/meson.build | 2 - tests/meson.build | 9 +- tests/qemu-iotests/meson.build | 3 +- tests/qtest/fuzz/fuzz.c | 12 +- tests/qtest/meson.build | 4 +- trace/meson.build | 1 - ui/gtk.c | 10 +- ui/meson.build | 2 +- ui/sdl2.c | 9 +- ui/shader/meson.build | 1 - util/cutils.c | 61 +++++++++ util/module.c | 10 +- util/oslib-posix.c | 35 +++-- util/oslib-win32.c | 14 +- 66 files changed, 705 insertions(+), 599 deletions(-)