]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge tag 'pull-request-2023-01-09' of https://gitlab.com/thuth/qemu into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jan 2023 15:54:31 +0000 (15:54 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 9 Jan 2023 15:54:31 +0000 (15:54 +0000)
* s390x header clean-ups from Philippe
* Rework and improvements of the EINTR handling by Nikita
* Deprecate the -no-hpet command line option
* Disable the qtests in the 32-bit Windows CI job again
* Some other misc fixes here and there

# gpg: Signature made Mon 09 Jan 2023 14:21:19 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2023-01-09' of https://gitlab.com/thuth/qemu:
  .gitlab-ci.d/windows: Do not run the qtests in the msys2-32bit job
  error handling: Use RETRY_ON_EINTR() macro where applicable
  Refactoring: refactor TFR() macro to RETRY_ON_EINTR()
  docs/interop: Change the vnc-ledstate-Pseudo-encoding doc into .rst
  i386: Deprecate the -no-hpet QEMU command line option
  tests/qtest/bios-tables-test: Replace -no-hpet with hpet=off machine parameter
  tests/readconfig: spice doesn't support unix socket on windows yet
  target/s390x: Restrict sysemu/reset.h to system emulation
  target/s390x/tcg/excp_helper: Restrict system headers to sysemu
  target/s390x/tcg/misc_helper: Remove unused "memory.h" include
  hw/s390x/pv: Restrict Protected Virtualization to sysemu
  exec/memory: Expose memory_region_access_valid()
  MAINTAINERS: Add MIPS-related docs and configs to the MIPS architecture section
  tests/vm: Update get_default_jobs() to work on non-x86_64 non-KVM hosts
  qemu-iotests/stream-under-throttle: do not shutdown QEMU

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
docs/about/deprecated.rst
hw/s390x/s390-pci-inst.c
qemu-options.hx
tests/qtest/bios-tables-test.c

Simple merge
index 69137e0757f7e9180265f9d68aa44944e764c3cc,2eee5db7e1d23e101815bdbba089cdbedc189874..8f84ac6251c478eb8ca9b48925db557ba83db940
  
  #include "qemu/osdep.h"
  #include "exec/memop.h"
- #include "exec/memory-internal.h"
+ #include "exec/memory.h"
  #include "qemu/error-report.h"
  #include "sysemu/hw_accel.h"
 +#include "hw/pci/pci_device.h"
  #include "hw/s390x/s390-pci-inst.h"
  #include "hw/s390x/s390-pci-bus.h"
  #include "hw/s390x/s390-pci-kvm.h"
diff --cc qemu-options.hx
Simple merge
Simple merge