|
 |
218e99 |
From 5ed11d0f0f9cbd5e8616bd8f6028b8cae45c9103 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Orit Wasserman <owasserm@redhat.com>
|
|
|
218e99 |
Date: Tue, 5 Nov 2013 13:13:44 +0100
|
|
|
218e99 |
Subject: [PATCH 17/29] Fix migration from rhel6.5 to rhel7 with ipxe
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Orit Wasserman <owasserm@redhat.com>
|
|
|
218e99 |
Message-id: <1383657224-18599-4-git-send-email-owasserm@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55377
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm 3/3] Fix migration from rhel6.5 to rhel7 with ipxe
|
|
|
218e99 |
Bugzilla: 997702
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Use rhel6 ipxe roms for rhel6 machine types (to have compatible roms sizes
|
|
|
218e99 |
when migrating)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/pc_piix.c | 16 ++++++++++++++++
|
|
|
218e99 |
1 file changed, 16 insertions(+)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/pc_piix.c | 16 ++++++++++++++++
|
|
|
218e99 |
1 files changed, 16 insertions(+), 0 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
218e99 |
index 3f5b913..3a8418e 100644
|
|
|
218e99 |
--- a/hw/i386/pc_piix.c
|
|
|
218e99 |
+++ b/hw/i386/pc_piix.c
|
|
|
218e99 |
@@ -867,6 +867,22 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
.driver = "usb-ccid",\
|
|
|
218e99 |
.property = "serial",\
|
|
|
218e99 |
.value = "1",\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
+ .driver = "ne2k_pci",\
|
|
|
218e99 |
+ .property = "romfile",\
|
|
|
218e99 |
+ .value = "rhel6-ne2k_pci.rom",\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
+ .driver = "pcnet",\
|
|
|
218e99 |
+ .property = "romfile",\
|
|
|
218e99 |
+ .value = "rhel6-pcnet.rom",\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
+ .driver = "rtl8139",\
|
|
|
218e99 |
+ .property = "romfile",\
|
|
|
218e99 |
+ .value = "rhel6-rtl8139.rom",\
|
|
|
218e99 |
+ },{\
|
|
|
218e99 |
+ .driver = "virtio-net-pci",\
|
|
|
218e99 |
+ .property = "romfile",\
|
|
|
218e99 |
+ .value = "rhel6-virtio.rom",\
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
static void pc_init_rhel650(QEMUMachineInitArgs *args)
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|