aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-11-30 10:20:36 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-30 10:20:36 -0600
commit3235f92784bcf679894b34081f4f4b04e4a358e3 (patch)
treef52324bd2e2f593fcd06fe2ded8e62bb38274033
parent923fd9897b0ffbcc5091181f8b0484aa2e36413b (diff)
parentfa98efe932d93a15ffa867f3b05149c8d1fc7c28 (diff)
Merge remote-tracking branch 'spice/spice.v65' into staging
* spice/spice.v65: qxl: reload memslots after migration, when qxl is in UNDEFINED mode Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/qxl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/qxl.c b/hw/qxl.c
index 1bc2d32aa8..96887c4aad 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -2146,6 +2146,7 @@ static int qxl_post_load(void *opaque, int version)
switch (newmode) {
case QXL_MODE_UNDEFINED:
+ qxl_create_memslots(d);
break;
case QXL_MODE_VGA:
qxl_create_memslots(d);