|
 |
9ae3a8 |
From 5e40d1551af04499f6e0f408e07dc5046123c6c0 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 31 Jul 2013 08:02:36 +0200
|
|
|
9ae3a8 |
Subject: pc: Drop superfluous RHEL-6 compat_props
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1375201922-6794-4-git-send-email-armbru@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 52812
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 PATCH v3 03/15] pc: Drop superfluous RHEL-6 compat_props
|
|
|
9ae3a8 |
Bugzilla: 983991
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Drop compatibility properties of
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
* devices we won't ship: ne2k_pci, pcnet, pc-sysfw, vmware-svga
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
* devices that are new in RHEL-7: nec-usb-xhci, ivshmem
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Re ivshmem: actually, the current plan is not to ship it (bug 787463).
|
|
|
9ae3a8 |
Executing the plan will only flip the reason for dropping its
|
|
|
9ae3a8 |
compatibility property, so no code conflict here.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
index bdb1b11..96f6bf9 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
@@ -840,14 +840,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.property = "romfile",\
|
|
|
9ae3a8 |
.value = "pxe-e1000.rom",\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
- .driver = "ne2k_pci",\
|
|
|
9ae3a8 |
- .property = "romfile",\
|
|
|
9ae3a8 |
- .value = "pxe-ne2k_pci.rom",\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
- .driver = "pcnet",\
|
|
|
9ae3a8 |
- .property = "romfile",\
|
|
|
9ae3a8 |
- .value = "pxe-pcnet.rom",\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
.driver = "rtl8139",\
|
|
|
9ae3a8 |
.property = "romfile",\
|
|
|
9ae3a8 |
.value = "pxe-rtl8139.rom",\
|
|
|
9ae3a8 |
@@ -876,18 +868,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.property = "autonegotiation",\
|
|
|
9ae3a8 |
.value = "off",\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
- .driver = "nec-usb-xhci",\
|
|
|
9ae3a8 |
- .property = "msi",\
|
|
|
9ae3a8 |
- .value = "off",\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
- .driver = "nec-usb-xhci",\
|
|
|
9ae3a8 |
- .property = "msix",\
|
|
|
9ae3a8 |
- .value = "off",\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
- .driver = "ivshmem",\
|
|
|
9ae3a8 |
- .property = "use64",\
|
|
|
9ae3a8 |
- .value = "0",\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
.driver = "qxl",\
|
|
|
9ae3a8 |
.property = "revision",\
|
|
|
9ae3a8 |
.value = stringify(3),\
|
|
|
9ae3a8 |
@@ -912,10 +892,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.property = "vgamem_mb",\
|
|
|
9ae3a8 |
.value = stringify(8),\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
- .driver = "vmware-svga",\
|
|
|
9ae3a8 |
- .property = "vgamem_mb",\
|
|
|
9ae3a8 |
- .value = stringify(8),\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
.driver = "qxl-vga",\
|
|
|
9ae3a8 |
.property = "vgamem_mb",\
|
|
|
9ae3a8 |
.value = stringify(8),\
|
|
|
9ae3a8 |
@@ -928,10 +904,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.property = "config-wce",\
|
|
|
9ae3a8 |
.value = "off",\
|
|
|
9ae3a8 |
},{\
|
|
|
9ae3a8 |
- .driver = "pc-sysfw",\
|
|
|
9ae3a8 |
- .property = "rom_only",\
|
|
|
9ae3a8 |
- .value = stringify(1),\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
.driver = TYPE_ISA_FDC,\
|
|
|
9ae3a8 |
.property = "check_media_rate",\
|
|
|
9ae3a8 |
.value = "off",\
|
|
|
9ae3a8 |
@@ -983,10 +955,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.driver = "VGA",\
|
|
|
9ae3a8 |
.property = "rombar",\
|
|
|
9ae3a8 |
.value = stringify(0),\
|
|
|
9ae3a8 |
- },{\
|
|
|
9ae3a8 |
- .driver = "vmware-svga",\
|
|
|
9ae3a8 |
- .property = "rombar",\
|
|
|
9ae3a8 |
- .value = stringify(0),\
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void pc_init_rhel600(QEMUMachineInitArgs *args)
|