cryptospore / rpms / qemu-kvm

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