Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into...

virtio,pc,pci: features, cleanups, fixes

mostly vhost-vdpa:
    guest announce feature emulation when using shadow virtqueue
    support for configure interrupt
    startup speed ups

an acpi change to only generate cluster node in PPTT when specified for arm

misc fixes, cleanups

Signed-off-by: Michael S. Tsirkin <[email protected]>
# gpg: Signature made Sun 08 Jan 2023 08:01:39 GMT
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "[email protected]"
# gpg: Good signature from "Michael S. Tsirkin <[email protected]>" [full]
# gpg:                 aka "Michael S. Tsirkin <[email protected]>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: (50 commits)
  vhost-scsi: fix memleak of vsc->inflight
  acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
  tests: acpi: aarch64: Add *.topology tables
  tests: acpi: aarch64: Add topology test for aarch64
  tests: acpi: Add and whitelist *.topology blobs
  tests: virt: Update expected ACPI tables for virt test
  hw/acpi/aml-build: Only generate cluster node in PPTT when specified
  tests: virt: Allow changes to PPTT test table
  virtio-pci: fix proxy->vector_irqfd leak in virtio_pci_set_guest_notifiers
  vdpa: commit all host notifier MRs in a single MR transaction
  vhost: configure all host notifiers in a single MR transaction
  vhost: simplify vhost_dev_enable_notifiers
  vdpa: harden the error path if get_iova_range failed
  vdpa-dev: get iova range explicitly
  docs/devel: Rules on #include in headers
  include: Include headers where needed
  include/hw/virtio: Break inclusion loop
  include/hw/cxl: Break inclusion loop cxl_pci.h and cxl_cdat_h
  include/hw/pci: Include hw/pci/pci.h where needed
  include/hw/pci: Split pci_device.h off pci.h
  ...

Signed-off-by: Peter Maydell <[email protected]>

diff --combined include/hw/boards.h
index 8e1a590997c5cebb08c7fafc410aed16337a9da9,b0abbdd5dc217a68e751fdb0ddb325573f77bcb5..6fbbfd56c8085365903ca1aaa350e3cabfc10400
--- 1/include/hw/boards.h
--- 2/include/hw/boards.h
+++ b/include/hw/boards.h
@@@ -6,6 -6,7 +6,6 @@@
  #include "exec/memory.h"
  #include "sysemu/hostmem.h"
  #include "sysemu/blockdev.h"
 -#include "qemu/accel.h"
  #include "qapi/qapi-types-machine.h"
  #include "qemu/module.h"
  #include "qom/object.h"
@@@ -129,11 -130,14 +129,14 @@@ typedef struct 
   * @prefer_sockets - whether sockets are preferred over cores in smp parsing
   * @dies_supported - whether dies are supported by the machine
   * @clusters_supported - whether clusters are supported by the machine
+  * @has_clusters - whether clusters are explicitly specified in the user
+  *                 provided SMP configuration
   */
  typedef struct {
      bool prefer_sockets;
      bool dies_supported;
      bool clusters_supported;
+     bool has_clusters;
  } SMPCompatProps;
  
  /**

diff --combined qemu-options.hx
index f3d5e1313ca1cda2cbc8c77c99838a1e804252c2,8662568324bf0941a614cba8088bbab2775e9a3f..fa0084c58f1b907e7eccf7ebfef033de5e27d52f
--- 1/qemu-options.hx
--- 2/qemu-options.hx
+++ b/qemu-options.hx
@@@ -343,6 -343,9 +343,9 @@@ SRS
      ::
  
          -smp 2
+ 
+     Note: The cluster topology will only be generated in ACPI and exposed
+     to guest if it's explicitly specified in -smp.
  ERST
  
  DEF("numa", HAS_ARG, QEMU_OPTION_numa,
@@@ -3379,9 -3382,11 +3382,9 @@@ DEF("chardev", HAS_ARG, QEMU_OPTION_cha
  #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \
          || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
      "-chardev serial,id=id,path=path[,mux=on|off][,logfile=PATH][,logappend=on|off]\n"
 -    "-chardev tty,id=id,path=path[,mux=on|off][,logfile=PATH][,logappend=on|off]\n"
  #endif
  #if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
      "-chardev parallel,id=id,path=path[,mux=on|off][,logfile=PATH][,logappend=on|off]\n"
 -    "-chardev parport,id=id,path=path[,mux=on|off][,logfile=PATH][,logappend=on|off]\n"
  #endif
  #if defined(CONFIG_SPICE)
      "-chardev spicevmc,id=id,name=name[,debug=debug][,logfile=PATH][,logappend=on|off]\n"
@@@ -3396,7 -3401,7 +3399,7 @@@ The general form of a character device 
  ``-chardev backend,id=id[,mux=on|off][,options]``
      Backend is one of: ``null``, ``socket``, ``udp``, ``msmouse``,
      ``vc``, ``ringbuf``, ``file``, ``pipe``, ``console``, ``serial``,
 -    ``pty``, ``stdio``, ``braille``, ``tty``, ``parallel``, ``parport``,
 +    ``pty``, ``stdio``, ``braille``, ``parallel``,
      ``spicevmc``, ``spiceport``. The specific backend will determine the
      applicable options.
  
@@@ -3620,8 -3625,15 +3623,8 @@@ The available backends are
      Connect to a local BrlAPI server. ``braille`` does not take any
      options.
  
 -``-chardev tty,id=id,path=path``
 -    ``tty`` is only available on Linux, Sun, FreeBSD, NetBSD, OpenBSD
 -    and DragonFlyBSD hosts. It is an alias for ``serial``.
 -
 -    ``path`` specifies the path to the tty. ``path`` is required.
 -
  ``-chardev parallel,id=id,path=path``
    \
 -``-chardev parport,id=id,path=path``
      ``parallel`` is only available on Linux, FreeBSD and DragonFlyBSD
      hosts.