Merge tag 'mem-2023-10-12' of https://github.com/davidhildenbrand/qemu into staging

Hi,

"Host Memory Backends" and "Memory devices" queue ("mem"):
- Support memory devices with multiple memslots
- Support memory devices that dynamically consume memslots
- Support memory devices that can automatically decide on the number of
  memslots to use
- virtio-mem support for exposing memory dynamically via multiple
  memslots
- Some required cleanups/refactorings

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEG9nKrXNcTDpGDfzKTd4Q9wD/g1oFAmUn+XMRHGRhdmlkQHJl
# ZGhhdC5jb20ACgkQTd4Q9wD/g1qDHA//T01suTa+uzrcoJHoMWN11S47WnAmbuTo
# vVakucLBPMJAa9xZeCy3OavXaVGpHkw+t6g3OFknof0LfQ5/j9iE3Q1PxURN7g5j
# SJ2WJXCoceM6T4TMhPvVvgEaYjFmESqZB5FZgedMT0QRyhAxMuF9pCkWhk1O3OAV
# JqQKqLFiGcv60AEuBYGZGzgiOUv8EJ5gKwRF4VOdyHIxqZDw1aZXzlcd4TzFZBQ7
# rwW/3ef+sFmUJdmfrSrqcIlQSRrqZ2w95xATDzLTIEEUT3SWqh/E95EZWIz1M0oQ
# NgWgFiLCR1KOj7bWFhLXT7IfyLh0mEysD+P/hY6QwQ4RewWG7EW5UK+JFswssdcZ
# rEj5XpHZzev/wx7hM4bWsoQ+VIvrH7j3uYGyWkcgYRbdDEkWDv2rsT23lwGYNhht
# oBsrdEBELRw6v4C8doq/+sCmHmuxUMqTGwbArCQVnB1XnLxOEkuqlnfq5MORkzNF
# fxbIRx+LRluOllC0HVaDQd8qxRq1+UC5WIpAcDcrouy4HGgi1onWKrXpgjIAbVyH
# M6cENkK7rnRk96gpeXdmrf0h9HqRciAOY8oUsFsvLyKBOCPBWDrLyOQEY5UoSdtD
# m4QpEVgywCy2z1uU/UObeT/UxJy/9EL/Zb+DHoEK06iEhwONoUJjEBYMJD38RMkk
# mwPTB4UAk9g=
# =s69t
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 12 Oct 2023 09:49:39 EDT
# gpg:                using RSA key 1BD9CAAD735C4C3A460DFCCA4DDE10F700FF835A
# gpg:                issuer "david@redhat.com"
# gpg: Good signature from "David Hildenbrand <david@redhat.com>" [unknown]
# gpg:                 aka "David Hildenbrand <davidhildenbrand@gmail.com>" [full]
# gpg:                 aka "David Hildenbrand <hildenbr@in.tum.de>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1BD9 CAAD 735C 4C3A 460D  FCCA 4DDE 10F7 00FF 835A

* tag 'mem-2023-10-12' of https://github.com/davidhildenbrand/qemu:
  virtio-mem: Mark memslot alias memory regions unmergeable
  memory,vhost: Allow for marking memory device memory regions unmergeable
  virtio-mem: Expose device memory dynamically via multiple memslots if enabled
  virtio-mem: Update state to match bitmap as soon as it's been migrated
  virtio-mem: Pass non-const VirtIOMEM via virtio_mem_range_cb
  memory: Clarify mapping requirements for RamDiscardManager
  memory-device,vhost: Support automatic decision on the number of memslots
  vhost: Add vhost_get_max_memslots()
  kvm: Add stub for kvm_get_max_memslots()
  memory-device,vhost: Support memory devices that dynamically consume memslots
  memory-device: Track required and actually used memslots in DeviceMemoryState
  stubs: Rename qmp_memory_device.c to memory_device.c
  memory-device: Support memory devices with multiple memslots
  vhost: Return number of free memslots
  kvm: Return number of free memslots
  softmmu/physmem: Fixup qemu_ram_block_from_host() documentation
  vhost: Remove vhost_backend_can_merge() callback
  vhost: Rework memslot filtering and fix "used_memslot" tracking

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --combined MAINTAINERS
index ceea4c2bf28e44b000cf72a7d71e39fefbda9a49,0c585d093ff75bda2c44f6ba94ea84fe6e4063f5..04e87c201f5ec7ff5cb682ce02421d9a71b2e375
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -318,11 -318,8 +318,11 @@@ R: Daniel Henrique Barboza <dbarboza@ve
  R: Liu Zhiwei <zhiwei_liu@linux.alibaba.com>
  L: qemu-riscv@nongnu.org
  S: Supported
 +F: configs/targets/riscv*
 +F: docs/system/target-riscv.rst
  F: target/riscv/
  F: hw/riscv/
 +F: hw/intc/riscv*
  F: include/hw/riscv/
  F: linux-user/host/riscv32/
  F: linux-user/host/riscv64/
@@@ -334,7 -331,6 +334,7 @@@ L: qemu-riscv@nongnu.or
  S: Supported
  F: target/riscv/insn_trans/trans_xthead.c.inc
  F: target/riscv/xthead*.decode
 +F: disas/riscv-xthead*
  
  RISC-V XVentanaCondOps extension
  M: Philipp Tomsich <philipp.tomsich@vrull.eu>
@@@ -342,7 -338,6 +342,7 @@@ L: qemu-riscv@nongnu.or
  S: Maintained
  F: target/riscv/XVentanaCondOps.decode
  F: target/riscv/insn_trans/trans_xventanacondops.c.inc
 +F: disas/riscv-xventana*
  
  RENESAS RX CPUs
  R: Yoshinori Sato <ysato@users.sourceforge.jp>
@@@ -562,7 -557,6 +562,7 @@@ M: Cornelia Huck <cohuck@redhat.com
  M: Paolo Bonzini <pbonzini@redhat.com>
  S: Maintained
  F: linux-headers/
 +F: include/standard-headers/
  F: scripts/update-linux-headers.sh
  
  POSIX
@@@ -945,9 -939,6 +945,9 @@@ R: Marcin Juszkiewicz <marcin.juszkiewi
  L: qemu-arm@nongnu.org
  S: Maintained
  F: hw/arm/sbsa-ref.c
 +F: hw/misc/sbsa_ec.c
 +F: hw/watchdog/sbsa_gwdt.c
 +F: include/hw/watchdog/sbsa_gwdt.h
  F: docs/system/arm/sbsa.rst
  F: tests/avocado/machine_aarch64_sbsaref.py
  
@@@ -1295,10 -1286,8 +1295,10 @@@ M: Hervé Poussineau <hpoussin@reactos.
  R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
  S: Maintained
  F: hw/mips/jazz.c
 +F: hw/display/g364fb.c
  F: hw/display/jazz_led.c
  F: hw/dma/rc4030.c
 +F: hw/nvram/ds1225y.c
  
  Malta
  M: Philippe Mathieu-Daudé <philmd@linaro.org>
@@@ -1536,7 -1525,6 +1536,7 @@@ Microchip PolarFire SoC Icicle Ki
  M: Bin Meng <bin.meng@windriver.com>
  L: qemu-riscv@nongnu.org
  S: Supported
 +F: docs/system/riscv/microchip-icicle-kit.rst
  F: hw/riscv/microchip_pfsoc.c
  F: hw/char/mchp_pfsoc_mmuart.c
  F: hw/misc/mchp_pfsoc_dmc.c
@@@ -1552,7 -1540,6 +1552,7 @@@ Shakti C class So
  M: Vijai Kumar K <vijai@behindbytes.com>
  L: qemu-riscv@nongnu.org
  S: Supported
 +F: docs/system/riscv/shakti-c.rst
  F: hw/riscv/shakti_c.c
  F: hw/char/shakti_uart.c
  F: include/hw/riscv/shakti_c.h
@@@ -1564,7 -1551,6 +1564,7 @@@ M: Bin Meng <bin.meng@windriver.com
  M: Palmer Dabbelt <palmer@dabbelt.com>
  L: qemu-riscv@nongnu.org
  S: Supported
 +F: docs/system/riscv/sifive_u.rst
  F: hw/*/*sifive*.c
  F: include/hw/*/*sifive*.h
  
@@@ -1992,7 -1978,6 +1992,7 @@@ M: Marc-André Lureau <marcandre.lureau
  R: Paolo Bonzini <pbonzini@redhat.com>
  S: Odd Fixes
  F: hw/char/
 +F: include/hw/char/
  
  Network devices
  M: Jason Wang <jasowang@redhat.com>
@@@ -2891,6 -2876,7 +2891,7 @@@ F: hw/mem/pc-dimm.
  F: include/hw/mem/memory-device.h
  F: include/hw/mem/nvdimm.h
  F: include/hw/mem/pc-dimm.h
+ F: stubs/memory_device.c
  F: docs/nvdimm.txt
  
  SPICE
@@@ -3421,12 -3407,6 +3422,12 @@@ M: Viktor Prutyanov <viktor.prutyanov@p
  S: Maintained
  F: contrib/elf2dmp/
  
 +Overall sensors
 +M: Philippe Mathieu-Daudé <philmd@linaro.org>
 +S: Odd Fixes
 +F: hw/sensor
 +F: include/hw/sensor
 +
  I2C and SMBus
  M: Corey Minyard <cminyard@mvista.com>
  S: Maintained
@@@ -3592,7 -3572,7 +3593,7 @@@ M: Alistair Francis <Alistair.Francis@w
  L: qemu-riscv@nongnu.org
  S: Maintained
  F: tcg/riscv/
 -F: disas/riscv.c
 +F: disas/riscv.[ch]
  
  S390 TCG target
  M: Richard Henderson <richard.henderson@linaro.org>
@@@ -3928,7 -3908,6 +3929,7 @@@ F: .github/workflows/lockdown.ym
  F: .gitlab-ci.yml
  F: .gitlab-ci.d/
  F: .travis.yml
 +F: docs/devel/ci*
  F: scripts/ci/
  F: tests/docker/
  F: tests/vm/