From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>
Subject: [Stable-7.2.6 37/37] qxl: don't assert() if device isn't yet initialized
Date: Sat, 9 Sep 2023 16:05:07 +0300 [thread overview]
Message-ID: <20230909130511.354171-37-mjt@tls.msk.ru> (raw)
In-Reply-To: <qemu-stable-7.2.6-20230909160328@cover.tls.msk.ru>
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>
(cherry picked from commit 95bef686e490bc3afc3f51f5fc6e20bf260b938c)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 6772849dec..82b0634a98 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -1613,7 +1613,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
prev parent reply other threads:[~2023-09-09 13:18 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 13:04 [Stable-7.2.6 00/37] Patch Round-up for stable 7.2.6, freeze on 2023-09-19 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 01/37] machine: Add helpers to get cores/threads per socket Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 02/37] hw/smbios: Fix smbios_smp_sockets caculation Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 03/37] hw/smbios: Fix thread count in type4 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 04/37] hw/smbios: Fix core " Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 05/37] dump: kdump-zlib data pages not dumped with pvtime/aarch64 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 06/37] hw/nvme: fix CRC64 for guard tag Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 07/37] linux-user/elfload: Set V in ELF_HWCAP for RISC-V Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 08/37] include/exec/user: Set ABI_LLONG_ALIGNMENT to 4 for microblaze Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 09/37] include/exec/user: Set ABI_LLONG_ALIGNMENT to 4 for nios2 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 10/37] Fixed incorrect LLONG alignment for openrisc and cris Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 11/37] target/s390x: Fix the "ignored match" case in VSTRS Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 12/37] target/s390x: Use a 16-bit immediate in VREP Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 13/37] target/s390x: Fix VSTL with a large length Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 14/37] target/s390x: Check reserved bits of VFMIN/VFMAX's M5 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 15/37] include/hw/virtio/virtio-gpu: Fix virtio-gpu with blob on big endian hosts Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 16/37] kvm: Introduce kvm_arch_get_default_type hook Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 17/37] accel/kvm: Specify default IPA size for arm64 Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 18/37] target/arm: Fix SME ST1Q Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 19/37] target/arm: Fix 64-bit SSRA Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 20/37] docs/about/license: Update LICENSE URL Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 21/37] block-migration: Ensure we don't crash during migration cleanup Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 22/37] hw/ppc/e500: fix broken snapshot replay Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 23/37] ppc/vof: Fix missed fields in VOF cleanup Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 24/37] target/ppc: Flush inputs to zero with NJ in ppc_store_vscr Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 25/37] hw/ide/core: set ERR_STAT in unsupported command completion Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 26/37] hw/ide/ahci: write D2H FIS when processing NCQ command Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 27/37] hw/ide/ahci: simplify and document PxCI handling Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 28/37] hw/ide/ahci: PxSACT and PxCI is cleared when PxCMD.ST is cleared Michael Tokarev
2023-09-09 13:04 ` [Stable-7.2.6 29/37] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set Michael Tokarev
2023-09-10 21:07 ` Michael Tokarev
2023-09-11 13:34 ` Niklas Cassel
2023-09-09 13:05 ` [Stable-7.2.6 30/37] hw/ide/ahci: fix ahci_write_fis_sdb() Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 31/37] hw/ide/ahci: fix broken SError handling Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 32/37] hw/i2c/aspeed: Fix Tx count and Rx size error in buffer pool mode Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 33/37] hw/i2c/aspeed: Fix TXBUF transmission start position error Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 34/37] qemu-options.hx: Rephrase the descriptions of the -hd* and -cdrom options Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 35/37] docs tests: Fix use of migrate_set_parameter Michael Tokarev
2023-09-09 13:05 ` [Stable-7.2.6 36/37] hw/net/vmxnet3: Fix guest-triggerable assert() Michael Tokarev
2023-09-09 13:05 ` Michael Tokarev [this message]
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=20230909130511.354171-37-mjt@tls.msk.ru \
--to=mjt@tls.msk.ru \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=thuth@redhat.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;
as well as URLs for NNTP newsgroup(s).