|
 |
218e99 |
From 27aa81d0b84f03223414eb2e85b7fae0e0d2b86b Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
Date: Wed, 16 Oct 2013 13:07:15 +0200
|
|
|
218e99 |
Subject: [PATCH 17/18] acpi/piix4: Enable qemu-kvm compatibility mode
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
Message-id: <1381928835-10190-1-git-send-email-ehabkost@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54961
|
|
|
218e99 |
O-Subject: [qemu-kvm RHEL-7 PATCH] acpi/piix4: Enable qemu-kvm compatibility mode
|
|
|
218e99 |
Bugzilla: 1019474
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 1019474
|
|
|
218e99 |
Scratch build: https://brewweb.devel.redhat.com/taskinfo?taskID=6426533
|
|
|
218e99 |
Upstream status: not applicable
|
|
|
218e99 |
|
|
|
218e99 |
>From the code comments:
|
|
|
218e99 |
|
|
|
218e99 |
qemu-kvm 1.2 uses version 3 but advertised as 2
|
|
|
218e99 |
To support incoming qemu-kvm 1.2 migration, change version_id
|
|
|
218e99 |
and minimum_version_id to 2 below (which breaks migration from
|
|
|
218e99 |
qemu 1.2).
|
|
|
218e99 |
|
|
|
218e99 |
The v2 format of qemu-0.13 (implemented by upstream commit
|
|
|
218e99 |
4cf3e6f3d85492f20a773dd6c9068ab89ba24a18, and the one that was used on
|
|
|
218e99 |
qemu-kvm) is not compatible with the v2 format of qemu-0.15 and newer
|
|
|
218e99 |
(compatibility was broken by upstream commit
|
|
|
218e99 |
23910d3f669d46073b403876e30a7314599633af). RHEL-6 is using the former
|
|
|
218e99 |
format (RHEL-6 commit c4101c5340988caa68da87066a88d3871c8c4bf1), which
|
|
|
218e99 |
is not compatible with upstream QEMU.
|
|
|
218e99 |
|
|
|
218e99 |
This sets minimum_version_id to 2, so we enable the qemu-kvm
|
|
|
218e99 |
compatibility mode, to allow us to load RHEL-6 migration data.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/acpi/piix4.c | 2 +-
|
|
|
218e99 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/acpi/piix4.c | 2 +-
|
|
|
218e99 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
|
|
|
218e99 |
index 86ff598..f14867a 100644
|
|
|
218e99 |
--- a/hw/acpi/piix4.c
|
|
|
218e99 |
+++ b/hw/acpi/piix4.c
|
|
|
218e99 |
@@ -278,7 +278,7 @@ static int acpi_load_old(QEMUFile *f, void *opaque, int version_id)
|
|
|
218e99 |
static const VMStateDescription vmstate_acpi = {
|
|
|
218e99 |
.name = "piix4_pm",
|
|
|
218e99 |
.version_id = 3,
|
|
|
218e99 |
- .minimum_version_id = 3,
|
|
|
218e99 |
+ .minimum_version_id = 2,
|
|
|
218e99 |
.minimum_version_id_old = 1,
|
|
|
218e99 |
.load_state_old = acpi_load_old,
|
|
|
218e99 |
.post_load = vmstate_acpi_post_load,
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|