Compare commits
28 Commits
9fda121878
...
bd635cd85e
Author | SHA1 | Date |
---|---|---|
Daniel P. Berrangé | bd635cd85e | |
Richard W.M. Jones | 0ef68abd71 | |
Richard W.M. Jones | f48e9e218c | |
Richard W.M. Jones | d8ea841ee8 | |
Richard W.M. Jones | fb1517ca3f | |
Cole Robinson | 650c8272f6 | |
Eduardo Lima (Etrunko) | 8d94f851ec | |
Stefan Hajnoczi | 4eb8ef11c1 | |
Fedora Release Engineering | 8f629c7e0f | |
Richard W.M. Jones | 3f79a68361 | |
Daniel P. Berrangé | fcf47181da | |
Daniel P. Berrangé | c59732e734 | |
Daniel P. Berrangé | b47d99db35 | |
Richard W.M. Jones | 6a1d35e912 | |
Eduardo Lima (Etrunko) | 3ce4eaa6a2 | |
Eduardo Lima (Etrunko) | d09d3961a3 | |
Eduardo Lima (Etrunko) | 7539983f1e | |
Davide Cavalca | 92a87311fd | |
Davide Cavalca | 795912844a | |
Cole Robinson | bd46f9571e | |
Eduardo Lima (Etrunko) | 64fe772650 | |
Eduardo Lima (Etrunko) | 055837f300 | |
Cole Robinson | 2874d70b6b | |
Daniel P. Berrangé | 34254733fe | |
Daniel P. Berrangé | 0eeaeaae15 | |
Daniel P. Berrangé | 2abd5d20f1 | |
Paolo Bonzini | 98276b3e5f | |
Fedora Release Engineering | 22305b524e |
|
@ -0,0 +1,6 @@
|
|||
# Using _sourcedir makes the spec much more readable IMO.
|
||||
# The Fedora wiki complaint is pretty obscure too.
|
||||
addFilter(r'use-of-RPM_SOURCE_DIR')
|
||||
|
||||
# This is a virtual Provides: that should not contain any version info
|
||||
addFilter(r'unversioned-explicit-provides vhostuser-backend\(fs\)')
|
|
@ -1,10 +1,10 @@
|
|||
From e54512fe75f85640c0c73e53e6f8bd0b9d193529 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Tue, 1 Feb 2022 20:09:37 +0100
|
||||
Subject: [PATCH] target/i386: the sgx_epc_get_section stub is reachable
|
||||
Subject: [PATCH 1/7] target/i386: the sgx_epc_get_section stub is reachable
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-type: text/plain
|
||||
|
||||
The sgx_epc_get_section stub is reachable from cpu_x86_cpuid. It
|
||||
should not assert, instead it should just return true just like
|
||||
|
@ -28,3 +28,6 @@ index 26833eb233..16b1dfd90b 100644
|
|||
- g_assert_not_reached();
|
||||
+ return true;
|
||||
}
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
From 2f0a0afbf915d36c39c5cfac1e31c6edc7f47bef Mon Sep 17 00:00:00 2001
|
||||
From: "Eduardo Lima (Etrunko)" <etrunko@redhat.com>
|
||||
Date: Thu, 1 Sep 2022 12:43:49 -0300
|
||||
Subject: [PATCH 2/7] tests: Disable pci_virtio_vga for ppc64
|
||||
|
||||
starting QEMU: exec ./qemu-system-ppc64 -qtest unix:/tmp/qtest-2378197.sock -qtest-log /dev/null -chardev socket,path=/tmp/qtest-2378197.qmp,id=char0 -mon chardev=char0,mode=control -display none -vga none -device virtio-vga -accel qtest
|
||||
stderr:
|
||||
qemu-system-ppc64: -device virtio-vga: 'virtio-vga' is not a valid device model name
|
||||
Broken pipe
|
||||
../tests/qtest/libqtest.c:156: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
|
||||
|
||||
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
||||
---
|
||||
tests/qtest/display-vga-test.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/qtest/display-vga-test.c b/tests/qtest/display-vga-test.c
|
||||
index ace3bb28e0..628dad4cf2 100644
|
||||
--- a/tests/qtest/display-vga-test.c
|
||||
+++ b/tests/qtest/display-vga-test.c
|
||||
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
|
||||
qtest_add_func("/display/pci/multihead", pci_multihead);
|
||||
qtest_add_func("/display/pci/virtio-gpu", pci_virtio_gpu);
|
||||
if (g_str_equal(arch, "i386") || g_str_equal(arch, "x86_64") ||
|
||||
- g_str_equal(arch, "hppa") || g_str_equal(arch, "ppc64")) {
|
||||
+ g_str_equal(arch, "hppa")) {
|
||||
qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
|
||||
}
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -1,108 +0,0 @@
|
|||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Wed, 27 Apr 2022 15:35:36 +0100
|
||||
Subject: [PATCH] virtio-scsi: fix ctrl and event handler functions in
|
||||
dataplane mode
|
||||
Content-type: text/plain
|
||||
|
||||
Commit f34e8d8b8d48d73f36a67b6d5e492ef9784b5012 ("virtio-scsi: prepare
|
||||
virtio_scsi_handle_cmd for dataplane") prepared the virtio-scsi cmd
|
||||
virtqueue handler function to be used in both the dataplane and
|
||||
non-datpalane code paths.
|
||||
|
||||
It failed to convert the ctrl and event virtqueue handler functions,
|
||||
which are not designed to be called from the dataplane code path but
|
||||
will be since the ioeventfd is set up for those virtqueues when
|
||||
dataplane starts.
|
||||
|
||||
Convert the ctrl and event virtqueue handler functions now so they
|
||||
operate correctly when called from the dataplane code path. Avoid code
|
||||
duplication by extracting this code into a helper function.
|
||||
|
||||
Fixes: f34e8d8b8d48d73f36a67b6d5e492ef9784b5012 ("virtio-scsi: prepare virtio_scsi_handle_cmd for dataplane")
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: 20220427143541.119567-2-stefanha@redhat.com
|
||||
[Fixed s/by used/be used/ typo pointed out by Michael Tokarev
|
||||
<mjt@tls.msk.ru>.
|
||||
--Stefan]
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
(cherry picked from commit 2f743ef6366c2df4ef51ef3ae318138cdc0125ab)
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
hw/scsi/virtio-scsi.c | 42 +++++++++++++++++++++++++++---------------
|
||||
1 file changed, 27 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
||||
index 34a968ecfb..417fbc71d6 100644
|
||||
--- a/hw/scsi/virtio-scsi.c
|
||||
+++ b/hw/scsi/virtio-scsi.c
|
||||
@@ -472,16 +472,32 @@ bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
return progress;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * If dataplane is configured but not yet started, do so now and return true on
|
||||
+ * success.
|
||||
+ *
|
||||
+ * Dataplane is started by the core virtio code but virtqueue handler functions
|
||||
+ * can also be invoked when a guest kicks before DRIVER_OK, so this helper
|
||||
+ * function helps us deal with manually starting ioeventfd in that case.
|
||||
+ */
|
||||
+static bool virtio_scsi_defer_to_dataplane(VirtIOSCSI *s)
|
||||
+{
|
||||
+ if (!s->ctx || s->dataplane_started) {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
+ virtio_device_start_ioeventfd(&s->parent_obj.parent_obj);
|
||||
+ return !s->dataplane_fenced;
|
||||
+}
|
||||
+
|
||||
static void virtio_scsi_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq)
|
||||
{
|
||||
VirtIOSCSI *s = (VirtIOSCSI *)vdev;
|
||||
|
||||
- if (s->ctx) {
|
||||
- virtio_device_start_ioeventfd(vdev);
|
||||
- if (!s->dataplane_fenced) {
|
||||
- return;
|
||||
- }
|
||||
+ if (virtio_scsi_defer_to_dataplane(s)) {
|
||||
+ return;
|
||||
}
|
||||
+
|
||||
virtio_scsi_acquire(s);
|
||||
virtio_scsi_handle_ctrl_vq(s, vq);
|
||||
virtio_scsi_release(s);
|
||||
@@ -720,12 +736,10 @@ static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq)
|
||||
/* use non-QOM casts in the data path */
|
||||
VirtIOSCSI *s = (VirtIOSCSI *)vdev;
|
||||
|
||||
- if (s->ctx && !s->dataplane_started) {
|
||||
- virtio_device_start_ioeventfd(vdev);
|
||||
- if (!s->dataplane_fenced) {
|
||||
- return;
|
||||
- }
|
||||
+ if (virtio_scsi_defer_to_dataplane(s)) {
|
||||
+ return;
|
||||
}
|
||||
+
|
||||
virtio_scsi_acquire(s);
|
||||
virtio_scsi_handle_cmd_vq(s, vq);
|
||||
virtio_scsi_release(s);
|
||||
@@ -855,12 +869,10 @@ static void virtio_scsi_handle_event(VirtIODevice *vdev, VirtQueue *vq)
|
||||
{
|
||||
VirtIOSCSI *s = VIRTIO_SCSI(vdev);
|
||||
|
||||
- if (s->ctx) {
|
||||
- virtio_device_start_ioeventfd(vdev);
|
||||
- if (!s->dataplane_fenced) {
|
||||
- return;
|
||||
- }
|
||||
+ if (virtio_scsi_defer_to_dataplane(s)) {
|
||||
+ return;
|
||||
}
|
||||
+
|
||||
virtio_scsi_acquire(s);
|
||||
virtio_scsi_handle_event_vq(s, vq);
|
||||
virtio_scsi_release(s);
|
|
@ -0,0 +1,67 @@
|
|||
From 5c1d2f920c14d6e8f4ac7abc62714eadaa60f228 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Tue, 10 Jan 2023 12:37:14 -0500
|
||||
Subject: [PATCH 3/7] Revert "linux-user: add more compat ioctl definitions"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0.
|
||||
|
||||
glibc has fixed (in 2.36.9000-40-g774058d729) the problem
|
||||
that caused a clash when both sys/mount.h annd linux/mount.h
|
||||
are included, and backported this to the 2.36 stable release
|
||||
too:
|
||||
|
||||
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
|
||||
|
||||
It is saner for QEMU to remove the workaround it applied for
|
||||
glibc 2.36 and expect distros to ship the 2.36 maint release
|
||||
with the fix. This avoids needing to add a further workaround
|
||||
to QEMU to deal with the fact that linux/brtfs.h now also pulls
|
||||
in linux/mount.h via linux/fs.h since Linux 6.1
|
||||
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
linux-user/syscall.c | 25 -------------------------
|
||||
1 file changed, 25 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 24b25759be..10af5e0d8e 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -111,31 +111,6 @@
|
||||
#define FS_IOC32_SETFLAGS _IOW('f', 2, int)
|
||||
#define FS_IOC32_GETVERSION _IOR('v', 1, int)
|
||||
#define FS_IOC32_SETVERSION _IOW('v', 2, int)
|
||||
-
|
||||
-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
|
||||
-#define BLKDISCARD _IO(0x12,119)
|
||||
-#define BLKIOMIN _IO(0x12,120)
|
||||
-#define BLKIOOPT _IO(0x12,121)
|
||||
-#define BLKALIGNOFF _IO(0x12,122)
|
||||
-#define BLKPBSZGET _IO(0x12,123)
|
||||
-#define BLKDISCARDZEROES _IO(0x12,124)
|
||||
-#define BLKSECDISCARD _IO(0x12,125)
|
||||
-#define BLKROTATIONAL _IO(0x12,126)
|
||||
-#define BLKZEROOUT _IO(0x12,127)
|
||||
-
|
||||
-#define FIBMAP _IO(0x00,1)
|
||||
-#define FIGETBSZ _IO(0x00,2)
|
||||
-
|
||||
-struct file_clone_range {
|
||||
- __s64 src_fd;
|
||||
- __u64 src_offset;
|
||||
- __u64 src_length;
|
||||
- __u64 dest_offset;
|
||||
-};
|
||||
-
|
||||
-#define FICLONE _IOW(0x94, 9, int)
|
||||
-#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range)
|
||||
-
|
||||
#else
|
||||
#include <linux/fs.h>
|
||||
#endif
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue, 17 May 2022 09:27:45 +0100
|
||||
Subject: [PATCH] virtio-scsi: don't waste CPU polling the event virtqueue
|
||||
Content-type: text/plain
|
||||
|
||||
The virtio-scsi event virtqueue is not emptied by its handler function.
|
||||
This is typical for rx virtqueues where the device uses buffers when
|
||||
some event occurs (e.g. a packet is received, an error condition
|
||||
happens, etc).
|
||||
|
||||
Polling non-empty virtqueues wastes CPU cycles. We are not waiting for
|
||||
new buffers to become available, we are waiting for an event to occur,
|
||||
so it's a misuse of CPU resources to poll for buffers.
|
||||
|
||||
Introduce the new virtio_queue_aio_attach_host_notifier_no_poll() API,
|
||||
which is identical to virtio_queue_aio_attach_host_notifier() except
|
||||
that it does not poll the virtqueue.
|
||||
|
||||
Before this patch the following command-line consumed 100% CPU in the
|
||||
IOThread polling and calling virtio_scsi_handle_event():
|
||||
|
||||
$ qemu-system-x86_64 -M accel=kvm -m 1G -cpu host \
|
||||
--object iothread,id=iothread0 \
|
||||
--device virtio-scsi-pci,iothread=iothread0 \
|
||||
--blockdev file,filename=test.img,aio=native,cache.direct=on,node-name=drive0 \
|
||||
--device scsi-hd,drive=drive0
|
||||
|
||||
After this patch CPU is no longer wasted.
|
||||
|
||||
Reported-by: Nir Soffer <nsoffer@redhat.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Tested-by: Nir Soffer <nsoffer@redhat.com>
|
||||
Message-id: 20220427143541.119567-3-stefanha@redhat.com
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
(cherry picked from commit 38738f7dbbda90fbc161757b7f4be35b52205552)
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
hw/scsi/virtio-scsi-dataplane.c | 2 +-
|
||||
hw/virtio/virtio.c | 13 +++++++++++++
|
||||
include/hw/virtio/virtio.h | 1 +
|
||||
3 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
|
||||
index 29575cbaf6..8bb6e6acfc 100644
|
||||
--- a/hw/scsi/virtio-scsi-dataplane.c
|
||||
+++ b/hw/scsi/virtio-scsi-dataplane.c
|
||||
@@ -138,7 +138,7 @@ int virtio_scsi_dataplane_start(VirtIODevice *vdev)
|
||||
|
||||
aio_context_acquire(s->ctx);
|
||||
virtio_queue_aio_attach_host_notifier(vs->ctrl_vq, s->ctx);
|
||||
- virtio_queue_aio_attach_host_notifier(vs->event_vq, s->ctx);
|
||||
+ virtio_queue_aio_attach_host_notifier_no_poll(vs->event_vq, s->ctx);
|
||||
|
||||
for (i = 0; i < vs->conf.num_queues; i++) {
|
||||
virtio_queue_aio_attach_host_notifier(vs->cmd_vqs[i], s->ctx);
|
||||
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
|
||||
index 9d637e043e..67a873f54a 100644
|
||||
--- a/hw/virtio/virtio.c
|
||||
+++ b/hw/virtio/virtio.c
|
||||
@@ -3534,6 +3534,19 @@ void virtio_queue_aio_attach_host_notifier(VirtQueue *vq, AioContext *ctx)
|
||||
virtio_queue_host_notifier_aio_poll_end);
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Same as virtio_queue_aio_attach_host_notifier() but without polling. Use
|
||||
+ * this for rx virtqueues and similar cases where the virtqueue handler
|
||||
+ * function does not pop all elements. When the virtqueue is left non-empty
|
||||
+ * polling consumes CPU cycles and should not be used.
|
||||
+ */
|
||||
+void virtio_queue_aio_attach_host_notifier_no_poll(VirtQueue *vq, AioContext *ctx)
|
||||
+{
|
||||
+ aio_set_event_notifier(ctx, &vq->host_notifier, true,
|
||||
+ virtio_queue_host_notifier_read,
|
||||
+ NULL, NULL);
|
||||
+}
|
||||
+
|
||||
void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx)
|
||||
{
|
||||
aio_set_event_notifier(ctx, &vq->host_notifier, true, NULL, NULL, NULL);
|
||||
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
|
||||
index b31c4507f5..b62a35fdca 100644
|
||||
--- a/include/hw/virtio/virtio.h
|
||||
+++ b/include/hw/virtio/virtio.h
|
||||
@@ -317,6 +317,7 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
|
||||
void virtio_queue_set_host_notifier_enabled(VirtQueue *vq, bool enabled);
|
||||
void virtio_queue_host_notifier_read(EventNotifier *n);
|
||||
void virtio_queue_aio_attach_host_notifier(VirtQueue *vq, AioContext *ctx);
|
||||
+void virtio_queue_aio_attach_host_notifier_no_poll(VirtQueue *vq, AioContext *ctx);
|
||||
void virtio_queue_aio_detach_host_notifier(VirtQueue *vq, AioContext *ctx);
|
||||
VirtQueue *virtio_vector_first_queue(VirtIODevice *vdev, uint16_t vector);
|
||||
VirtQueue *virtio_vector_next_queue(VirtQueue *vq);
|
|
@ -0,0 +1,76 @@
|
|||
From b40cf0a490c28d5b79e05382d061983b92a7b2b3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
||||
Date: Tue, 10 Jan 2023 12:37:25 -0500
|
||||
Subject: [PATCH 4/7] Revert "linux-user: fix compat with glibc >= 2.36
|
||||
sys/mount.h"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532.
|
||||
|
||||
glibc has fixed (in 2.36.9000-40-g774058d729) the problem
|
||||
that caused a clash when both sys/mount.h annd linux/mount.h
|
||||
are included, and backported this to the 2.36 stable release
|
||||
too:
|
||||
|
||||
https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
|
||||
|
||||
It is saner for QEMU to remove the workaround it applied for
|
||||
glibc 2.36 and expect distros to ship the 2.36 maint release
|
||||
with the fix. This avoids needing to add a further workaround
|
||||
to QEMU to deal with the fact that linux/brtfs.h now also pulls
|
||||
in linux/mount.h via linux/fs.h since Linux 6.1
|
||||
|
||||
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
||||
---
|
||||
linux-user/syscall.c | 18 ------------------
|
||||
meson.build | 2 --
|
||||
2 files changed, 20 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index 10af5e0d8e..d974c76b60 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -95,25 +95,7 @@
|
||||
#include <linux/soundcard.h>
|
||||
#include <linux/kd.h>
|
||||
#include <linux/mtio.h>
|
||||
-
|
||||
-#ifdef HAVE_SYS_MOUNT_FSCONFIG
|
||||
-/*
|
||||
- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
|
||||
- * which in turn prevents use of linux/fs.h. So we have to
|
||||
- * define the constants ourselves for now.
|
||||
- */
|
||||
-#define FS_IOC_GETFLAGS _IOR('f', 1, long)
|
||||
-#define FS_IOC_SETFLAGS _IOW('f', 2, long)
|
||||
-#define FS_IOC_GETVERSION _IOR('v', 1, long)
|
||||
-#define FS_IOC_SETVERSION _IOW('v', 2, long)
|
||||
-#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap)
|
||||
-#define FS_IOC32_GETFLAGS _IOR('f', 1, int)
|
||||
-#define FS_IOC32_SETFLAGS _IOW('f', 2, int)
|
||||
-#define FS_IOC32_GETVERSION _IOR('v', 1, int)
|
||||
-#define FS_IOC32_SETVERSION _IOW('v', 2, int)
|
||||
-#else
|
||||
#include <linux/fs.h>
|
||||
-#endif
|
||||
#include <linux/fd.h>
|
||||
#if defined(CONFIG_FIEMAP)
|
||||
#include <linux/fiemap.h>
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 5c6b5a1c75..3172b01089 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET',
|
||||
cc.has_header_symbol('getopt.h', 'optreset'))
|
||||
config_host_data.set('HAVE_IPPROTO_MPTCP',
|
||||
cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP'))
|
||||
-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG',
|
||||
- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG'))
|
||||
|
||||
# has_member
|
||||
config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID',
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue, 17 May 2022 09:28:06 +0100
|
||||
Subject: [PATCH] virtio-scsi: clean up virtio_scsi_handle_event_vq()
|
||||
Content-type: text/plain
|
||||
|
||||
virtio_scsi_handle_event_vq() is only called from hw/scsi/virtio-scsi.c
|
||||
now and its return value is no longer used. Remove the function
|
||||
prototype from virtio-scsi.h and drop the return value.
|
||||
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: 20220427143541.119567-4-stefanha@redhat.com
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
(cherry picked from commit 37ce2de95169dacab3fb53d11bd4509b9c2e3a4c)
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
hw/scsi/virtio-scsi.c | 4 +---
|
||||
include/hw/virtio/virtio-scsi.h | 1 -
|
||||
2 files changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
||||
index 417fbc71d6..aa03a713d8 100644
|
||||
--- a/hw/scsi/virtio-scsi.c
|
||||
+++ b/hw/scsi/virtio-scsi.c
|
||||
@@ -856,13 +856,11 @@ void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
||||
virtio_scsi_complete_req(req);
|
||||
}
|
||||
|
||||
-bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
+static void virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
{
|
||||
if (s->events_dropped) {
|
||||
virtio_scsi_push_event(s, NULL, VIRTIO_SCSI_T_NO_EVENT, 0);
|
||||
- return true;
|
||||
}
|
||||
- return false;
|
||||
}
|
||||
|
||||
static void virtio_scsi_handle_event(VirtIODevice *vdev, VirtQueue *vq)
|
||||
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
|
||||
index 543681bc18..5957597825 100644
|
||||
--- a/include/hw/virtio/virtio-scsi.h
|
||||
+++ b/include/hw/virtio/virtio-scsi.h
|
||||
@@ -151,7 +151,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
|
||||
Error **errp);
|
||||
|
||||
void virtio_scsi_common_unrealize(DeviceState *dev);
|
||||
-bool virtio_scsi_handle_event_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||||
bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||||
bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||||
void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req);
|
|
@ -0,0 +1,45 @@
|
|||
From db788c896eb1378ebc1f20dcc4954616a7631919 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue, 7 Feb 2023 15:37:16 -0500
|
||||
Subject: [PATCH 5/7] block: fix detect-zeroes= with BDRV_REQ_REGISTERED_BUF
|
||||
|
||||
When a write request is converted into a write zeroes request by the
|
||||
detect-zeroes= feature, it is no longer associated with an I/O buffer.
|
||||
The BDRV_REQ_REGISTERED_BUF flag doesn't make sense without an I/O
|
||||
buffer and must be cleared because bdrv_co_do_pwrite_zeroes() fails with
|
||||
-EINVAL when it's set.
|
||||
|
||||
Fiona Ebner <f.ebner@proxmox.com> bisected and diagnosed this QEMU 7.2
|
||||
regression where writes containing zeroes to a blockdev with
|
||||
discard=unmap,detect-zeroes=unmap fail.
|
||||
|
||||
Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1404
|
||||
Fixes: e8b6535533be ("block: add BDRV_REQ_REGISTERED_BUF request flag")
|
||||
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
|
||||
Cc: qemu-stable@nongnu.org
|
||||
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||||
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Message-Id: <20230207203719.242926-2-stefanha@redhat.com>
|
||||
(cherry picked from commit 3c5867156eb81c7c71611d078b2c5c2c863f884a)
|
||||
---
|
||||
block/io.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/block/io.c b/block/io.c
|
||||
index b9424024f9..bbaa0d1b2d 100644
|
||||
--- a/block/io.c
|
||||
+++ b/block/io.c
|
||||
@@ -2087,6 +2087,9 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild *child,
|
||||
if (bs->detect_zeroes == BLOCKDEV_DETECT_ZEROES_OPTIONS_UNMAP) {
|
||||
flags |= BDRV_REQ_MAY_UNMAP;
|
||||
}
|
||||
+
|
||||
+ /* Can't use optimization hint with bufferless zero write */
|
||||
+ flags &= ~BDRV_REQ_REGISTERED_BUF;
|
||||
}
|
||||
|
||||
if (ret < 0) {
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue, 17 May 2022 09:28:12 +0100
|
||||
Subject: [PATCH] virtio-scsi: clean up virtio_scsi_handle_ctrl_vq()
|
||||
Content-type: text/plain
|
||||
|
||||
virtio_scsi_handle_ctrl_vq() is only called from hw/scsi/virtio-scsi.c
|
||||
now and its return value is no longer used. Remove the function
|
||||
prototype from virtio-scsi.h and drop the return value.
|
||||
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: 20220427143541.119567-5-stefanha@redhat.com
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
(cherry picked from commit 73b3b49f1880f236b4d0ffd7efb00280c05a5fab)
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
hw/scsi/virtio-scsi.c | 5 +----
|
||||
include/hw/virtio/virtio-scsi.h | 1 -
|
||||
2 files changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
||||
index aa03a713d8..eefda16e4b 100644
|
||||
--- a/hw/scsi/virtio-scsi.c
|
||||
+++ b/hw/scsi/virtio-scsi.c
|
||||
@@ -460,16 +460,13 @@ static void virtio_scsi_handle_ctrl_req(VirtIOSCSI *s, VirtIOSCSIReq *req)
|
||||
}
|
||||
}
|
||||
|
||||
-bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
+static void virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
{
|
||||
VirtIOSCSIReq *req;
|
||||
- bool progress = false;
|
||||
|
||||
while ((req = virtio_scsi_pop_req(s, vq))) {
|
||||
- progress = true;
|
||||
virtio_scsi_handle_ctrl_req(s, req);
|
||||
}
|
||||
- return progress;
|
||||
}
|
||||
|
||||
/*
|
||||
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
|
||||
index 5957597825..44dc3b81ec 100644
|
||||
--- a/include/hw/virtio/virtio-scsi.h
|
||||
+++ b/include/hw/virtio/virtio-scsi.h
|
||||
@@ -152,7 +152,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
|
||||
|
||||
void virtio_scsi_common_unrealize(DeviceState *dev);
|
||||
bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||||
-bool virtio_scsi_handle_ctrl_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||||
void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req);
|
||||
void virtio_scsi_free_req(VirtIOSCSIReq *req);
|
||||
void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
|
@ -0,0 +1,43 @@
|
|||
From 930def8769940600dd7dd587ec2accd4a8b6e1f8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Mon, 27 Feb 2023 16:02:51 +0000
|
||||
Subject: [PATCH 6/7] [PATCH] test-vmstate: fix bad GTree usage, use-after-free
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
According to g_tree_foreach() documentation:
|
||||
"The tree may not be modified while iterating over it (you can't
|
||||
add/remove items)."
|
||||
|
||||
Fixes: 9a85e4b8f6 ("migration: Support gtree migration")
|
||||
Cc: Eric Auger <eric.auger@redhat.com>
|
||||
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
||||
---
|
||||
tests/unit/test-vmstate.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/unit/test-vmstate.c b/tests/unit/test-vmstate.c
|
||||
index 541bb4f63e..36b253eb67 100644
|
||||
--- a/tests/unit/test-vmstate.c
|
||||
+++ b/tests/unit/test-vmstate.c
|
||||
@@ -1074,7 +1074,6 @@ static gboolean diff_tree(gpointer key, gpointer value, gpointer data)
|
||||
struct match_node_data d = {tp->tree2, key, value};
|
||||
|
||||
g_tree_foreach(tp->tree2, tp->match_node, &d);
|
||||
- g_tree_remove(tp->tree1, key);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1084,7 +1083,7 @@ static void compare_trees(GTree *tree1, GTree *tree2,
|
||||
struct tree_cmp_data tp = {tree1, tree2, function};
|
||||
|
||||
g_tree_foreach(tree1, diff_tree, &tp);
|
||||
- assert(g_tree_nnodes(tree1) == 0);
|
||||
+ g_tree_destroy(g_tree_ref(tree1));
|
||||
assert(g_tree_nnodes(tree2) == 0);
|
||||
}
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue, 17 May 2022 09:28:19 +0100
|
||||
Subject: [PATCH] virtio-scsi: clean up virtio_scsi_handle_cmd_vq()
|
||||
Content-type: text/plain
|
||||
|
||||
virtio_scsi_handle_cmd_vq() is only called from hw/scsi/virtio-scsi.c
|
||||
now and its return value is no longer used. Remove the function
|
||||
prototype from virtio-scsi.h and drop the return value.
|
||||
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: 20220427143541.119567-6-stefanha@redhat.com
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
(cherry picked from commit ad482b57ef841b2d4883c5079d20ba44ff5e4b3e)
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
hw/scsi/virtio-scsi.c | 5 +----
|
||||
include/hw/virtio/virtio-scsi.h | 1 -
|
||||
2 files changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
||||
index eefda16e4b..12c6a21202 100644
|
||||
--- a/hw/scsi/virtio-scsi.c
|
||||
+++ b/hw/scsi/virtio-scsi.c
|
||||
@@ -685,12 +685,11 @@ static void virtio_scsi_handle_cmd_req_submit(VirtIOSCSI *s, VirtIOSCSIReq *req)
|
||||
scsi_req_unref(sreq);
|
||||
}
|
||||
|
||||
-bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
+static void virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
{
|
||||
VirtIOSCSIReq *req, *next;
|
||||
int ret = 0;
|
||||
bool suppress_notifications = virtio_queue_get_notification(vq);
|
||||
- bool progress = false;
|
||||
|
||||
QTAILQ_HEAD(, VirtIOSCSIReq) reqs = QTAILQ_HEAD_INITIALIZER(reqs);
|
||||
|
||||
@@ -700,7 +699,6 @@ bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
}
|
||||
|
||||
while ((req = virtio_scsi_pop_req(s, vq))) {
|
||||
- progress = true;
|
||||
ret = virtio_scsi_handle_cmd_req_prepare(s, req);
|
||||
if (!ret) {
|
||||
QTAILQ_INSERT_TAIL(&reqs, req, next);
|
||||
@@ -725,7 +723,6 @@ bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq)
|
||||
QTAILQ_FOREACH_SAFE(req, &reqs, next, next) {
|
||||
virtio_scsi_handle_cmd_req_submit(s, req);
|
||||
}
|
||||
- return progress;
|
||||
}
|
||||
|
||||
static void virtio_scsi_handle_cmd(VirtIODevice *vdev, VirtQueue *vq)
|
||||
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
|
||||
index 44dc3b81ec..2497530064 100644
|
||||
--- a/include/hw/virtio/virtio-scsi.h
|
||||
+++ b/include/hw/virtio/virtio-scsi.h
|
||||
@@ -151,7 +151,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
|
||||
Error **errp);
|
||||
|
||||
void virtio_scsi_common_unrealize(DeviceState *dev);
|
||||
-bool virtio_scsi_handle_cmd_vq(VirtIOSCSI *s, VirtQueue *vq);
|
||||
void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req);
|
||||
void virtio_scsi_free_req(VirtIOSCSIReq *req);
|
||||
void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
|
@ -0,0 +1,42 @@
|
|||
From 4021e0a116b568c312b864dfc27dfeed3317538a Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 27 Feb 2023 17:37:10 +0000
|
||||
Subject: [PATCH 7/7] tests: Ensure TAP version is printed before other
|
||||
messages
|
||||
|
||||
These two tests were failing with this error:
|
||||
|
||||
stderr:
|
||||
TAP parsing error: version number must be on the first line
|
||||
[...]
|
||||
Unknown TAP version. The first line MUST be `TAP version <int>`. Assuming version 12.
|
||||
|
||||
This can be fixed by ensuring we always call g_test_init first in the
|
||||
body of main.
|
||||
|
||||
Thanks: Daniel Berrange, for diagnosing the problem
|
||||
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
|
||||
---
|
||||
tests/qtest/rtl8139-test.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c
|
||||
index 8fa3313cc3..90bb616974 100644
|
||||
--- a/tests/qtest/rtl8139-test.c
|
||||
+++ b/tests/qtest/rtl8139-test.c
|
||||
@@ -196,9 +196,10 @@ int main(int argc, char **argv)
|
||||
{
|
||||
int ret;
|
||||
|
||||
- qtest_start("-device rtl8139");
|
||||
-
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
+
|
||||
+ qtest_start("-device rtl8139");
|
||||
+
|
||||
qtest_add_func("/rtl8139/nop", nop);
|
||||
qtest_add_func("/rtl8139/timer", test_init);
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
From: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Date: Tue, 17 May 2022 09:28:26 +0100
|
||||
Subject: [PATCH] virtio-scsi: move request-related items from .h to .c
|
||||
Content-type: text/plain
|
||||
|
||||
There is no longer a need to expose the request and related APIs in
|
||||
virtio-scsi.h since there are no callers outside virtio-scsi.c.
|
||||
|
||||
Note the block comment in VirtIOSCSIReq has been adjusted to meet the
|
||||
coding style.
|
||||
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Message-id: 20220427143541.119567-7-stefanha@redhat.com
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
(cherry picked from commit 3dc584abeef0e1277c2de8c1c1974cb49444eb0a)
|
||||
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||
---
|
||||
hw/scsi/virtio-scsi.c | 45 ++++++++++++++++++++++++++++++---
|
||||
include/hw/virtio/virtio-scsi.h | 40 -----------------------------
|
||||
2 files changed, 41 insertions(+), 44 deletions(-)
|
||||
|
||||
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
|
||||
index 12c6a21202..db54d104be 100644
|
||||
--- a/hw/scsi/virtio-scsi.c
|
||||
+++ b/hw/scsi/virtio-scsi.c
|
||||
@@ -29,6 +29,43 @@
|
||||
#include "hw/virtio/virtio-access.h"
|
||||
#include "trace.h"
|
||||
|
||||
+typedef struct VirtIOSCSIReq {
|
||||
+ /*
|
||||
+ * Note:
|
||||
+ * - fields up to resp_iov are initialized by virtio_scsi_init_req;
|
||||
+ * - fields starting at vring are zeroed by virtio_scsi_init_req.
|
||||
+ */
|
||||
+ VirtQueueElement elem;
|
||||
+
|
||||
+ VirtIOSCSI *dev;
|
||||
+ VirtQueue *vq;
|
||||
+ QEMUSGList qsgl;
|
||||
+ QEMUIOVector resp_iov;
|
||||
+
|
||||
+ union {
|
||||
+ /* Used for two-stage request submission */
|
||||
+ QTAILQ_ENTRY(VirtIOSCSIReq) next;
|
||||
+
|
||||
+ /* Used for cancellation of request during TMFs */
|
||||
+ int remaining;
|
||||
+ };
|
||||
+
|
||||
+ SCSIRequest *sreq;
|
||||
+ size_t resp_size;
|
||||
+ enum SCSIXferMode mode;
|
||||
+ union {
|
||||
+ VirtIOSCSICmdResp cmd;
|
||||
+ VirtIOSCSICtrlTMFResp tmf;
|
||||
+ VirtIOSCSICtrlANResp an;
|
||||
+ VirtIOSCSIEvent event;
|
||||
+ } resp;
|
||||
+ union {
|
||||
+ VirtIOSCSICmdReq cmd;
|
||||
+ VirtIOSCSICtrlTMFReq tmf;
|
||||
+ VirtIOSCSICtrlANReq an;
|
||||
+ } req;
|
||||
+} VirtIOSCSIReq;
|
||||
+
|
||||
static inline int virtio_scsi_get_lun(uint8_t *lun)
|
||||
{
|
||||
return ((lun[2] << 8) | lun[3]) & 0x3FFF;
|
||||
@@ -45,7 +82,7 @@ static inline SCSIDevice *virtio_scsi_device_get(VirtIOSCSI *s, uint8_t *lun)
|
||||
return scsi_device_get(&s->bus, 0, lun[1], virtio_scsi_get_lun(lun));
|
||||
}
|
||||
|
||||
-void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req)
|
||||
+static void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req)
|
||||
{
|
||||
VirtIODevice *vdev = VIRTIO_DEVICE(s);
|
||||
const size_t zero_skip =
|
||||
@@ -58,7 +95,7 @@ void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req)
|
||||
memset((uint8_t *)req + zero_skip, 0, sizeof(*req) - zero_skip);
|
||||
}
|
||||
|
||||
-void virtio_scsi_free_req(VirtIOSCSIReq *req)
|
||||
+static void virtio_scsi_free_req(VirtIOSCSIReq *req)
|
||||
{
|
||||
qemu_iovec_destroy(&req->resp_iov);
|
||||
qemu_sglist_destroy(&req->qsgl);
|
||||
@@ -801,8 +838,8 @@ static void virtio_scsi_reset(VirtIODevice *vdev)
|
||||
s->events_dropped = false;
|
||||
}
|
||||
|
||||
-void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
||||
- uint32_t event, uint32_t reason)
|
||||
+static void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
||||
+ uint32_t event, uint32_t reason)
|
||||
{
|
||||
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s);
|
||||
VirtIOSCSIReq *req;
|
||||
diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h
|
||||
index 2497530064..abdda2cbd0 100644
|
||||
--- a/include/hw/virtio/virtio-scsi.h
|
||||
+++ b/include/hw/virtio/virtio-scsi.h
|
||||
@@ -94,42 +94,6 @@ struct VirtIOSCSI {
|
||||
uint32_t host_features;
|
||||
};
|
||||
|
||||
-typedef struct VirtIOSCSIReq {
|
||||
- /* Note:
|
||||
- * - fields up to resp_iov are initialized by virtio_scsi_init_req;
|
||||
- * - fields starting at vring are zeroed by virtio_scsi_init_req.
|
||||
- * */
|
||||
- VirtQueueElement elem;
|
||||
-
|
||||
- VirtIOSCSI *dev;
|
||||
- VirtQueue *vq;
|
||||
- QEMUSGList qsgl;
|
||||
- QEMUIOVector resp_iov;
|
||||
-
|
||||
- union {
|
||||
- /* Used for two-stage request submission */
|
||||
- QTAILQ_ENTRY(VirtIOSCSIReq) next;
|
||||
-
|
||||
- /* Used for cancellation of request during TMFs */
|
||||
- int remaining;
|
||||
- };
|
||||
-
|
||||
- SCSIRequest *sreq;
|
||||
- size_t resp_size;
|
||||
- enum SCSIXferMode mode;
|
||||
- union {
|
||||
- VirtIOSCSICmdResp cmd;
|
||||
- VirtIOSCSICtrlTMFResp tmf;
|
||||
- VirtIOSCSICtrlANResp an;
|
||||
- VirtIOSCSIEvent event;
|
||||
- } resp;
|
||||
- union {
|
||||
- VirtIOSCSICmdReq cmd;
|
||||
- VirtIOSCSICtrlTMFReq tmf;
|
||||
- VirtIOSCSICtrlANReq an;
|
||||
- } req;
|
||||
-} VirtIOSCSIReq;
|
||||
-
|
||||
static inline void virtio_scsi_acquire(VirtIOSCSI *s)
|
||||
{
|
||||
if (s->ctx) {
|
||||
@@ -151,10 +115,6 @@ void virtio_scsi_common_realize(DeviceState *dev,
|
||||
Error **errp);
|
||||
|
||||
void virtio_scsi_common_unrealize(DeviceState *dev);
|
||||
-void virtio_scsi_init_req(VirtIOSCSI *s, VirtQueue *vq, VirtIOSCSIReq *req);
|
||||
-void virtio_scsi_free_req(VirtIOSCSIReq *req);
|
||||
-void virtio_scsi_push_event(VirtIOSCSI *s, SCSIDevice *dev,
|
||||
- uint32_t event, uint32_t reason);
|
||||
|
||||
void virtio_scsi_dataplane_setup(VirtIOSCSI *s, Error **errp);
|
||||
int virtio_scsi_dataplane_start(VirtIODevice *s);
|
|
@ -1,36 +0,0 @@
|
|||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Sat, 4 Jun 2022 20:28:58 -0400
|
||||
Subject: [PATCH] Disable flakey dbus-display-test
|
||||
Content-type: text/plain
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
tests/qtest/meson.build | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
|
||||
index d25f82bb5a..d085604727 100644
|
||||
--- a/tests/qtest/meson.build
|
||||
+++ b/tests/qtest/meson.build
|
||||
@@ -94,10 +94,6 @@ qtests_i386 = \
|
||||
'test-filter-redirector'
|
||||
]
|
||||
|
||||
-if dbus_display
|
||||
- qtests_i386 += ['dbus-display-test']
|
||||
-endif
|
||||
-
|
||||
dbus_daemon = find_program('dbus-daemon', required: false)
|
||||
if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
|
||||
# Temporarily disabled due to Patchew failures:
|
||||
@@ -298,10 +294,6 @@ qtests = {
|
||||
'vmgenid-test': files('boot-sector.c', 'acpi-utils.c'),
|
||||
}
|
||||
|
||||
-if dbus_display
|
||||
-qtests += {'dbus-display-test': [dbus_display1, gio]}
|
||||
-endif
|
||||
-
|
||||
qtest_executables = {}
|
||||
foreach dir : target_dirs
|
||||
if not dir.endswith('-softmmu')
|
|
@ -1,32 +0,0 @@
|
|||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Sat, 4 Jun 2022 20:29:46 -0400
|
||||
Subject: [PATCH] Fix iotests with modules and qemu-system-s390x
|
||||
Content-type: text/plain
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
tests/qemu-iotests/common.rc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
|
||||
index 227e0a5be9..97f8e0a15f 100644
|
||||
--- a/tests/qemu-iotests/common.rc
|
||||
+++ b/tests/qemu-iotests/common.rc
|
||||
@@ -975,7 +975,7 @@ _require_large_file()
|
||||
#
|
||||
_require_devices()
|
||||
{
|
||||
- available=$($QEMU -M none -device help | \
|
||||
+ available=$($QEMU -M none -device help 2> /dev/null | \
|
||||
grep ^name | sed -e 's/^name "//' -e 's/".*$//')
|
||||
for device
|
||||
do
|
||||
@@ -987,7 +987,7 @@ _require_devices()
|
||||
|
||||
_require_one_device_of()
|
||||
{
|
||||
- available=$($QEMU -M none -device help | \
|
||||
+ available=$($QEMU -M none -device help 2> /dev/null | \
|
||||
grep ^name | sed -e 's/^name "//' -e 's/".*$//')
|
||||
for device
|
||||
do
|
|
@ -1,26 +0,0 @@
|
|||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Sun, 5 Jun 2022 12:48:29 -0400
|
||||
Subject: [PATCH] Skip iotests entirely
|
||||
Content-type: text/plain
|
||||
|
||||
Getting sporadic failures like described here:
|
||||
https://www.mail-archive.com/qemu-devel@nongnu.org/msg887683.html
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
---
|
||||
tests/check-block.sh | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/tests/check-block.sh b/tests/check-block.sh
|
||||
index f59496396c..09cc735da4 100755
|
||||
--- a/tests/check-block.sh
|
||||
+++ b/tests/check-block.sh
|
||||
@@ -50,6 +50,8 @@ fi
|
||||
|
||||
cd tests/qemu-iotests
|
||||
|
||||
+exit 0
|
||||
+
|
||||
# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests
|
||||
export QEMU_CHECK_BLOCK_AUTO=1
|
||||
export PYTHONUTF8=1
|
315
qemu.spec
315
qemu.spec
|
@ -6,7 +6,7 @@
|
|||
%global libfdt_version 1.6.0
|
||||
%global libseccomp_version 2.4.0
|
||||
%global libusbx_version 1.0.23
|
||||
%global meson_version 0.58.2
|
||||
%global meson_version 0.61.3
|
||||
%global usbredir_version 0.7.1
|
||||
%global ipxe_version 20200823-5.git4bd064de
|
||||
|
||||
|
@ -114,6 +114,11 @@
|
|||
%global have_dbus_display 0
|
||||
%endif
|
||||
|
||||
%global have_libblkio 0
|
||||
%if 0%{?fedora} >= 37
|
||||
%global have_libblkio 1
|
||||
%endif
|
||||
|
||||
%global have_sdl_image %{defined fedora}
|
||||
%global have_fdt 1
|
||||
%global have_opengl 1
|
||||
|
@ -144,13 +149,6 @@
|
|||
%define have_block_nfs 1
|
||||
%endif
|
||||
|
||||
%define have_capstone_devel 0
|
||||
%if 0%{?fedora}
|
||||
# capstone-devel is only on Fedora. Use it if it's available, but
|
||||
# if not, use the internal qemu submodule copy
|
||||
%define have_capstone_devel 1
|
||||
%endif
|
||||
|
||||
%define have_librdma 1
|
||||
%ifarch %{arm}
|
||||
%define have_librdma 0
|
||||
|
@ -170,6 +168,11 @@
|
|||
%global qemudocdir %{_docdir}/%{name}
|
||||
%define evr %{epoch}:%{version}-%{release}
|
||||
|
||||
%if %{have_libblkio}
|
||||
%define requires_block_blkio Requires: %{name}-block-blkio = %{evr}
|
||||
%else
|
||||
%define requires_block_blkio %{nil}
|
||||
%endif
|
||||
%define requires_block_curl Requires: %{name}-block-curl = %{evr}
|
||||
%define requires_block_dmg Requires: %{name}-block-dmg = %{evr}
|
||||
%if %{have_block_gluster}
|
||||
|
@ -259,6 +262,7 @@
|
|||
%endif
|
||||
|
||||
%global requires_all_modules \
|
||||
%{requires_block_blkio} \
|
||||
%{requires_block_curl} \
|
||||
%{requires_block_dmg} \
|
||||
%{requires_block_gluster} \
|
||||
|
@ -317,11 +321,11 @@ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release}
|
|||
%endif
|
||||
|
||||
# To prevent rpmdev-bumpspec breakage
|
||||
%global baserelease 6
|
||||
%global baserelease 7
|
||||
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 7.0.0
|
||||
Version: 7.2.0
|
||||
Release: %{baserelease}%{?rcrel}%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv2 and BSD and MIT and CC-BY
|
||||
|
@ -341,17 +345,20 @@ Source31: kvm-x86.conf
|
|||
Source36: README.tests
|
||||
|
||||
# Fix SGX assert
|
||||
Patch0001: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
|
||||
# Fix virtio-scsi hang (bz #2079347)
|
||||
Patch0002: 0002-virtio-scsi-fix-ctrl-and-event-handler-functions-in-.patch
|
||||
Patch0003: 0003-virtio-scsi-don-t-waste-CPU-polling-the-event-virtqu.patch
|
||||
Patch0004: 0004-virtio-scsi-clean-up-virtio_scsi_handle_event_vq.patch
|
||||
Patch0005: 0005-virtio-scsi-clean-up-virtio_scsi_handle_ctrl_vq.patch
|
||||
Patch0006: 0006-virtio-scsi-clean-up-virtio_scsi_handle_cmd_vq.patch
|
||||
Patch0007: 0007-virtio-scsi-move-request-related-items-from-.h-to-.c.patch
|
||||
Patch0008: 0008-Disable-flakey-dbus-display-test.patch
|
||||
Patch0009: 0009-Fix-iotests-with-modules-and-qemu-system-s390x.patch
|
||||
Patch0010: 0010-Skip-iotests-entirely.patch
|
||||
Patch: 0001-target-i386-the-sgx_epc_get_section-stub-is-reachabl.patch
|
||||
Patch: 0002-tests-Disable-pci_virtio_vga-for-ppc64.patch
|
||||
# Fix compat with kernel-headers >= 6.1
|
||||
Patch: 0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch
|
||||
Patch: 0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch
|
||||
# Fix virtio-blk-pci detect-zeroes=unmap (RHBZ#2173357)
|
||||
Patch: 0005-block-fix-detect-zeroes-with-BDRV_REQ_REGISTERED_BUF.patch
|
||||
# Fix build with glib2 2.75.3
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2173639
|
||||
# https://gitlab.com/qemu-project/qemu/-/issues/1518
|
||||
# Patch is NOT UPSTREAM.
|
||||
Patch: 0006-PATCH-test-vmstate-fix-bad-GTree-usage-use-after-fre.patch
|
||||
# Fix one of the tests. Sent upstream 2023-02-27.
|
||||
Patch: 0007-tests-Ensure-TAP-version-is-printed-before-other-mes.patch
|
||||
|
||||
BuildRequires: meson >= %{meson_version}
|
||||
BuildRequires: zlib-devel
|
||||
|
@ -414,7 +421,10 @@ BuildRequires: pkgconfig(gbm)
|
|||
%endif
|
||||
BuildRequires: perl-Test-Harness
|
||||
BuildRequires: libslirp-devel
|
||||
BuildRequires: libbpf-devel
|
||||
BuildRequires: libbpf-devel >= 1.0.0
|
||||
%if %{have_libblkio}
|
||||
BuildRequires: libblkio-devel
|
||||
%endif
|
||||
|
||||
|
||||
# Fedora specific
|
||||
|
@ -472,10 +482,8 @@ BuildRequires: libcacard-devel
|
|||
# virgl 3d support
|
||||
BuildRequires: virglrenderer-devel
|
||||
%endif
|
||||
%if %{have_capstone_devel}
|
||||
# preferred disassembler for TCG
|
||||
BuildRequires: capstone-devel
|
||||
%endif
|
||||
# qemu-ga
|
||||
BuildRequires: libudev-devel
|
||||
# qauth infrastructure
|
||||
|
@ -502,8 +510,14 @@ BuildRequires: SDL2_image-devel
|
|||
%endif
|
||||
|
||||
%if %{user_static}
|
||||
BuildRequires: glibc-static pcre-static glib2-static zlib-static
|
||||
BuildRequires: glibc-static glib2-static zlib-static
|
||||
%if 0%{?fedora} >= 37
|
||||
BuildRequires: pcre2-static
|
||||
%else
|
||||
BuildRequires: pcre-static
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
# Requires for the Fedora 'qemu' metapackage
|
||||
Requires: %{name}-user = %{epoch}:%{version}-%{release}
|
||||
|
@ -512,6 +526,7 @@ Requires: %{name}-system-alpha = %{epoch}:%{version}-%{release}
|
|||
Requires: %{name}-system-arm = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-system-avr = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-system-cris = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-system-loongarch64 = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-system-m68k = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-system-microblaze = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-system-mips = %{epoch}:%{version}-%{release}
|
||||
|
@ -616,6 +631,18 @@ Install this package if you want access to the avocado_qemu
|
|||
tests, or qemu-iotests.
|
||||
|
||||
|
||||
%if %{have_libblkio}
|
||||
%package block-blkio
|
||||
Summary: QEMU blkio block driver
|
||||
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
%description block-blkio
|
||||
This package provides the additional blkio block driver for QEMU.
|
||||
|
||||
Install this package if you want to access disks over vhost-user-blk, vdpa-blk,
|
||||
and other transports using the libblkio library.
|
||||
%endif
|
||||
|
||||
|
||||
%package block-curl
|
||||
Summary: QEMU CURL block driver
|
||||
Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
@ -952,6 +979,7 @@ Requires: qemu-user-static-arm
|
|||
Requires: qemu-user-static-cris
|
||||
Requires: qemu-user-static-hexagon
|
||||
Requires: qemu-user-static-hppa
|
||||
Requires: qemu-user-static-loongarch64
|
||||
Requires: qemu-user-static-m68k
|
||||
Requires: qemu-user-static-microblaze
|
||||
Requires: qemu-user-static-mips
|
||||
|
@ -1005,6 +1033,12 @@ Summary: QEMU user mode emulation of hppa qemu targets static build
|
|||
This package provides the hppa user mode emulation of qemu targets built as
|
||||
static binaries
|
||||
|
||||
%package user-static-loongarch64
|
||||
Summary: QEMU user mode emulation of loongarch64 qemu targets static build
|
||||
%description user-static-loongarch64
|
||||
This package provides the loongarch64 user mode emulation of qemu targets built as
|
||||
static binaries
|
||||
|
||||
%package user-static-m68k
|
||||
Summary: QEMU user mode emulation of m68k qemu targets static build
|
||||
%description user-static-m68k
|
||||
|
@ -1169,6 +1203,20 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
|||
This package provides the QEMU system emulator for HPPA.
|
||||
|
||||
|
||||
%package system-loongarch64
|
||||
Summary: QEMU system emulator for LoongArch (LA64)
|
||||
Requires: %{name}-system-loongarch64-core = %{epoch}:%{version}-%{release}
|
||||
%{requires_all_modules}
|
||||
%description system-loongarch64
|
||||
This package provides the QEMU system emulator for Loongson boards.
|
||||
|
||||
%package system-loongarch64-core
|
||||
Summary: QEMU system emulator for LoongArch (LA64)
|
||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||
%description system-loongarch64-core
|
||||
This package provides the QEMU system emulator for Loongson boards.
|
||||
|
||||
|
||||
%package system-m68k
|
||||
Summary: QEMU system emulator for ColdFire (m68k)
|
||||
Requires: %{name}-system-m68k-core = %{epoch}:%{version}-%{release}
|
||||
|
@ -1379,8 +1427,6 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
|||
This package provides the QEMU system emulator for Xtensa boards.
|
||||
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n qemu-%{version}%{?rcstr}
|
||||
%autosetup -S git_am
|
||||
|
@ -1400,6 +1446,7 @@ mkdir -p %{static_builddir}
|
|||
--disable-auth-pam \\\
|
||||
--disable-avx2 \\\
|
||||
--disable-avx512f \\\
|
||||
--disable-blkio \\\
|
||||
--disable-block-drv-whitelist-in-tools \\\
|
||||
--disable-bochs \\\
|
||||
--disable-bpf \\\
|
||||
|
@ -1433,6 +1480,7 @@ mkdir -p %{static_builddir}
|
|||
--disable-glusterfs \\\
|
||||
--disable-gnutls \\\
|
||||
--disable-gtk \\\
|
||||
--disable-gtk-clipboard \\\
|
||||
--disable-guest-agent \\\
|
||||
--disable-guest-agent-msi \\\
|
||||
--disable-hax \\\
|
||||
|
@ -1488,6 +1536,7 @@ mkdir -p %{static_builddir}
|
|||
--disable-slirp-smbd \\\
|
||||
--disable-smartcard \\\
|
||||
--disable-snappy \\\
|
||||
--disable-sndio \\\
|
||||
--disable-sparse \\\
|
||||
--disable-spice \\\
|
||||
--disable-spice-protocol \\\
|
||||
|
@ -1501,20 +1550,19 @@ mkdir -p %{static_builddir}
|
|||
--disable-user \\\
|
||||
--disable-vde \\\
|
||||
--disable-vdi \\\
|
||||
--disable-vfio-user-server \\\
|
||||
--disable-vhost-crypto \\\
|
||||
--disable-vhost-kernel \\\
|
||||
--disable-vhost-net \\\
|
||||
--disable-vhost-scsi \\\
|
||||
--disable-vhost-user \\\
|
||||
--disable-vhost-user-blk-server \\\
|
||||
--disable-vhost-vdpa \\\
|
||||
--disable-vhost-vsock \\\
|
||||
--disable-virglrenderer \\\
|
||||
--disable-virtfs \\\
|
||||
--disable-virtiofsd \\\
|
||||
--disable-vnc \\\
|
||||
--disable-vnc-jpeg \\\
|
||||
--disable-vnc-png \\\
|
||||
--disable-png \\\
|
||||
--disable-vnc-sasl \\\
|
||||
--disable-vte \\\
|
||||
--disable-vvfat \\\
|
||||
|
@ -1554,7 +1602,8 @@ run_configure() {
|
|||
--with-git=git \
|
||||
--tls-priority=@QEMU,SYSTEM \
|
||||
%{disable_everything} \
|
||||
"$@"
|
||||
"$@" \
|
||||
|| ( cat config.log ; exit 1 )
|
||||
|
||||
echo "config-host.mak contents:"
|
||||
echo "==="
|
||||
|
@ -1578,10 +1627,13 @@ run_configure \
|
|||
--enable-attr \
|
||||
%ifarch %{ix86} x86_64
|
||||
--enable-avx2 \
|
||||
%endif
|
||||
%if %{have_libblkio}
|
||||
--enable-blkio \
|
||||
%endif
|
||||
--enable-bpf \
|
||||
--enable-cap-ng \
|
||||
--enable-capstone=auto \
|
||||
--enable-capstone \
|
||||
--enable-coroutine-pool \
|
||||
--enable-curl \
|
||||
%if %{have_dbus_display}
|
||||
|
@ -1633,7 +1685,7 @@ run_configure \
|
|||
%endif
|
||||
--enable-seccomp \
|
||||
--enable-selinux \
|
||||
--enable-slirp=system \
|
||||
--enable-slirp \
|
||||
--enable-slirp-smbd \
|
||||
--enable-snappy \
|
||||
--enable-system \
|
||||
|
@ -1649,9 +1701,8 @@ run_configure \
|
|||
--enable-vhost-user \
|
||||
--enable-vhost-user-blk-server \
|
||||
--enable-vhost-vdpa \
|
||||
--enable-vhost-vsock \
|
||||
--enable-vnc \
|
||||
--enable-vnc-png \
|
||||
--enable-png \
|
||||
--enable-vnc-sasl \
|
||||
%if %{enable_werror}
|
||||
--enable-werror \
|
||||
|
@ -1709,7 +1760,6 @@ run_configure \
|
|||
--enable-usb-redir \
|
||||
--enable-vdi \
|
||||
--enable-vhost-crypto \
|
||||
--enable-vhost-scsi \
|
||||
%if %{have_virgl}
|
||||
--enable-virglrenderer \
|
||||
%endif
|
||||
|
@ -1721,8 +1771,7 @@ run_configure \
|
|||
--enable-xen \
|
||||
--enable-xen-pci-passthrough \
|
||||
%endif
|
||||
--enable-zstd \
|
||||
|
||||
--enable-zstd
|
||||
|
||||
%if %{tools_only}
|
||||
%make_build qemu-img
|
||||
|
@ -2032,6 +2081,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
%postun user-static-hppa
|
||||
/bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null || :
|
||||
|
||||
%post user-static-loongarch64
|
||||
/bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null || :
|
||||
%postun user-static-loongarch64
|
||||
/bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null || :
|
||||
|
||||
%post user-static-m68k
|
||||
/bin/systemctl --system try-restart systemd-binfmt.service &>/dev/null || :
|
||||
%postun user-static-m68k
|
||||
|
@ -2191,6 +2245,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
%{testsdir}
|
||||
%{_libdir}/%{name}/accel-qtest-*.so
|
||||
|
||||
%if %{have_libblkio}
|
||||
%files block-blkio
|
||||
%{_libdir}/%{name}/block-blkio.so
|
||||
%endif
|
||||
%files block-curl
|
||||
%{_libdir}/%{name}/block-curl.so
|
||||
%files block-iscsi
|
||||
|
@ -2318,6 +2376,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
%{_bindir}/qemu-cris
|
||||
%{_bindir}/qemu-hppa
|
||||
%{_bindir}/qemu-hexagon
|
||||
%{_bindir}/qemu-loongarch64
|
||||
%{_bindir}/qemu-m68k
|
||||
%{_bindir}/qemu-microblaze
|
||||
%{_bindir}/qemu-microblazeel
|
||||
|
@ -2351,6 +2410,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
%{_datadir}/systemtap/tapset/qemu-cris*.stp
|
||||
%{_datadir}/systemtap/tapset/qemu-hppa*.stp
|
||||
%{_datadir}/systemtap/tapset/qemu-hexagon*.stp
|
||||
%{_datadir}/systemtap/tapset/qemu-loongarch64*.stp
|
||||
%{_datadir}/systemtap/tapset/qemu-m68k*.stp
|
||||
%{_datadir}/systemtap/tapset/qemu-microblaze*.stp
|
||||
%{_datadir}/systemtap/tapset/qemu-mips*.stp
|
||||
|
@ -2409,6 +2469,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
%{_datadir}/systemtap/tapset/qemu-hppa-static.stp
|
||||
%{_exec_prefix}/lib/binfmt.d/qemu-hppa-static.conf
|
||||
|
||||
%files user-static-loongarch64
|
||||
%{_bindir}/qemu-loongarch64-static
|
||||
%{_datadir}/systemtap/tapset/qemu-loongarch64-static.stp
|
||||
%{_exec_prefix}/lib/binfmt.d/qemu-loongarch64-static.conf
|
||||
|
||||
%files user-static-m68k
|
||||
%{_bindir}/qemu-m68k-static
|
||||
%{_datadir}/systemtap/tapset/qemu-m68k-static.stp
|
||||
|
@ -2567,6 +2632,13 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
%{_datadir}/%{name}/hppa-firmware.img
|
||||
|
||||
|
||||
%files system-loongarch64
|
||||
%files system-loongarch64-core
|
||||
%{_bindir}/qemu-system-loongarch64
|
||||
%{_datadir}/systemtap/tapset/qemu-system-loongarch64*.stp
|
||||
%{_mandir}/man1/qemu-system-loongarch64.1*
|
||||
|
||||
|
||||
%files system-m68k
|
||||
%files system-m68k-core
|
||||
%{_bindir}/qemu-system-m68k
|
||||
|
@ -2716,6 +2788,51 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 27 2023 Richard W.M. Jones <rjones@redhat.com> - 7.2.0-7
|
||||
- Fix virtio-blk-pci detect-zeroes=unmap (RHBZ#2173357)
|
||||
- Fix build with glib2 2.75.3 (RHBZ#2173639)
|
||||
- Disable the tests on i686
|
||||
|
||||
* Tue Jan 31 2023 Stefan Hajnoczi <stefanha@redhat.com> - 7.2.0-6
|
||||
- Enable libblkio
|
||||
|
||||
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.2.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jan 11 2023 Richard W.M. Jones <rjones@redhat.com> - 2:7.2.0-4
|
||||
- Rebuild for xen-4.17.0, second attempt
|
||||
|
||||
* Tue Jan 10 2023 Daniel P. Berrangé <berrange@redhat.com> - 7.2.0-3
|
||||
- Fix compat with linux > 6.1 headers
|
||||
- Re-enable iotests
|
||||
|
||||
* Tue Jan 03 2023 Richard W.M. Jones <rjones@redhat.com> - 2:7.2.0-2
|
||||
- Rebuild for xen-4.17.0
|
||||
|
||||
* Mon Dec 19 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.2.0-1
|
||||
- Rebase to qemu 7.2.0
|
||||
|
||||
* Fri Nov 11 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.1.0-4
|
||||
- Update libbpf dependency
|
||||
|
||||
* Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-3
|
||||
- Unconditionally enable capstone-devel
|
||||
|
||||
* Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-2
|
||||
- Bump required meson version
|
||||
|
||||
* Wed Aug 31 2022 Eduardo Lima (Etrunko) <etrunko@redhat.com> - 7.1.0-1
|
||||
- Rebase to qemu 7.1.0
|
||||
|
||||
* Tue Aug 2 2022 Daniel P. Berrangé <berrange@redhat.com> - 7.0.0-9
|
||||
- Fix compat with glibc 2.36 headers
|
||||
|
||||
* Mon Jul 25 2022 Paolo Bonzini <pbonzini@redhat.com> - 2:7.0.0-8
|
||||
- Replace pcre-static dependency with pcre2-static, to adjust for glib switching
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.0.0-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jun 11 2022 Cole Robinson <crobinso@redhat.com> - 7.0.0-6
|
||||
- Adjust for Xen dropping 32bit arches
|
||||
|
||||
|
@ -2893,125 +3010,3 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||
* Mon Jan 11 2021 Paolo Bonzini <pbonzini@redhat.com> - 2:5.2.0-5
|
||||
- Use symlink for qemu-kvm.
|
||||
- Fix make check on bash 5.1.
|
||||
|
||||
* Fri Dec 11 2020 Richard W.M. Jones <rjones@redhat.com> - 2:5.2.0-4
|
||||
- qemu-char-spice not qemu-chardev-spice.
|
||||
|
||||
* Thu Dec 10 2020 Mohan Boddu <mboddu@bhujji.com> - 5.2.0-2
|
||||
- Fixing the ISA Dependencies
|
||||
|
||||
* Wed Dec 09 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-1
|
||||
- Rebase to qemu-5.2.0 GA
|
||||
- Fix spice and GL UI module deps (bz 1904603)
|
||||
|
||||
* Thu Dec 03 2020 Richard W.M. Jones <rjones@redhat.com> - 5.2.0-0.9.rc4
|
||||
- Enable qemu-kvm-core package on riscv64.
|
||||
|
||||
* Thu Dec 03 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.8.rc4
|
||||
- Rebase to qemu-5.2.0-rc4
|
||||
|
||||
* Tue Nov 24 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.7.rc2
|
||||
- Fix running 9p tests in copr
|
||||
|
||||
* Thu Nov 19 2020 Paolo Bonzini <pbonzini@redhat.com> - 5.2.0-0.6.rc2
|
||||
- Remove --python=... to force use of system meson
|
||||
|
||||
* Thu Nov 19 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.2.0-0.5.rc2
|
||||
- Re-enable systemtap tracing
|
||||
|
||||
* Wed Nov 18 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.4.rc2
|
||||
- Rebase to qemu-5.2.0-rc2
|
||||
|
||||
* Fri Nov 13 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.2.0-0.3.rc1
|
||||
- Disable user mode static builds in ELN
|
||||
|
||||
* Wed Nov 11 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.2.rc1
|
||||
- Rebase to qemu-5.2.0-rc1
|
||||
|
||||
* Sun Nov 08 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.1.rc0
|
||||
- Rebase to qemu-5.2.0-rc0
|
||||
|
||||
* Thu Nov 5 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-7
|
||||
- Disable LTO again. Tests were not passing, we were ignoring failures.
|
||||
|
||||
* Mon Oct 26 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-6
|
||||
- Re-enable LTO since tests now pass without asserts
|
||||
|
||||
* Fri Sep 4 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-5
|
||||
- Drop conditions for ppc, ppc64, mips64 and s390 arches
|
||||
- Fix host qemu binary path for aarch64
|
||||
- Re-enable kernel BR for QEMU sanity check
|
||||
- Fix conditionals for enabling QEMU sanity check
|
||||
- Check whether emulator works before doing sanity check
|
||||
- Provide explicit kernel path for QEMU sanity check
|
||||
- Make QEMU sanity check a build blocker
|
||||
|
||||
* Thu Sep 3 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.1.0-4
|
||||
- Add btrfs ioctls to linux-user (rhbz #1872918)
|
||||
|
||||
* Tue Aug 18 2020 Tom Stellard <tstellar@redhat.com> - 5.1.0-3
|
||||
- Add BuildRequires: gcc
|
||||
- https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires
|
||||
|
||||
* Mon Aug 17 2020 Cole Robinson <aintdiscole@gmail.com> - 5.1.0-2
|
||||
- Disable dtrace generation to fix use of modules (bz 1869339)
|
||||
|
||||
* Tue Aug 11 2020 Cole Robinson <crobinso@redhat.com> - 5.1.0-1
|
||||
- Update to version 5.1.0
|
||||
|
||||
* Fri Aug 07 2020 Cole Robinson <crobinso@redhat.com> - 5.1.0-0.3.rc3
|
||||
- Update to version 5.1.0-rc3
|
||||
|
||||
* Thu Aug 06 2020 Merlin Mathesius <mmathesi@redhat.com> - 5.1.0-0.2.rc2
|
||||
- Use new %%{kernel_arches} macro to determine when a full kernel is available
|
||||
|
||||
* Wed Aug 05 2020 Cole Robinson <aintdiscole@gmail.com> - 5.1.0-0.2.rc2
|
||||
- Pull in new modules by default, like we do for others
|
||||
|
||||
* Tue Aug 04 2020 Cole Robinson <aintdiscole@gmail.com> - 5.1.0-0.1.rc2
|
||||
- Update to qemu 5.1.0 rc2
|
||||
|
||||
* Fri Jul 31 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.0.0-6
|
||||
- Remove obsolete Fedora conditionals (PR#9)
|
||||
|
||||
* Thu Jul 30 2020 Richard W.M. Jones <rjones@redhat.com> - 5.0.0-5
|
||||
- Disable LTO as it caused many strange assert failures.
|
||||
|
||||
* Wed Jul 29 2020 Richard W.M. Jones <rjones@redhat.com> - 5.0.0-4
|
||||
- Backport Dan's upstream patch to fix insecure cert in test suite.
|
||||
|
||||
* Mon Jul 27 2020 Kevin Fenzi <kevin@scrye.com> - 5.0.0-3
|
||||
- Rebuild for new xen
|
||||
|
||||
* Wed May 13 2020 Cole Robinson <crobinso@redhat.com> - 5.0.0-2
|
||||
- Fix iouring hang (bz #1823751)
|
||||
|
||||
* Wed May 06 2020 Cole Robinson <crobinso@redhat.com> - 5.0.0-1
|
||||
- Update to version 5.0.0
|
||||
|
||||
* Thu Apr 16 2020 Cole Robinson <aintdiscole@gmail.com> - 5.0.0-0.3.rc3
|
||||
- Update to qemu 5.0.0 rc3
|
||||
|
||||
* Thu Apr 09 2020 Cole Robinson <aintdiscole@gmail.com> - 5.0.0-0.3.rc2
|
||||
- Update to qemu 5.0.0 rc2
|
||||
|
||||
* Wed Apr 08 2020 Adam Williamson <awilliam@redhat.com> - 2:5.0.0-0.2.rc0
|
||||
- Rebuild for new brltty
|
||||
|
||||
* Wed Mar 25 2020 Cole Robinson <crobinso@redhat.com> - 2:5.0.0-0.1.rc0
|
||||
- Update to qemu-5.0.0-rc0
|
||||
|
||||
* Tue Mar 17 2020 Fabiano Fidêncio <fidencio@redhat.com> - 2:4.2.0-7
|
||||
- Fix segfault with SR-IOV hot-{plug,unplug} (bz #1814017)
|
||||
|
||||
* Tue Feb 25 2020 Cole Robinson <crobinso@redhat.com> - 2:4.2.0-6
|
||||
- Rebuild for libiscsi soname bump
|
||||
|
||||
* Sat Feb 15 2020 Cole Robinson <crobinso@redhat.com> - 2:4.2.0-5
|
||||
- Fix ppc shutdown issue (bz #1784961)
|
||||
|
||||
* Tue Jan 28 2020 Cole Robinson <crobinso@redhat.com> - 2:4.2.0-4
|
||||
- virtio-fs support
|
||||
|
||||
* Sat Jan 25 2020 Richard W.M. Jones <rjones@redhat.com> - 4.2.0-3
|
||||
- Add miscellaneous fixes for RISC-V (RHBZ#1794902).
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (qemu-7.0.0.tar.xz) = 44ecd10c018a3763e1bc87d1d35b98890d0d5636acd69fe9b5cadf5024d5af6a31684d60cbe1c3370e02986434c1fb0ad99224e0e6f6fe7eda169992508157b1
|
||||
SHA512 (qemu-7.2.0.tar.xz) = f3cfa00da739ba819a218d7e6e95c77fb79a8e0f487b024ddd281602e785249b81144595e3f8c746c32a4f5c4d1a88c6aebae3c162603edfbb50ae3722d7ed13
|
||||
|
|
Loading…
Reference in New Issue