Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* pc: Add a description for the i8042 property
* kvm: support for nested FRED
* tests/unit: fix warning when compiling test-nested-aio-poll with LTO
* kvm: refactoring of VM creation
* target/i386: expose IBPB-BRTYPE and SBPB CPUID bits to the guest
* hw/char: clean up serial
* remove virtfs-proxy-helper
* target/i386/kvm: Report which action failed in kvm_arch_put/get_registers
* qom: improvements to object_resolve_path*()

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmb++MsUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroPVnwf/cdvfxvDm22tEdlh8vHlV17HtVdcC
# Hw334M/3PDvbTmGzPBg26lzo4nFS6SLrZ8ETCeqvuJrtKzqVk9bI8ssZW5KA4ijM
# nkxguRPHO8E6U33ZSucc+Hn56+bAx4I2X80dLKXJ87OsbMffIeJ6aHGSEI1+fKVh
# pK7q53+Y3lQWuRBGhDIyKNuzqU4g+irpQwXOhux63bV3ADadmsqzExP6Gmtl8OKM
# DylPu1oK7EPZumlSiJa7Gy1xBqL4Rc4wGPNYx2RVRjp+i7W2/Y1uehm3wSBw+SXC
# a6b7SvLoYfWYS14/qCF4cBL3sJH/0f/4g8ZAhDDxi2i5kBr0/5oioDyE/A==
# =/zo4
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 03 Oct 2024 21:04:27 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

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu: (23 commits)
  qom: update object_resolve_path*() documentation
  qom: set *ambiguous on all paths
  qom: rename object_resolve_path_type() "ambiguousp"
  target/i386/kvm: Report which action failed in kvm_arch_put/get_registers
  kvm: Allow kvm_arch_get/put_registers to accept Error**
  accel/kvm: refactor dirty ring setup
  minikconf: print error entirely on stderr
  9p: remove 'proxy' filesystem backend driver
  hw/char: Extract serial-mm
  hw/char/serial.h: Extract serial-isa.h
  hw: Remove unused inclusion of hw/char/serial.h
  target/i386: Expose IBPB-BRTYPE and SBPB CPUID bits to the guest
  kvm: refactor core virtual machine creation into its own function
  kvm/i386: replace identity_base variable with a constant
  kvm/i386: refactor kvm_arch_init and split it into smaller functions
  kvm: replace fprintf with error_report()/printf() in kvm_init()
  kvm/i386: fix return values of is_host_cpu_intel()
  kvm/i386: make kvm_filter_msr() and related definitions private to kvm module
  hw/i386/pc: Add a description for the i8042 property
  tests/unit: remove block layer code from test-nested-aio-poll
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	hw/arm/Kconfig
#	hw/arm/pxa2xx.c

diff --cc MAINTAINERS
Simple merge

diff --cc docs/about/deprecated.rst
Simple merge

diff --cc docs/about/removed-features.rst
Simple merge

diff --cc hw/arm/Kconfig
index a70ceff504b59f16c6d1af27374cc54c2e5caa33,ecde52f4a4a19303134dee7c95618100aa33a334..eac5070514f73ac38f6eabd48483487e3f57bd7a
--- 1/hw/arm/Kconfig
--- 2/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@@ -150,8 -179,58 +150,8 @@@ config OMA
      select NAND
      select PFLASH_CFI01
      select SD
-     select SERIAL
+     select SERIAL_MM
  
 -config PXA2XX
 -    bool
 -    select FRAMEBUFFER
 -    select I2C
 -    select SERIAL_MM
 -    select SD
 -    select SSI
 -    select USB_OHCI_SYSBUS
 -    select PCMCIA
 -
 -config GUMSTIX
 -    bool
 -    default y
 -    depends on TCG && ARM
 -    select PFLASH_CFI01
 -    select SMC91C111
 -    select PXA2XX
 -
 -config TOSA
 -    bool
 -    default y
 -    depends on TCG && ARM
 -    select ZAURUS  # scoop
 -    select MICRODRIVE
 -    select PXA2XX
 -    select LED
 -
 -config SPITZ
 -    bool
 -    default y
 -    depends on TCG && ARM
 -    select ADS7846 # touch-screen controller
 -    select MAX111X # A/D converter
 -    select WM8750  # audio codec
 -    select MAX7310 # GPIO expander
 -    select ZAURUS  # scoop
 -    select NAND    # memory
 -    select ECC     # Error-correcting for NAND
 -    select MICRODRIVE
 -    select PXA2XX
 -
 -config Z2
 -    bool
 -    default y
 -    depends on TCG && ARM
 -    select PFLASH_CFI01
 -    select WM8750
 -    select PL011 # UART
 -    select PXA2XX
 -
  config REALVIEW
      bool
      default y

diff --cc hw/char/omap_uart.c
Simple merge

diff --cc hw/char/serial.c
Simple merge

diff --cc hw/display/Kconfig
Simple merge

diff --cc hw/riscv/sifive_u.c
Simple merge

diff --cc hw/riscv/virt.c
Simple merge

diff --cc include/hw/char/serial.h
Simple merge

diff --cc qom/object.c
Simple merge

diff --cc target/riscv/kvm/kvm-cpu.c
Simple merge