|
 |
6986e1 |
From 99c9360e120aa7098952564af5bda76834498442 Mon Sep 17 00:00:00 2001
|
|
|
6986e1 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
6986e1 |
Date: Mon, 14 Jan 2013 21:49:21 -0500
|
|
|
6986e1 |
Subject: [PATCH] Fix migration compat with qemu-kvm
|
|
|
6986e1 |
|
|
|
6986e1 |
Outlined here:
|
|
|
6986e1 |
https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg02340.html
|
|
|
6986e1 |
https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg02540.html
|
|
|
6986e1 |
---
|
|
|
6986e1 |
hw/acpi_piix4.c | 2 +-
|
|
|
6986e1 |
hw/cirrus_vga.c | 2 +-
|
|
|
6986e1 |
hw/pc_piix.c | 16 ----------------
|
|
|
6986e1 |
3 files changed, 2 insertions(+), 18 deletions(-)
|
|
|
6986e1 |
|
|
|
6986e1 |
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
|
|
|
6986e1 |
index 519269a..785e756 100644
|
|
|
6986e1 |
--- a/hw/acpi_piix4.c
|
|
|
6986e1 |
+++ b/hw/acpi_piix4.c
|
|
|
6986e1 |
@@ -311,7 +311,7 @@ static int acpi_load_old(QEMUFile *f, void *opaque, int version_id)
|
|
|
6986e1 |
static const VMStateDescription vmstate_acpi = {
|
|
|
6986e1 |
.name = "piix4_pm",
|
|
|
6986e1 |
.version_id = 3,
|
|
|
6986e1 |
- .minimum_version_id = 3,
|
|
|
6986e1 |
+ .minimum_version_id = 2,
|
|
|
6986e1 |
.minimum_version_id_old = 1,
|
|
|
6986e1 |
.load_state_old = acpi_load_old,
|
|
|
6986e1 |
.post_load = vmstate_acpi_post_load,
|
|
|
6986e1 |
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
|
|
|
6986e1 |
index 9bef96e..8c94428 100644
|
|
|
6986e1 |
--- a/hw/cirrus_vga.c
|
|
|
6986e1 |
+++ b/hw/cirrus_vga.c
|
|
|
6986e1 |
@@ -2975,7 +2975,7 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
|
|
|
6986e1 |
|
|
|
6986e1 |
static Property pci_vga_cirrus_properties[] = {
|
|
|
6986e1 |
DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,
|
|
|
6986e1 |
- cirrus_vga.vga.vram_size_mb, 8),
|
|
|
6986e1 |
+ cirrus_vga.vga.vram_size_mb, 16),
|
|
|
6986e1 |
DEFINE_PROP_END_OF_LIST(),
|
|
|
6986e1 |
};
|
|
|
6986e1 |
|
|
|
6986e1 |
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
|
|
|
6986e1 |
index aa3e7f4..ea37ef2 100644
|
|
|
6986e1 |
--- a/hw/pc_piix.c
|
|
|
6986e1 |
+++ b/hw/pc_piix.c
|
|
|
6986e1 |
@@ -339,22 +339,6 @@ static QEMUMachine pc_machine_v1_2 = {
|
|
|
6986e1 |
.property = "param_change",\
|
|
|
6986e1 |
.value = "off",\
|
|
|
6986e1 |
},{\
|
|
|
6986e1 |
- .driver = "VGA",\
|
|
|
6986e1 |
- .property = "vgamem_mb",\
|
|
|
6986e1 |
- .value = stringify(8),\
|
|
|
6986e1 |
- },{\
|
|
|
6986e1 |
- .driver = "vmware-svga",\
|
|
|
6986e1 |
- .property = "vgamem_mb",\
|
|
|
6986e1 |
- .value = stringify(8),\
|
|
|
6986e1 |
- },{\
|
|
|
6986e1 |
- .driver = "qxl-vga",\
|
|
|
6986e1 |
- .property = "vgamem_mb",\
|
|
|
6986e1 |
- .value = stringify(8),\
|
|
|
6986e1 |
- },{\
|
|
|
6986e1 |
- .driver = "qxl",\
|
|
|
6986e1 |
- .property = "vgamem_mb",\
|
|
|
6986e1 |
- .value = stringify(8),\
|
|
|
6986e1 |
- },{\
|
|
|
6986e1 |
.driver = "virtio-blk-pci",\
|
|
|
6986e1 |
.property = "config-wce",\
|
|
|
6986e1 |
.value = "off",\
|
|
|
6986e1 |
--
|
|
|
6986e1 |
1.8.1
|
|
|
6986e1 |
|