summaryrefslogtreecommitdiffstats
path: root/qom
diff options
context:
space:
mode:
authorPeter Maydell2021-03-19 19:01:17 +0100
committerPeter Maydell2021-03-19 19:01:17 +0100
commitbdee969c0e65d4d509932b1d70e3a3b2ffbff6d5 (patch)
tree188cc6a895d8775cfc80467bce7590a9da408755 /qom
parentMerge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-03-16-v4' in... (diff)
parenttests/qtest: cleanup the testcase for bug 1878642 (diff)
downloadqemu-bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5.tar.gz
qemu-bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5.tar.xz
qemu-bdee969c0e65d4d509932b1d70e3a3b2ffbff6d5.zip
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 <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-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 <peter.maydell@linaro.org>
Diffstat (limited to 'qom')
-rw-r--r--qom/object_interfaces.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index b17aa57de1..c3324b0f86 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -17,6 +17,7 @@
#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)
{