[Qemu-commits] [qemu/qemu] 220591: Merge tag 'for_upstream' of https://git.kernel.org...
Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: 2205917707f4afbfea358792fe1777907f5307ff https://github.com/qemu/qemu/commit/2205917707f4afbfea358792fe1777907f5307ff Author: Stefan Hajnoczi Date: 2022-10-31 (Mon, 31 Oct 2022) Changed paths: M MAINTAINERS M backends/cryptodev-builtin.c A backends/cryptodev-lkcf.c M backends/cryptodev-vhost-user.c M backends/cryptodev.c M backends/meson.build M crypto/akcipher.c M crypto/der.c M crypto/der.h M crypto/rsakey.c M crypto/rsakey.h A docs/devel/acpi-bits.rst M docs/devel/index-build.rst M hw/acpi/aml-build.c M hw/acpi/erst.c M hw/acpi/nvdimm.c M hw/arm/Kconfig M hw/arm/virt-acpi-build.c M hw/block/vhost-user-blk.c M hw/core/machine.c A hw/cxl/cxl-cdat.c M hw/cxl/meson.build A hw/display/acpi-vga-stub.c A hw/display/acpi-vga.c M hw/display/meson.build M hw/display/vga-pci.c M hw/display/vga_int.h M hw/i386/acpi-build.c M hw/i386/e820_memory_layout.c M hw/i386/e820_memory_layout.h M hw/i386/fw_cfg.c M hw/i386/fw_cfg.h M hw/i386/intel_iommu.c M hw/i386/intel_iommu_internal.h M hw/i386/microvm.c M hw/i386/pc.c M hw/i386/trace-events M hw/ide/piix.c M hw/isa/lpc_ich9.c M hw/isa/piix3.c M hw/mem/cxl_type3.c M hw/net/e1000e.c M hw/net/rocker/rocker.c M hw/net/vhost_net-stub.c M hw/net/vhost_net.c M hw/net/virtio-net.c M hw/net/vmxnet3.c M hw/nvme/ctrl.c M hw/pci-bridge/cxl_upstream.c M hw/pci/meson.build M hw/pci/msix.c A hw/pci/pcie_doe.c M hw/rdma/vmw/pvrdma_main.c M hw/remote/vfio-user-obj.c M hw/smbios/smbios.c M hw/smbios/smbios_build.h M hw/vfio/common.c M hw/virtio/vhost-user.c M hw/virtio/vhost.c M hw/virtio/virtio-crypto.c M hw/virtio/virtio-iommu-pci.c M hw/virtio/virtio-pci.c M hw/virtio/virtio-rng-pci.c M hw/virtio/virtio.c M include/crypto/akcipher.h M include/exec/memory.h M include/hw/acpi/acpi_aml_interface.h A include/hw/cxl/cxl_cdat.h M include/hw/cxl/cxl_component.h M include/hw/cxl/cxl_device.h M include/hw/cxl/cxl_pci.h M include/hw/firmware/smbios.h M include/hw/i386/intel_iommu.h M include/hw/ide/pci.h M include/hw/pci/msix.h M include/hw/pci/pci_bus.h M include/hw/pci/pci_ids.h M include/hw/pci/pcie.h A include/hw/pci/pcie_doe.h M include/hw/pci/pcie_regs.h M include/hw/virtio/vhost.h M include/hw/virtio/virtio-pci.h M include/hw/virtio/virtio.h M include/net/vhost_net.h M include/sysemu/cryptodev.h M qapi/qom.json M softmmu/memory.c A tests/avocado/acpi-bits.py A tests/avocado/acpi-bits/bits-config/bits-cfg.txt A tests/avocado/acpi-bits/bits-tests/smbios.py2 A tests/avocado/acpi-bits/bits-tests/testacpi.py2 A tests/avocado/acpi-bits/bits-tests/testcpuid.py2 M tests/data/acpi/pc/DSDT M tests/data/acpi/pc/DSDT.acpierst M tests/data/acpi/pc/DSDT.acpihmat M tests/data/acpi/pc/DSDT.bridge M tests/data/acpi/pc/DSDT.cphp M tests/data/acpi/pc/DSDT.dimmpxm M tests/data/acpi/pc/DSDT.hpbridge M tests/data/acpi/pc/DSDT.hpbrroot M tests/data/acpi/pc/DSDT.ipmikcs M tests/data/acpi/pc/DSDT.memhp M tests/data/acpi/pc/DSDT.nohpet M tests/data/acpi/pc/DSDT.numamem M tests/data/acpi/pc/DSDT.roothp M tests/data/acpi/pc/SSDT.dimmpxm A tests/data/acpi/q35/APIC.acpihmat-noinitiator A tests/data/acpi/q35/APIC.core-count2 M tests/data/acpi/q35/DSDT M tests/data/acpi/q35/DSDT.acpierst M tests/data/acpi/q35/DSDT.acpihmat A tests/data/acpi/q35/DSDT.acpihmat-noinitiator M tests/data/acpi/q35/DSDT.applesmc M tests/data/acpi/q35/DSDT.bridge A tests/data/acpi/q35/DSDT.core-count2 M tests/data/acpi/q35/DSDT.cphp M tests/data/acpi/q35/DSDT.cxl M tests/data/acpi/q35/DSDT.dimmpxm M tests/data/acpi/q35/DSDT.ipmibt M tests/data/acpi/q35/DSDT.ipmismbus M tests/data/acpi/q35/DSDT.ivrs M tests/data/acpi/q35/DSDT.memhp M tests/data/acpi/q35/DSDT.mmio64 M tests/data/acpi/q35/DSDT.multi-bridge M tests/data/acpi/q35/DSDT.nohpet M tests/data/acpi/q35/DSDT.numamem M tests/data/acpi/q35/DSDT.pvpanic-isa M tests/data/acpi/q35/DSDT.tis.tpm12 M tests/data/acpi/q35/DSDT.tis.tpm2 M tests/data/acpi/q35/DSDT.viot M tests/data/acpi/q35/DSDT.xapic A tests/data/acpi/q35/FACP.core-count2 A tests/data/acpi/q35/HMAT.acpihmat-noinitiator A tests/data/acpi/q35/SRAT.acpihmat-noinitiator M tests/data/acpi/q35/SSDT.dimmpxm M tests/data/acpi/virt/APIC A tests/data/acpi/virt/APIC.acpihmatvirt M tests/data/acpi/virt/APIC.memhp M tests/data/acpi/virt/APIC.numamem A tests/data/acpi/virt/DSDT.acpihmatvirt M tests/data/acpi/virt/FACP M tests/data/acpi/virt/FACP.memhp M tests/data/acpi/virt/FACP.numamem A
[Qemu-commits] [qemu/qemu] 0d0e18: Merge tag 'pull-qemu-20221031' of https://gitlab.c...
Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: 0d0e18cf7d220e25d4c1d06bdaa809409bcfa0c0
https://github.com/qemu/qemu/commit/0d0e18cf7d220e25d4c1d06bdaa809409bcfa0c0
Author: Stefan Hajnoczi
Date: 2022-10-31 (Mon, 31 Oct 2022)
Changed paths:
M meson.build
M scripts/nsis.py
Log Message:
---
Merge tag 'pull-qemu-20221031' of https://gitlab.com/stweil/qemu into staging
Patches for Windows
# -BEGIN PGP SIGNATURE-
#
# iQIzBAABCAAdFiEESSNv6nXJXWmOwreK4Iwh1Wd0UK0FAmNfkC0ACgkQ4Iwh1Wd0
# UK2tEw//QQapqOnJQmjiGVWJ3xUEVoDUmZbhXlPaLKOzSkAnrnIdIO2p4jsXrITi
# LfL8PF7wCg1+oldPsKmhh+ZD6XiUyNBpTt61atXRJS/TybKAGjI33XC+/Hliwity
# 4A0+WxJ960ExLwZzaE/ANTYM86Jo5SqhzACosGh8txRbL1rkmqlrCU1DwnhU6vq1
# 5ph1HFgpqkii43Eiq+v1nmkbh5MWVuMap6MOoQzgwVTkaUU0cTmR8/KqhSHrIryj
# xFPH2wY8pA3vFgMv5OSOjq5Lg197kiWUyhJa6eBBsi4MKnQgRzAxE6yHhpyYZ5EA
# dMW9iLhPVFRDAoQOiSRLj/NA1nl2gwDdjs5WhKqF6AtxMck5IDqltLKFvLlXIxiK
# BYi3ghVeA5LUarcxuAOHse8rCXxBaIJI3aSolO5fDe0mcpNIb7CgCleBKlnBWEsP
# GtRhr1AkoKHcetO5iEfg1QG71/XWdWWy3hfW39GJeBl9C7/AxzoLC7yStI7Iv3b4
# tv/Tylt+Js1KadA9z/tof4wm4NkGf2Q9aFoSbm4pSZH+7b4ZI5LVLlDKYCnjT37v
# LekyJgkU3wRjKdLkM1n6qhsa5Ey2D7STw9ANWQwqOImoj5Dkix2FIqfaydctgrxq
# zmdQpJhOzIO8b9vVSRLn2xYtae5LNlxiAx85r5l11jwfqDOWTts=
# =ZJqu
# -END PGP SIGNATURE-
# gpg: Signature made Mon 31 Oct 2022 05:06:53 EDT
# gpg:using RSA key 49236FEA75C95D698EC2B78AE08C21D5677450AD
# gpg: Good signature from "Stefan Weil " [unknown]
# gpg: aka "Stefan Weil (Universitätsbibliothek Mannheim)
" [unknown]
# gpg: aka "Stefan Weil "
[unknown]
# gpg: aka "Stefan Weil " [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2 B78A E08C 21D5 6774 50AD
* tag 'pull-qemu-20221031' of https://gitlab.com/stweil/qemu:
block/nfs: Fix 32-bit Windows build
scripts/nsis.py: Automatically package required DLLs of QEMU executables
scripts/nsis.py: Fix destination directory name when invoked on Windows
scripts/nsis.py: Drop the unnecessary path separator
Signed-off-by: Stefan Hajnoczi
Commit: 5107fd3effb1cfec3b96d9e819f1605048640e31
https://github.com/qemu/qemu/commit/5107fd3effb1cfec3b96d9e819f1605048640e31
Author: Peter Maydell
Date: 2022-10-31 (Mon, 31 Oct 2022)
Changed paths:
M net/vhost-vdpa.c
Log Message:
---
net/vhost-vdpa.c: Fix clang compilation failure
Commit 8801ccd0500437 introduced a compilation failure with clang
version 10.0.0-4ubuntu1:
../../net/vhost-vdpa.c:654:16: error: variable 'vdpa_device_fd' is
used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
} else if (opts->has_vhostfd) {
^
../../net/vhost-vdpa.c:662:33: note: uninitialized use occurs here
r = vhost_vdpa_get_features(vdpa_device_fd, , errp);
^~
../../net/vhost-vdpa.c:654:12: note: remove the 'if' if its condition
is always true
} else if (opts->has_vhostfd) {
^~~
../../net/vhost-vdpa.c:629:23: note: initialize the variable
'vdpa_device_fd' to silence this warning
int vdpa_device_fd;
^
= 0
1 error generated.
It's a false positive -- the compiler doesn't manage to figure out
that the error checks further up mean that there's no code path where
vdpa_device_fd isn't initialized. Put another way, the problem is
that we check "if (opts->has_vhostfd)" when in fact that condition
must always be true. A cleverer static analyser would probably warn
that we were checking an always-true condition.
Fix the compilation failure by removing the unnecessary if().
Fixes: 8801ccd0500437 ("vhost-vdpa: allow passing opened vhostfd to vhost-vdpa")
Signed-off-by: Peter Maydell
Message-Id: <20221031132901.1277150-1-peter.mayd...@linaro.org>
Signed-off-by: Stefan Hajnoczi
Compare: https://github.com/qemu/qemu/compare/c4e9ddef97b0...5107fd3effb1
[Qemu-commits] [qemu/qemu] c4e9dd: net/vhost-vdpa.c: Fix clang compilation failure
Branch: refs/heads/staging
Home: https://github.com/qemu/qemu
Commit: c4e9ddef97b07bdab222fb5cc1246f54357c5e87
https://github.com/qemu/qemu/commit/c4e9ddef97b07bdab222fb5cc1246f54357c5e87
Author: Peter Maydell
Date: 2022-10-31 (Mon, 31 Oct 2022)
Changed paths:
M net/vhost-vdpa.c
Log Message:
---
net/vhost-vdpa.c: Fix clang compilation failure
Commit 8801ccd0500437 introduced a compilation failure with clang
version 10.0.0-4ubuntu1:
../../net/vhost-vdpa.c:654:16: error: variable 'vdpa_device_fd' is
used uninitialized whenever 'if' condition is false
[-Werror,-Wsometimes-uninitialized]
} else if (opts->has_vhostfd) {
^
../../net/vhost-vdpa.c:662:33: note: uninitialized use occurs here
r = vhost_vdpa_get_features(vdpa_device_fd, , errp);
^~
../../net/vhost-vdpa.c:654:12: note: remove the 'if' if its condition
is always true
} else if (opts->has_vhostfd) {
^~~
../../net/vhost-vdpa.c:629:23: note: initialize the variable
'vdpa_device_fd' to silence this warning
int vdpa_device_fd;
^
= 0
1 error generated.
It's a false positive -- the compiler doesn't manage to figure out
that the error checks further up mean that there's no code path where
vdpa_device_fd isn't initialized. Put another way, the problem is
that we check "if (opts->has_vhostfd)" when in fact that condition
must always be true. A cleverer static analyser would probably warn
that we were checking an always-true condition.
Fix the compilation failure by removing the unnecessary if().
Fixes: 8801ccd0500437 ("vhost-vdpa: allow passing opened vhostfd to vhost-vdpa")
Signed-off-by: Peter Maydell
Message-Id: <20221031132901.1277150-1-peter.mayd...@linaro.org>
Signed-off-by: Stefan Hajnoczi
[Qemu-commits] [qemu/qemu] d0180f: hw/mem/nvdimm: fix error message for 'unarmed' flag
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: d0180f0acb142ca78e30857b8d8511ee9f3bd764
https://github.com/qemu/qemu/commit/d0180f0acb142ca78e30857b8d8511ee9f3bd764
Author: Julia Suvorova
Date: 2022-10-24 (Mon, 24 Oct 2022)
Changed paths:
M hw/mem/nvdimm.c
Log Message:
---
hw/mem/nvdimm: fix error message for 'unarmed' flag
In the ACPI specification [1], the 'unarmed' bit is set when a device
cannot accept a persistent write. This means that when a memdev is
read-only, the 'unarmed' flag must be turned on. The logic is correct,
just changing the error message.
[1] ACPI NFIT NVDIMM Region Mapping Structure "NVDIMM State Flags" Bit 3
Fixes: dbd730e859 ("nvdimm: check -object memory-backend-file, readonly=on
option")
Signed-off-by: Julia Suvorova
Reviewed-by: Stefan Hajnoczi
Reviewed-by: Pankaj Gupta
Reviewed-by: Philippe Mathieu-Daudé
Acked-by: David Hildenbrand
Message-Id: <20221023195812.15523-1-jus...@redhat.com>
Signed-off-by: David Hildenbrand
Commit: bf98afc75efedf10965a3f2d98aa43c234cf69ed
https://github.com/qemu/qemu/commit/bf98afc75efedf10965a3f2d98aa43c234cf69ed
Author: Jungmin Park
Date: 2022-10-26 (Wed, 26 Oct 2022)
Changed paths:
M crypto/pbkdf.c
Log Message:
---
crypto/luks: Support creating LUKS image on Darwin
When the user creates a LUKS-encrypted qcow2 image using the qemu-img
program, the passphrase is hashed using PBKDF2 with a dynamic
number of iterations. The number of iterations is determined by
measuring thread cpu time usage, such that it takes approximately
2 seconds to compute the hash.
Because Darwin doesn't implement getrusage(RUSAGE_THREAD), we get an
error message:
> qemu-img: test.qcow2: Unable to calculate thread CPU usage on this platform
for this command:
> qemu-img create --object secret,id=key,data=1234 -f qcow2 -o
> 'encrypt.format=luks,encrypt.key-secret=key' test.qcow2 100M
This patch implements qcrypto_pbkdf2_get_thread_cpu() for Darwin so that
the above command works.
Signed-off-by: Jungmin Park
Signed-off-by: Daniel P. Berrangé
Commit: 926a895c2cfcd621373eb86288dd83d08cb53f15
https://github.com/qemu/qemu/commit/926a895c2cfcd621373eb86288dd83d08cb53f15
Author: Bin Meng
Date: 2022-10-26 (Wed, 26 Oct 2022)
Changed paths:
M util/qemu-sockets.c
Log Message:
---
util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary
files
Replace the existing logic to get the directory for temporary files
with g_get_tmp_dir(), which works for win32 too.
Signed-off-by: Bin Meng
Reviewed-by: Marc-André Lureau
Signed-off-by: Daniel P. Berrangé
Commit: 985be62d4481e11830485a25a47a932e5829d223
https://github.com/qemu/qemu/commit/985be62d4481e11830485a25a47a932e5829d223
Author: Bin Meng
Date: 2022-10-26 (Wed, 26 Oct 2022)
Changed paths:
M io/channel-watch.c
Log Message:
---
io/channel-watch: Drop a superfluous '#ifdef WIN32'
In the win32 version qio_channel_create_socket_watch() body there is
no need to do a '#ifdef WIN32'.
Signed-off-by: Bin Meng
Reviewed-by: Marc-André Lureau
Signed-off-by: Daniel P. Berrangé
Commit: 6c822a031b9e87fea8303373d6501f6d6a3c1e31
https://github.com/qemu/qemu/commit/6c822a031b9e87fea8303373d6501f6d6a3c1e31
Author: Bin Meng
Date: 2022-10-26 (Wed, 26 Oct 2022)
Changed paths:
M io/channel-watch.c
Log Message:
---
io/channel-watch: Drop the unnecessary cast
There is no need to do a type cast on ssource->socket as it is
already declared as a SOCKET.
Suggested-by: Marc-André Lureau
Signed-off-by: Bin Meng
Reviewed-by: Marc-André Lureau
Signed-off-by: Daniel P. Berrangé
Commit: 23f77f05f2faa8ff3028fef388322f7b4f09533e
https://github.com/qemu/qemu/commit/23f77f05f2faa8ff3028fef388322f7b4f09533e
Author: Bin Meng
Date: 2022-10-26 (Wed, 26 Oct 2022)
Changed paths:
M io/channel-watch.c
Log Message:
---
io/channel-watch: Fix socket watch on Windows
Random failure was observed when running qtests on Windows due to
"Broken pipe" detected by qmp_fd_receive(). What happened is that
the qtest executable sends testing data over a socket to the QEMU
under test but no response is received. The errno of the recv()
call from the qtest executable indicates ETIMEOUT, due to the qmp
chardev's tcp_chr_read() is never called to receive testing data
hence no response is sent to the other side.
tcp_chr_read() is registered as the callback of the socket watch
GSource. The reason of the callback not being called by glib, is
that the source check fails to indicate the source is ready. There
are two socket watch sources created to monitor the same socket
event object from the char-socket backend in update_ioc_handlers().
During the source check phase, qio_channel_socket_source_check()
calls WSAEnumNetworkEvents() to discover occurrences of network
events for the indicated socket,
