]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge tag 'pull-request-2023-12-20' of https://gitlab.com/thuth/qemu into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 20 Dec 2023 14:40:15 +0000 (09:40 -0500)
committerStefan Hajnoczi <stefanha@redhat.com>
Wed, 20 Dec 2023 14:40:16 +0000 (09:40 -0500)
* Add compat machines for QEMU 9.0
* Some header clean-ups by Philippe
* Restrict type names to alphanumerical range (and a few special characters)
* Fix analyze-migration.py script on s390x
* Clean up and improve some tests
* Document handling of commas in CLI options parameters

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmWCtYsRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbWLnw//cNJrxG0V+j0iakX+C7HRumVrLBDI4KYY
# Cp2Hx92SyeQ0Kk8DJS6JueTV0SLjMsV77APu2YPH7ELmPlk+CB9gqmV7xVoYNvsm
# QbRPlIjFw8MHLekadc2A+C+pn48tWACoOdBEDIfazKrxybnf0B57RC/fIfMKHjbs
# 2ALCoFbbgphs7yWuzTHK8ayKaGMhUVkWfzHQwpnq899olHyZBhkl951uKJA6VmLx
# KvggePkpszLjmmXA8MH1hDCcizki31cB0ZKTbQFCyE42s2S3Hvg0GueU90O7Y1cj
# lS5tPVQxyEhUYMLL+/hudlf2OYqVn2BalB7ieUQIy6rG8yoc9zxfIKQi0ccl+2oA
# s8HRq5S0bSjtilQogU1LQL/Gk6W1/N9MmnhKvCGB+BTK5KX7s4EQk02y9gGZm/8s
# pMErMyaXTG4dLiTAK42VgMVDqCYvzBmE+Gj91OmoUR7fb+VMrsWxeBFxMPDn+VtL
# TMJegIFsjw2QCSitcU4v+nP0qtKgXGbuZtrGXKabrxH5PmeQFJDSM7TwpTK4qvjK
# QMIQKBbz8BfJnUzN8qAaaJEpp1T5tcMJClKtfcgxq/+VyaSaHLmD0cljqBC+g+y7
# FTo+fa7oYx44sAlqapdEXBSGn4T+J26iuCef13CCCiPfYBv/tk3b2E0AWHj4y58I
# +VpInjUaPBQ=
# =TA1/
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 20 Dec 2023 04:36:11 EST
# 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-12-20' of https://gitlab.com/thuth/qemu:
  tests/unit/test-qmp-event: Replace fixture by global variables
  tests/unit/test-qmp-event: Simplify event emission check
  tests/unit/test-qmp-event: Drop superfluous mutex
  tests/qtest/npcm7xx_pwm-test: Only do full testing in slow mode
  qemu-options: Clarify handling of commas in options parameters
  tests/qtest/migration-test: Fix analyze-migration.py for s390x
  qom/object: Limit type names to alphanumerical and some few special characters
  tests/unit/test-io-task: Rename "qemu:dummy" to avoid colon in the name
  memory: Remove "qemu:" prefix from the "qemu:ram-discard-manager" type name
  hw: Replace anti-social QOM type names (again)
  docs/system/arm: Fix for rename of type "xlnx.bbram-ctrl"
  target: Restrict 'sysemu/reset.h' to system emulation
  hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header
  hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header
  hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header
  system/qtest: Restrict QTest API to system emulation
  system/qtest: Include missing 'hw/core/cpu.h' header
  MAINTAINERS: Add some more vmware-related files to the corresponding section
  hw: Add compat machines for 9.0

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
1  2 
MAINTAINERS
hw/arm/virt.c
qemu-options.hx

diff --combined MAINTAINERS
index 0ddb20a35f205dba3b437c33bf489a53ecfc36b0,9cafa98a471d1fe2f0ef3db24c7f7e347a45034f..395f26ba8615455eec28f0acb9f80db4f1292c12
@@@ -2167,17 -2167,6 +2167,17 @@@ F: hw/vfio/ap.
  F: docs/system/s390x/vfio-ap.rst
  L: qemu-s390x@nongnu.org
  
 +iommufd
 +M: Yi Liu <yi.l.liu@intel.com>
 +M: Eric Auger <eric.auger@redhat.com>
 +M: Zhenzhong Duan <zhenzhong.duan@intel.com>
 +S: Supported
 +F: backends/iommufd.c
 +F: include/sysemu/iommufd.h
 +F: include/qemu/chardev_open.h
 +F: util/chardev_open.c
 +F: docs/devel/vfio-iommufd.rst
 +
  vhost
  M: Michael S. Tsirkin <mst@redhat.com>
  S: Supported
@@@ -2399,8 -2388,13 +2399,13 @@@ F: hw/net/net_tx_pkt
  Vmware
  M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
  S: Maintained
+ F: docs/specs/vmw_pvscsi-spec.txt
+ F: hw/display/vmware_vga.c
  F: hw/net/vmxnet*
  F: hw/scsi/vmw_pvscsi*
+ F: pc-bios/efi-vmxnet3.rom
+ F: pc-bios/vgabios-vmware.bin
+ F: roms/config.vga-vmware
  F: tests/qtest/vmxnet3-test.c
  F: docs/specs/vwm_pvscsi-spec.rst
  
diff --combined hw/arm/virt.c
index 040ca2d79485a5df41573ea420db61051a771c59,efd503d45e4806aae6d1a3a00de1dd346ae8fde8..8b69aba189aaa7d9b4274826bbed643050fd759e
@@@ -1998,14 -1998,13 +1998,14 @@@ static void virt_cpu_post_init(VirtMach
              if (pmu) {
                  assert(arm_feature(&ARM_CPU(cpu)->env, ARM_FEATURE_PMU));
                  if (kvm_irqchip_in_kernel()) {
 -                    kvm_arm_pmu_set_irq(cpu, VIRTUAL_PMU_IRQ);
 +                    kvm_arm_pmu_set_irq(ARM_CPU(cpu), VIRTUAL_PMU_IRQ);
                  }
 -                kvm_arm_pmu_init(cpu);
 +                kvm_arm_pmu_init(ARM_CPU(cpu));
              }
              if (steal_time) {
 -                kvm_arm_pvtime_init(cpu, pvtime_reg_base +
 -                                         cpu->cpu_index * PVTIME_SIZE_PER_CPU);
 +                kvm_arm_pvtime_init(ARM_CPU(cpu), pvtime_reg_base
 +                                                  + cpu->cpu_index
 +                                                    * PVTIME_SIZE_PER_CPU);
              }
          }
      } else {
@@@ -3181,10 -3180,17 +3181,17 @@@ static void machvirt_machine_init(void
  }
  type_init(machvirt_machine_init);
  
+ static void virt_machine_9_0_options(MachineClass *mc)
+ {
+ }
+ DEFINE_VIRT_MACHINE_AS_LATEST(9, 0)
  static void virt_machine_8_2_options(MachineClass *mc)
  {
+     virt_machine_9_0_options(mc);
+     compat_props_add(mc->compat_props, hw_compat_8_2, hw_compat_8_2_len);
  }
- DEFINE_VIRT_MACHINE_AS_LATEST(8, 2)
+ DEFINE_VIRT_MACHINE(8, 2)
  
  static void virt_machine_8_1_options(MachineClass *mc)
  {
diff --combined qemu-options.hx
index 5fe8ea57d2d2f9390a976ef2fefe86463e888bb1,a935aaae44a39070e19713069336d46c15355ff6..68f2c09b00ca7bcb45b594fee702382c716f058b
@@@ -4086,9 -4086,13 +4086,13 @@@ DEF("fw_cfg", HAS_ARG, QEMU_OPTION_fwcf
  SRST
  ``-fw_cfg [name=]name,file=file``
      Add named fw\_cfg entry with contents from file file.
+     If the filename contains comma, you must double it (for instance,
+     "file=my,,file" to use file "my,file").
  
  ``-fw_cfg [name=]name,string=str``
      Add named fw\_cfg entry with contents from string str.
+     If the string contains comma, you must double it (for instance,
+     "string=my,,string" to use file "my,string").
  
      The terminating NUL character of the contents of str will not be
      included as part of the fw\_cfg item data. To insert contents with
  
          The ``share`` boolean option is on by default with memfd.
  
 +    ``-object iommufd,id=id[,fd=fd]``
 +        Creates an iommufd backend which allows control of DMA mapping
 +        through the ``/dev/iommu`` device.
 +
 +        The ``id`` parameter is a unique ID which frontends (such as
 +        vfio-pci of vdpa) will use to connect with the iommufd backend.
 +
 +        The ``fd`` parameter is an optional pre-opened file descriptor
 +        resulting from ``/dev/iommu`` opening. Usually the iommufd is shared
 +        across all subsystems, bringing the benefit of centralized
 +        reference counting.
 +
      ``-object rng-builtin,id=id``
          Creates a random number generator backend which obtains entropy
          from QEMU builtin functions. The ``id`` parameter is a unique ID