]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 19 Mar 2021 18:01:17 +0000 (18:01 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 19 Mar 2021 18:01:17 +0000 (18:01 +0000)
* 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>
1  2 
qom/object_interfaces.c

index b17aa57de1352ba8924a17f047bea8cf2a629710,11ad2e207834821240de1887f296e9315021c299..c3324b0f8680fec3da9050d94a210180403f0121
  #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)
  {