|
 |
0a122b |
From cbe9fe3834d08758bc787ac0800afb9ece6ed782 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
0a122b |
Date: Tue, 12 Nov 2013 17:10:04 +0100
|
|
|
0a122b |
Subject: [PATCH 01/14] pc: drop virtio-balloon-pci event_idx compat property
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
0a122b |
Message-id: <20131112121004.12eb9431@redhat.com>
|
|
|
0a122b |
Patchwork-id: 55664
|
|
|
0a122b |
O-Subject: [RHEL-7.0 qemu-kvm PATCH] pc: drop virtio-balloon-pci event_idx compat property
|
|
|
0a122b |
Bugzilla: 1029539
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Bugzilla: 1029539
|
|
|
0a122b |
Brew-build: https://brewweb.devel.redhat.com/taskinfo?taskID=6564546
|
|
|
0a122b |
|
|
|
0a122b |
Due to a bug, RHEL6 has never disabled the virtio-balloon-pci
|
|
|
0a122b |
driver's event_idx property for machine types rhel6.0.0 and
|
|
|
0a122b |
rhel6.1.0. The end result is that migration from RHEL6 to RHEL7
|
|
|
0a122b |
fails for those machine types.
|
|
|
0a122b |
|
|
|
0a122b |
The most obvious way to fix this problem is to fix RHEL6 to
|
|
|
0a122b |
really disable the property. But this won't solve the problem
|
|
|
0a122b |
for old RHEL6 binaries. Actually, it will make migration
|
|
|
0a122b |
incompatible between old RHEL6 binaries and newer ones.
|
|
|
0a122b |
|
|
|
0a122b |
This commit makes the mistake official instead by dropping
|
|
|
0a122b |
the compat property for RHEL7. This fixes migration between
|
|
|
0a122b |
RHEL6 and RHEL7 without adding any new problems.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Luiz Capitulino <lcapitulino@gmail.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/i386/pc_piix.c | 9 +++++----
|
|
|
0a122b |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
PS: Will post RHEL6.6 patch later.
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/i386/pc_piix.c | 9 +++++----
|
|
|
0a122b |
1 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
0a122b |
index 8bae4c5..e6771a9 100644
|
|
|
0a122b |
--- a/hw/i386/pc_piix.c
|
|
|
0a122b |
+++ b/hw/i386/pc_piix.c
|
|
|
0a122b |
@@ -1030,6 +1030,11 @@ static QEMUMachine pc_machine_rhel620 = {
|
|
|
0a122b |
DEFAULT_MACHINE_OPTIONS,
|
|
|
0a122b |
};
|
|
|
0a122b |
|
|
|
0a122b |
+/*
|
|
|
0a122b |
+ * NOTE: We don't have the event_idx compat entry for the
|
|
|
0a122b |
+ * virtio-balloon-pci driver because RHEL6 doesn't disable
|
|
|
0a122b |
+ * it either due to a bug (see RHBZ 1029539 fo more info)
|
|
|
0a122b |
+ */
|
|
|
0a122b |
#define PC_RHEL6_1_COMPAT \
|
|
|
0a122b |
PC_RHEL6_2_COMPAT,\
|
|
|
0a122b |
{\
|
|
|
0a122b |
@@ -1061,10 +1066,6 @@ static QEMUMachine pc_machine_rhel620 = {
|
|
|
0a122b |
.property = "event_idx",\
|
|
|
0a122b |
.value = "off",\
|
|
|
0a122b |
},{\
|
|
|
0a122b |
- .driver = "virtio-balloon-pci",\
|
|
|
0a122b |
- .property = "event_idx",\
|
|
|
0a122b |
- .value = "off",\
|
|
|
0a122b |
- },{\
|
|
|
0a122b |
.driver = "usb-kbd",\
|
|
|
0a122b |
.property = "serial",\
|
|
|
0a122b |
.value = "1",\
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|