ae37a72f4c
- pci-host: designware: Limit value range of iATU viewport register - hmat acpi: Fix out of bounds access due to missing use of indirection - migration: Skip only empty block devices - aspeed/hace: Initialize g_autofree pointer - hw/net/vmxnet3: Fix guest-triggerable assert() - qxl: don't assert() if device isn't yet initialized - Avoid unaligned fetch in ladr_match() - linux-user: Fix waitid return of siginfo_t and rusage - hw/net/lan9118: Replace magic '2048' value by MIL_TXFIFO_SIZE definition - stdvga: fix screen blanking - virtio-net: drop too short packets early - ebpf: replace deprecated bpf_program__set_socket_filter - vhsot-user: only read reply of SET_LOG_BASE from vq 0 - cpu: add Tengyun S5000C cpu support - hw/virtio: Fix obtain the buffer id from the last descriptor - hw/core: ensure kernel_end never gets used undefined Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 1f9e476e96edb07e34e0133a312f478ddab4b6ff)
53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From 5cb26fdba648f1347f0746cf5c8f619427e4c2b5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
Date: Mon, 14 Aug 2023 23:33:30 +0400
|
|
Subject: [PATCH] qxl: don't assert() if device isn't yet initialized
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
If the PCI BAR isn't yet mapped or was unmapped, QXL_IO_SET_MODE will
|
|
assert(). Instead, report a guest bug and keep going.
|
|
|
|
This can be reproduced with:
|
|
|
|
cat << EOF | ./qemu-system-x86_64 -vga qxl -m 2048 -nodefaults -qtest stdio
|
|
outl 0xcf8 0x8000101c
|
|
outl 0xcfc 0xc000
|
|
outl 0xcf8 0x80001001
|
|
outl 0xcfc 0x01000000
|
|
outl 0xc006 0x00
|
|
EOF
|
|
|
|
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1829
|
|
|
|
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
(cherry picked from commit 95bef686e490bc3afc3f51f5fc6e20bf260b938c)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/display/qxl.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
|
|
index 0f663b9912..d7673b8169 100644
|
|
--- a/hw/display/qxl.c
|
|
+++ b/hw/display/qxl.c
|
|
@@ -1601,7 +1601,10 @@ static void qxl_set_mode(PCIQXLDevice *d, unsigned int modenr, int loadvm)
|
|
}
|
|
|
|
d->guest_slots[0].slot = slot;
|
|
- assert(qxl_add_memslot(d, 0, devmem, QXL_SYNC) == 0);
|
|
+ if (qxl_add_memslot(d, 0, devmem, QXL_SYNC) != 0) {
|
|
+ qxl_set_guest_bug(d, "device isn't initialized yet");
|
|
+ return;
|
|
+ }
|
|
|
|
d->guest_primary.surface = surface;
|
|
qxl_create_guest_primary(d, 0, QXL_SYNC);
|
|
--
|
|
2.41.0.windows.1
|
|
|