From: Peter Maydell Date: Fri, 19 Mar 2021 18:01:17 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging X-Git-Tag: v6.0.0-rc0~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging * fixes for i386 TCG paging * fixes for Hyper-V enlightenments * avoid uninitialized variable warning # gpg: Signature made Fri 19 Mar 2021 14:38:12 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini " [full] # gpg: aka "Paolo Bonzini " [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-gitlab/tags/for-upstream: tests/qtest: cleanup the testcase for bug 1878642 hw/intc/i8259: Refactor pic_read_irq() to avoid uninitialized variable i386: Make migration fail when Hyper-V reenlightenment was enabled but 'user_tsc_khz' is unset i386: Fix 'hypercall_hypercall' typo target/i386: svm: do not discard high 32 bits of EXITINFO1 target/i386: fail if toggling LA57 in 64-bit mode target/i386: allow modifying TCG phys-addr-bits qom: use qemu_printf to print help for user-creatable objects Signed-off-by: Peter Maydell --- bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5 diff --cc qom/object_interfaces.c index b17aa57de13,11ad2e20783..c3324b0f868 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@@ -14,9 -11,9 +14,10 @@@ #include "qemu/id.h" #include "qemu/module.h" #include "qemu/option.h" +#include "qemu/qemu-print.h" #include "qapi/opts-visitor.h" #include "qemu/config-file.h" + #include "qemu/qemu-print.h" bool user_creatable_complete(UserCreatable *uc, Error **errp) {