[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/23] qxl: don't assert() if device isn't yet initialized
From: |
Michael Tokarev |
Subject: |
[PULL 23/23] qxl: don't assert() if device isn't yet initialized |
Date: |
Fri, 8 Sep 2023 12:55:20 +0300 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
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 af941fb0c2..7bb00d68f5 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -1591,7 +1591,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.39.2
- [PULL 13/23] hw/display/xlnx_dp: update comments, (continued)
- [PULL 13/23] hw/display/xlnx_dp: update comments, Michael Tokarev, 2023/09/08
- [PULL 14/23] qemu-options.hx: Rephrase the descriptions of the -hd* and -cdrom options, Michael Tokarev, 2023/09/08
- [PULL 15/23] docs tests: Fix use of migrate_set_parameter, Michael Tokarev, 2023/09/08
- [PULL 16/23] tests/qtest/test-hmp: Fix migrate_set_parameter xbzrle-cache-size test, Michael Tokarev, 2023/09/08
- [PULL 17/23] accel/tcg: Fix typo in translator_io_start() description, Michael Tokarev, 2023/09/08
- [PULL 18/23] trivial: Simplify the spots that use TARGET_BIG_ENDIAN as a numeric value, Michael Tokarev, 2023/09/08
- [PULL 19/23] hw/ppc: use g_free() in spapr_tce_table_post_load(), Michael Tokarev, 2023/09/08
- [PULL 21/23] tests/qtest/usb-hcd: Remove the empty "init" tests, Michael Tokarev, 2023/09/08
- [PULL 20/23] target/ppc: use g_free() in test_opcode_table(), Michael Tokarev, 2023/09/08
- [PULL 22/23] hw/net/vmxnet3: Fix guest-triggerable assert(), Michael Tokarev, 2023/09/08
- [PULL 23/23] qxl: don't assert() if device isn't yet initialized,
Michael Tokarev <=