|
 |
9ae3a8 |
From b7f8490681d9bfb5c47f250323e369bed1645aac Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 7 Mar 2014 18:37:48 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 08/16] pc: Add RHEL6 e1000 gPXE image
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1394217468-2864-3-git-send-email-ehabkost@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 58050
|
|
|
9ae3a8 |
O-Subject: [RHEL7 qemu-kvm PATCH 2/2] pc: Add RHEL6 e1000 gPXE image
|
|
|
9ae3a8 |
Bugzilla: 1073774
|
|
|
9ae3a8 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amos Kong <akong@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1073774
|
|
|
9ae3a8 |
Brew scratch build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=7157997
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
The fix for bz#997702 didn't have the RHEL6 e1000 ROM. Add the e1000-0x100e.rom
|
|
|
9ae3a8 |
file from gpxe-roms-qemu-0.9.7-6.9.el6.noarch.rpm.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc_piix.c | 4 ++++
|
|
|
9ae3a8 |
redhat/Makefile.common | 2 +-
|
|
|
9ae3a8 |
redhat/qemu-kvm.spec.template | 3 +++
|
|
|
9ae3a8 |
redhat/rhel6-e1000.rom | Bin 0 -> 69120 bytes
|
|
|
9ae3a8 |
4 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
9ae3a8 |
create mode 100644 redhat/rhel6-e1000.rom
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc_piix.c | 4 ++++
|
|
|
9ae3a8 |
redhat/Makefile.common | 2 +-
|
|
|
9ae3a8 |
redhat/qemu-kvm.spec.template | 3 +++
|
|
|
9ae3a8 |
redhat/rhel6-e1000.rom | Bin 0 -> 69120 bytes
|
|
|
9ae3a8 |
4 files changed, 8 insertions(+), 1 deletions(-)
|
|
|
9ae3a8 |
create mode 100644 redhat/rhel6-e1000.rom
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
index 98a5253..6773fff 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
@@ -897,6 +897,10 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.property = "romfile",\
|
|
|
9ae3a8 |
.value = "rhel6-rtl8139.rom",\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
+ .driver = "e1000",\
|
|
|
9ae3a8 |
+ .property = "romfile",\
|
|
|
9ae3a8 |
+ .value = "rhel6-e1000.rom",\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
.driver = "virtio-net-pci",\
|
|
|
9ae3a8 |
.property = "romfile",\
|
|
|
9ae3a8 |
.value = "rhel6-virtio.rom",\
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|