From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu 1/2] update patches and submodule to QEMU 8.0.3
Date: Tue, 11 Jul 2023 16:06:08 +0200 [thread overview]
Message-ID: <20230711140609.196723-1-f.ebner@proxmox.com> (raw)
Most commits are not relevant for Proxmox VE, but there are a few
(semi-)relevant ones, related to TCG, vhost (used by default for net
devices), vfio, virtio-gpu and ARM.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
...memory-prevent-dma-reentracy-issues.patch} | 0
...hen-getting-cursor-without-a-console.patch | 36 -------------------
...e-reentrancy-detection-for-script-R.patch} | 0
...disable-reentrancy-detection-for-io.patch} | 0
...able-reentrancy-detection-for-iomem.patch} | 0
...e-reentrancy-detection-for-apic-msi.patch} | 0
debian/patches/series | 11 +++---
qemu | 2 +-
8 files changed, 6 insertions(+), 43 deletions(-)
rename debian/patches/extra/{0005-memory-prevent-dma-reentracy-issues.patch => 0004-memory-prevent-dma-reentracy-issues.patch} (100%)
delete mode 100644 debian/patches/extra/0004-ui-return-NULL-when-getting-cursor-without-a-console.patch
rename debian/patches/extra/{0006-lsi53c895a-disable-reentrancy-detection-for-script-R.patch => 0005-lsi53c895a-disable-reentrancy-detection-for-script-R.patch} (100%)
rename debian/patches/extra/{0007-bcm2835_property-disable-reentrancy-detection-for-io.patch => 0006-bcm2835_property-disable-reentrancy-detection-for-io.patch} (100%)
rename debian/patches/extra/{0008-raven-disable-reentrancy-detection-for-iomem.patch => 0007-raven-disable-reentrancy-detection-for-iomem.patch} (100%)
rename debian/patches/extra/{0009-apic-disable-reentrancy-detection-for-apic-msi.patch => 0008-apic-disable-reentrancy-detection-for-apic-msi.patch} (100%)
diff --git a/debian/patches/extra/0005-memory-prevent-dma-reentracy-issues.patch b/debian/patches/extra/0004-memory-prevent-dma-reentracy-issues.patch
similarity index 100%
rename from debian/patches/extra/0005-memory-prevent-dma-reentracy-issues.patch
rename to debian/patches/extra/0004-memory-prevent-dma-reentracy-issues.patch
diff --git a/debian/patches/extra/0004-ui-return-NULL-when-getting-cursor-without-a-console.patch b/debian/patches/extra/0004-ui-return-NULL-when-getting-cursor-without-a-console.patch
deleted file mode 100644
index 0b8d2c0..0000000
--- a/debian/patches/extra/0004-ui-return-NULL-when-getting-cursor-without-a-console.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
-Date: Fri, 28 Apr 2023 19:48:06 +0400
-Subject: [PATCH] ui: return NULL when getting cursor without a console
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-VNC may try to get the current cursor even when there are no consoles
-and crashes. Simple reproducer is qemu with -nodefaults.
-
-Fixes: (again)
-https://gitlab.com/qemu-project/qemu/-/issues/1548
-
-Fixes: commit 385ac97f8 ("ui: keep current cursor with QemuConsole")
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-(picked up from https://lists.nongnu.org/archive/html/qemu-devel/2023-04/msg05598.html)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
----
- ui/console.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/console.c b/ui/console.c
-index e173731e20..7461446e71 100644
---- a/ui/console.c
-+++ b/ui/console.c
-@@ -2306,7 +2306,7 @@ QEMUCursor *qemu_console_get_cursor(QemuConsole *con)
- if (con == NULL) {
- con = active_console;
- }
-- return con->cursor;
-+ return con ? con->cursor : NULL;
- }
-
- bool qemu_console_is_visible(QemuConsole *con)
diff --git a/debian/patches/extra/0006-lsi53c895a-disable-reentrancy-detection-for-script-R.patch b/debian/patches/extra/0005-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
similarity index 100%
rename from debian/patches/extra/0006-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
rename to debian/patches/extra/0005-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
diff --git a/debian/patches/extra/0007-bcm2835_property-disable-reentrancy-detection-for-io.patch b/debian/patches/extra/0006-bcm2835_property-disable-reentrancy-detection-for-io.patch
similarity index 100%
rename from debian/patches/extra/0007-bcm2835_property-disable-reentrancy-detection-for-io.patch
rename to debian/patches/extra/0006-bcm2835_property-disable-reentrancy-detection-for-io.patch
diff --git a/debian/patches/extra/0008-raven-disable-reentrancy-detection-for-iomem.patch b/debian/patches/extra/0007-raven-disable-reentrancy-detection-for-iomem.patch
similarity index 100%
rename from debian/patches/extra/0008-raven-disable-reentrancy-detection-for-iomem.patch
rename to debian/patches/extra/0007-raven-disable-reentrancy-detection-for-iomem.patch
diff --git a/debian/patches/extra/0009-apic-disable-reentrancy-detection-for-apic-msi.patch b/debian/patches/extra/0008-apic-disable-reentrancy-detection-for-apic-msi.patch
similarity index 100%
rename from debian/patches/extra/0009-apic-disable-reentrancy-detection-for-apic-msi.patch
rename to debian/patches/extra/0008-apic-disable-reentrancy-detection-for-apic-msi.patch
diff --git a/debian/patches/series b/debian/patches/series
index c9c96d7..c8d6b22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,11 @@
extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
-extra/0004-ui-return-NULL-when-getting-cursor-without-a-console.patch
-extra/0005-memory-prevent-dma-reentracy-issues.patch
-extra/0006-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
-extra/0007-bcm2835_property-disable-reentrancy-detection-for-io.patch
-extra/0008-raven-disable-reentrancy-detection-for-iomem.patch
-extra/0009-apic-disable-reentrancy-detection-for-apic-msi.patch
+extra/0004-memory-prevent-dma-reentracy-issues.patch
+extra/0005-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
+extra/0006-bcm2835_property-disable-reentrancy-detection-for-io.patch
+extra/0007-raven-disable-reentrancy-detection-for-iomem.patch
+extra/0008-apic-disable-reentrancy-detection-for-apic-msi.patch
bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
diff --git a/qemu b/qemu
index f7f686b..a342ce9 160000
--- a/qemu
+++ b/qemu
@@ -1 +1 @@
-Subproject commit f7f686b61cf7ee142c9264d2e04ac2c6a96d37f8
+Subproject commit a342ce9dfeed8088c426e5d51d4a7e47f3764b84
--
2.39.2
next reply other threads:[~2023-07-11 14:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 14:06 Fiona Ebner [this message]
2023-07-11 14:06 ` [pve-devel] [PATCH qemu 2/2] add patch fixing racy deadlock with busy SCSI disk during QEMU shutdown Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230711140609.196723-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox