cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
0a122b
From 83aeeafe6163924b991c2e0f89e3a79b3bc6b182 Mon Sep 17 00:00:00 2001
0a122b
Message-Id: <83aeeafe6163924b991c2e0f89e3a79b3bc6b182.1387298827.git.minovotn@redhat.com>
0a122b
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
0a122b
From: "Michael S. Tsirkin" <mst@redhat.com>
0a122b
Date: Tue, 17 Dec 2013 15:19:16 +0100
0a122b
Subject: [PATCH 51/56] pc: disable pci-info
0a122b
0a122b
RH-Author: Michael S. Tsirkin <mst@redhat.com>
0a122b
Message-id: <1387293161-4085-52-git-send-email-mst@redhat.com>
0a122b
Patchwork-id: 56357
0a122b
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 51/57] pc: disable pci-info
0a122b
Bugzilla: 1034876
0a122b
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
0a122b
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
0a122b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
0a122b
0a122b
From: Igor Mammedov <imammedo@redhat.com>
0a122b
0a122b
The BIOS that we ship in 1.7 does not use pci info
0a122b
from host and so far isn't going to use it.
0a122b
Taking in account problems it caused see 9604f70fdf and
0a122b
to avoid future incompatibility issues, it's safest to
0a122b
disable that interface by default for all machine types
0a122b
including 1.7 as it was never exposed/used by guest.
0a122b
And properly remove/cleanup it during 1.8 development cycle.
0a122b
0a122b
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
0a122b
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
0a122b
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
0a122b
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
0a122b
(cherry picked from commit 7f1bb742be39184b469d53c0901240b12bb85589)
0a122b
0a122b
Conflicts:
0a122b
	hw/i386/pc_piix.c
0a122b
	hw/i386/pc_q35.c
0a122b
---
0a122b
 hw/i386/pc_piix.c | 2 +-
0a122b
 hw/i386/pc_q35.c  | 2 +-
0a122b
 2 files changed, 2 insertions(+), 2 deletions(-)
0a122b
0a122b
Signed-off-by: Michal Novotny <minovotn@redhat.com>
0a122b
---
0a122b
 hw/i386/pc_piix.c | 2 +-
0a122b
 hw/i386/pc_q35.c  | 2 +-
0a122b
 2 files changed, 2 insertions(+), 2 deletions(-)
0a122b
0a122b
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
0a122b
index ffa35d3..76d6e93 100644
0a122b
--- a/hw/i386/pc_piix.c
0a122b
+++ b/hw/i386/pc_piix.c
0a122b
@@ -59,7 +59,7 @@ static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
0a122b
 static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
0a122b
 
0a122b
 static bool smbios_type1_defaults = true;
0a122b
-static bool has_pci_info = true;
0a122b
+static bool has_pci_info;
0a122b
 static bool has_acpi_build = true;
0a122b
 
0a122b
 /* PC hardware initialisation */
0a122b
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
0a122b
index 824295d..86c0c90 100644
0a122b
--- a/hw/i386/pc_q35.c
0a122b
+++ b/hw/i386/pc_q35.c
0a122b
@@ -49,7 +49,7 @@
0a122b
 #define MAX_SATA_PORTS     6
0a122b
 
0a122b
 static bool smbios_type1_defaults = true;
0a122b
-static bool has_pci_info = true;
0a122b
+static bool has_pci_info;
0a122b
 static bool has_acpi_build = true;
0a122b
 
0a122b
 /* PC hardware initialisation */
0a122b
-- 
0a122b
1.7.11.7
0a122b