From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 3/6] Revert "qxl: add migration blocker to avoid pre-save assert"
Date: Fri, 23 Jul 2021 07:54:45 +0200 [thread overview]
Message-ID: <20210723055448.1032115-4-kraxel@redhat.com> (raw)
In-Reply-To: <20210723055448.1032115-1-kraxel@redhat.com>
This reverts commit 86dbcdd9c7590d06db89ca256c5eaf0b4aba8858.
The pre-save assert is gone now, so the migration blocker
is not needed any more.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210721093347.338536-3-kraxel@redhat.com>
---
hw/display/qxl.h | 1 -
hw/display/qxl.c | 31 -------------------------------
2 files changed, 32 deletions(-)
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
index 379d3304abc1..30d21f4d0bdc 100644
--- a/hw/display/qxl.h
+++ b/hw/display/qxl.h
@@ -39,7 +39,6 @@ struct PCIQXLDevice {
uint32_t cmdlog;
uint32_t guest_bug;
- Error *migration_blocker;
enum qxl_mode mode;
uint32_t cmdflags;
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index 3867b94fe236..43482d4364ba 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -30,7 +30,6 @@
#include "qemu/module.h"
#include "hw/qdev-properties.h"
#include "sysemu/runstate.h"
-#include "migration/blocker.h"
#include "migration/vmstate.h"
#include "trace.h"
@@ -666,30 +665,6 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)
qxl->guest_primary.commands++;
qxl_track_command(qxl, ext);
qxl_log_command(qxl, "cmd", ext);
- {
- /*
- * Windows 8 drivers place qxl commands in the vram
- * (instead of the ram) bar. We can't live migrate such a
- * guest, so add a migration blocker in case we detect
- * this, to avoid triggering the assert in pre_save().
- *
- * https://cgit.freedesktop.org/spice/win32/qxl-wddm-dod/commit/?id=f6e099db39e7d0787f294d5fd0dce328b5210faa
- */
- void *msg = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
- if (msg != NULL && (
- msg < (void *)qxl->vga.vram_ptr ||
- msg > ((void *)qxl->vga.vram_ptr + qxl->vga.vram_size))) {
- if (!qxl->migration_blocker) {
- Error *local_err = NULL;
- error_setg(&qxl->migration_blocker,
- "qxl: guest bug: command not in ram bar");
- migrate_add_blocker(qxl->migration_blocker, &local_err);
- if (local_err) {
- error_report_err(local_err);
- }
- }
- }
- }
trace_qxl_ring_command_get(qxl->id, qxl_mode_to_string(qxl->mode));
return true;
default:
@@ -1283,12 +1258,6 @@ static void qxl_hard_reset(PCIQXLDevice *d, int loadvm)
qemu_spice_create_host_memslot(&d->ssd);
qxl_soft_reset(d);
- if (d->migration_blocker) {
- migrate_del_blocker(d->migration_blocker);
- error_free(d->migration_blocker);
- d->migration_blocker = NULL;
- }
-
if (startstop) {
qemu_spice_display_start();
}
--
2.31.1
next prev parent reply other threads:[~2021-07-23 5:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 5:54 [PULL 0/6] Vga 20210723 patches Gerd Hoffmann
2021-07-23 5:54 ` [PULL 1/6] hw/display/virtio-gpu: Fix memory leak (CID 1453811) Gerd Hoffmann
2021-07-23 5:54 ` [PULL 2/6] qxl: remove assert in qxl_pre_save Gerd Hoffmann
2021-07-23 5:54 ` Gerd Hoffmann [this message]
2021-07-23 5:54 ` [PULL 4/6] hw/display: fail early when multiple virgl devices are requested Gerd Hoffmann
2021-07-23 5:54 ` [PULL 5/6] vl: add virtio-vga-gl to the default_list Gerd Hoffmann
2021-07-23 5:54 ` [PULL 6/6] hw/display: fix virgl reset regression Gerd Hoffmann
2021-07-23 14:26 ` [PULL 0/6] Vga 20210723 patches Peter Maydell
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=20210723055448.1032115-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).