Commit 2033cc6e authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Make checkpatch say 'qemu' instead of 'kernel' (Aleksandar)
* Fix PSE guests with emulated NPT (Alexander B. #1)
* Fix leak (Alexander B. #2)
* HVF fixes (Roman, Cameron)
* New Sapphire Rapids CPUID bits (Cathy)
* cpus.c and softmmu/ cleanups (Claudio)
* TAP driver tweaks (Daniel, Havard)
* object-add bugfix and testcases (Eric A.)
* Fix Coverity MIN_CONST and MAX_CONST (Eric B.)
* "info lapic" improvement (Jan)
* SSE fixes (Joseph)
* "-msg guest-name" option (Mario)
* support for AMD nested live migration (myself)
* Small i386 TCG fixes (myself)
* improved error reporting for Xen (myself)
* fix "-cpu host -overcommit cpu-pm=on" (myself)
* Add accel/Kconfig (Philippe)
* iscsi sense handling fixes (Yongji)
* Misc bugfixes

# gpg: Signature made Sat 11 Jul 2020 00:33:41 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: (47 commits)
  linux-headers: update again to 5.8
  apic: Report current_count via 'info lapic'
  scripts: improve message when TAP based tests fail
  target/i386: Enable TSX Suspend Load Address Tracking feature
  target/i386: Add SERIALIZE cpu feature
  softmmu/vl: Remove the check for colons in -accel parameters
  cpu-throttle: new module, extracted from cpus.c
  softmmu: move softmmu only files from root
  pc: fix leak in pc_system_flash_cleanup_unused
  cpus: Move CPU code from exec.c to cpus-common.c
  target/i386: Correct the warning message of Intel PT
  checkpatch: Change occurences of 'kernel' to 'qemu' in user messages
  iscsi: return -EIO when sense fields are meaningless
  iscsi: handle check condition status in retry loop
  target/i386: sev: fail query-sev-capabilities if QEMU cannot use SEV
  target/i386: sev: provide proper error reporting for query-sev-capabilities
  KVM: x86: believe what KVM says about WAITPKG
  target/i386: implement undocumented "smsw r32" behavior
  target/i386: remove gen_io_end
  Makefile: simplify MINIKCONF rules
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d4a6bab1 56908dc5

Kconfig

0 → 100644
+4 −0
Original line number Diff line number Diff line 
source Kconfig.host

source backends/Kconfig

source accel/Kconfig

source hw/Kconfig

Kconfig.host

+0 −7
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
# down to Kconfig.  See also MINIKCONF_ARGS in the Makefile:

# these two need to be kept in sync.



config KVM

    bool



config LINUX

    bool
@@ -31,10 +28,6 @@ config VHOST_KERNEL 
    bool

    select VHOST



config XEN

    bool

    select FSDEV_9P if VIRTFS



config VIRTFS

    bool

MAINTAINERS

+22 −7
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ Overall TCG CPUs 
M: Richard Henderson <rth@twiddle.net>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: cpus.c

F: softmmu/cpus.c

F: cpus-common.c

F: exec.c

F: accel/tcg/
@@ -362,7 +362,7 @@ Overall KVM CPUs 
M: Paolo Bonzini <pbonzini@redhat.com>

L: kvm@vger.kernel.org

S: Supported

F: */kvm.*

F: */*/kvm*

F: accel/kvm/

F: accel/stubs/kvm-stub.c

F: include/hw/kvm/
@@ -416,8 +416,21 @@ S: Supported 
F: target/i386/kvm.c

F: scripts/kvm/vmxcap



Guest CPU Cores (other accelerators)

------------------------------------

Overall

M: Richard Henderson <rth@twiddle.net>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: include/sysemu/accel.h

F: accel/accel.c

F: accel/Makefile.objs

F: accel/stubs/Makefile.objs



X86 HVF CPUs

M: Cameron Esfahani <dirty@apple.com>

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

W: https://wiki.qemu.org/Features/HVF

S: Maintained

F: accel/stubs/hvf-stub.c

F: target/i386/hvf/
@@ -465,6 +478,7 @@ M: Colin Xu <colin.xu@intel.com> 
L: haxm-team@intel.com

W: https://github.com/intel/haxm/issues

S: Maintained

F: accel/stubs/hax-stub.c

F: include/sysemu/hax.h

F: target/i386/hax-*
@@ -1710,7 +1724,7 @@ M: David Hildenbrand <david@redhat.com> 
S: Maintained

F: hw/virtio/virtio-balloon*.c

F: include/hw/virtio/virtio-balloon.h

F: balloon.c

F: softmmu/balloon.c

F: include/sysemu/balloon.h



virtio-9p
@@ -2189,12 +2203,12 @@ Memory API 
M: Paolo Bonzini <pbonzini@redhat.com>

S: Supported

F: include/exec/ioport.h

F: ioport.c

F: include/exec/memop.h

F: include/exec/memory.h

F: include/exec/ram_addr.h

F: include/exec/ramblock.h

F: memory.c

F: softmmu/ioport.c

F: softmmu/memory.c

F: include/exec/memory-internal.h

F: exec.c

F: scripts/coccinelle/memory-region-housekeeping.cocci
@@ -2226,13 +2240,14 @@ F: ui/cocoa.m 
Main loop

M: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: cpus.c

F: include/qemu/main-loop.h

F: include/sysemu/runstate.h

F: util/main-loop.c

F: util/qemu-timer.c

F: softmmu/vl.c

F: softmmu/main.c

F: softmmu/cpus.c

F: softmmu/cpu-throttle.c

F: qapi/run-state.json



Human Monitor (HMP)
@@ -2387,7 +2402,7 @@ M: Thomas Huth <thuth@redhat.com> 
M: Laurent Vivier <lvivier@redhat.com>

R: Paolo Bonzini <pbonzini@redhat.com>

S: Maintained

F: qtest.c

F: softmmu/qtest.c

F: accel/qtest.c

F: tests/qtest/

X: tests/qtest/bios-tables-test-allowed-diff.h

Makefile

+6 −6
Original line number Diff line number Diff line
@@ -404,7 +404,8 @@ endif 
# This has to be kept in sync with Kconfig.host.

MINIKCONF_ARGS = \

    $(CONFIG_MINIKCONF_MODE) \

    $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \

    $@ $*/config-devices.mak.d $< $(SRC_PATH)/Kconfig \

    CONFIG_TCG=$(CONFIG_TCG) \

    CONFIG_KVM=$(CONFIG_KVM) \

    CONFIG_SPICE=$(CONFIG_SPICE) \

    CONFIG_IVSHMEM=$(CONFIG_IVSHMEM) \
@@ -418,12 +419,11 @@ MINIKCONF_ARGS = \ 
    CONFIG_LINUX=$(CONFIG_LINUX) \

    CONFIG_PVRDMA=$(CONFIG_PVRDMA)



MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/backends/Kconfig $(SRC_PATH)/hw/Kconfig

MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig)

MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \

MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py



$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak

	$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp")

$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(SRC_PATH)/Kconfig $(BUILD_DIR)/config-host.mak

	$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) \

		> $@.tmp, "GEN", "$@.tmp")

	$(call quiet-command, if test -f $@; then \

	  if cmp -s $@.old $@; then \

	    mv $@.tmp $@; \

Makefile.target

+2 −5
Original line number Diff line number Diff line
@@ -152,16 +152,13 @@ endif #CONFIG_BSD_USER 
#########################################################

# System emulator target

ifdef CONFIG_SOFTMMU

obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o

obj-y += qtest.o

obj-y += softmmu/

obj-y += gdbstub.o

obj-y += dump/

obj-y += hw/

obj-y += monitor/

obj-y += qapi/

obj-y += memory.o

obj-y += memory_mapping.o

obj-y += migration/ram.o

obj-y += softmmu/

LIBS := $(libs_softmmu) $(LIBS)



# Hardware support