|
 |
9ae3a8 |
From f84d8a785cd2309325476ae5e6a60170dac7c75a Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 23 Jan 2018 18:09:33 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 3/3] qxl: add migration blocker to avoid pre-save assert
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Message-id: <20180123180933.26008-2-dgilbert@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 78698
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.5 qemu-kvm PATCH 1/1] qxl: add migration blocker to avoid pre-save assert
|
|
|
9ae3a8 |
Bugzilla: 1536883
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Cc: 1635339@bugs.launchpad.net
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
9ae3a8 |
Message-id: 20170410113131.2585-1-kraxel@redhat.com
|
|
|
9ae3a8 |
(cherry picked from commit 86dbcdd9c7590d06db89ca256c5eaf0b4aba8858)
|
|
|
9ae3a8 |
dgilbert: Fixup change in migrate_add_blocker parameters
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/display/qxl.c | 27 +++++++++++++++++++++++++++
|
|
|
9ae3a8 |
hw/display/qxl.h | 1 +
|
|
|
9ae3a8 |
2 files changed, 28 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
|
|
|
9ae3a8 |
index 0a755df..0625a76 100644
|
|
|
9ae3a8 |
--- a/hw/display/qxl.c
|
|
|
9ae3a8 |
+++ b/hw/display/qxl.c
|
|
|
9ae3a8 |
@@ -26,6 +26,7 @@
|
|
|
9ae3a8 |
#include "qemu/atomic.h"
|
|
|
9ae3a8 |
#include "monitor/monitor.h"
|
|
|
9ae3a8 |
#include "sysemu/sysemu.h"
|
|
|
9ae3a8 |
+#include "migration/migration.h"
|
|
|
9ae3a8 |
#include "trace.h"
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#include "qxl.h"
|
|
|
9ae3a8 |
@@ -637,6 +638,26 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext)
|
|
|
9ae3a8 |
qxl->guest_primary.commands++;
|
|
|
9ae3a8 |
qxl_track_command(qxl, ext);
|
|
|
9ae3a8 |
qxl_log_command(qxl, "cmd", ext);
|
|
|
9ae3a8 |
+ {
|
|
|
9ae3a8 |
+ /*
|
|
|
9ae3a8 |
+ * Windows 8 drivers place qxl commands in the vram
|
|
|
9ae3a8 |
+ * (instead of the ram) bar. We can't live migrate such a
|
|
|
9ae3a8 |
+ * guest, so add a migration blocker in case we detect
|
|
|
9ae3a8 |
+ * this, to avoid triggering the assert in pre_save().
|
|
|
9ae3a8 |
+ *
|
|
|
9ae3a8 |
+ * https://cgit.freedesktop.org/spice/win32/qxl-wddm-dod/commit/?id=f6e099db39e7d0787f294d5fd0dce328b5210faa
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ void *msg = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
|
|
|
9ae3a8 |
+ if (msg != NULL && (
|
|
|
9ae3a8 |
+ msg < (void *)qxl->vga.vram_ptr ||
|
|
|
9ae3a8 |
+ msg > ((void *)qxl->vga.vram_ptr + qxl->vga.vram_size))) {
|
|
|
9ae3a8 |
+ if (!qxl->migration_blocker) {
|
|
|
9ae3a8 |
+ error_setg(&qxl->migration_blocker,
|
|
|
9ae3a8 |
+ "qxl: guest bug: command not in ram bar");
|
|
|
9ae3a8 |
+ migrate_add_blocker(qxl->migration_blocker);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
trace_qxl_ring_command_get(qxl->id, qxl_mode_to_string(qxl->mode));
|
|
|
9ae3a8 |
return true;
|
|
|
9ae3a8 |
default:
|
|
|
9ae3a8 |
@@ -1215,6 +1236,12 @@ static void qxl_hard_reset(PCIQXLDevice *d, int loadvm)
|
|
|
9ae3a8 |
qemu_spice_create_host_memslot(&d->ssd);
|
|
|
9ae3a8 |
qxl_soft_reset(d);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ if (d->migration_blocker) {
|
|
|
9ae3a8 |
+ migrate_del_blocker(d->migration_blocker);
|
|
|
9ae3a8 |
+ error_free(d->migration_blocker);
|
|
|
9ae3a8 |
+ d->migration_blocker = NULL;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
if (startstop) {
|
|
|
9ae3a8 |
qemu_spice_display_start();
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
diff --git a/hw/display/qxl.h b/hw/display/qxl.h
|
|
|
9ae3a8 |
index f3f51e2..11cf2aa 100644
|
|
|
9ae3a8 |
--- a/hw/display/qxl.h
|
|
|
9ae3a8 |
+++ b/hw/display/qxl.h
|
|
|
9ae3a8 |
@@ -36,6 +36,7 @@ typedef struct PCIQXLDevice {
|
|
|
9ae3a8 |
uint32_t cmdlog;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
uint32_t guest_bug;
|
|
|
9ae3a8 |
+ Error *migration_blocker;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
enum qxl_mode mode;
|
|
|
9ae3a8 |
uint32_t cmdflags;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|