summaryrefslogtreecommitdiffstats
path: root/hw/i386/pc_piix.c
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2013-08-11 18:10:42 +0300
committerAnthony Liguori <aliguori@us.ibm.com>2013-08-12 11:20:57 -0500
commit7f3e341a008c585deed174eaf1f826c88c67948a (patch)
treea3451f6eb2dbb9c9402e54830e1eb561bfeb56f2 /hw/i386/pc_piix.c
parent8f3067bd86485f8cd03abc940ddb2b8467ef3627 (diff)
downloadhqemu-7f3e341a008c585deed174eaf1f826c88c67948a.zip
hqemu-7f3e341a008c585deed174eaf1f826c88c67948a.tar.gz
hw/misc: don't create pvpanic device by default
This patch is based on Hu Tao's: http://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg00124.html No need to hard-code pvpanic as part of the machine. It can be added with "-device pvpanic" from command line (The next patch). Anyway, for backport compatibility it is still part of 1.5 machine. Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> Reviewed-by: Hu Tao <hutao@cn.fujitsu.com> Message-id: 1376233843-19410-2-git-send-email-marcel.a@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386/pc_piix.c')
-rw-r--r--hw/i386/pc_piix.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a19e172..ec7f13f 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -56,7 +56,7 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
-static bool has_pvpanic = true;
+static bool has_pvpanic;
static bool has_pci_info = true;
/* PC hardware initialisation */
@@ -253,6 +253,7 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
static void pc_init_pci_1_6(QEMUMachineInitArgs *args)
{
has_pci_info = false;
+ has_pvpanic = true;
pc_init_pci(args);
}
@@ -263,9 +264,9 @@ static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
{
- has_pvpanic = false;
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
- pc_init_pci_1_5(args);
+ has_pci_info = false;
+ pc_init_pci(args);
}
static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
@@ -296,7 +297,6 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args)
const char *kernel_cmdline = args->kernel_cmdline;
const char *initrd_filename = args->initrd_filename;
const char *boot_device = args->boot_device;
- has_pvpanic = false;
has_pci_info = false;
disable_kvm_pv_eoi();
enable_compat_apic_id_mode();
@@ -315,7 +315,6 @@ static void pc_init_isa(QEMUMachineInitArgs *args)
const char *kernel_cmdline = args->kernel_cmdline;
const char *initrd_filename = args->initrd_filename;
const char *boot_device = args->boot_device;
- has_pvpanic = false;
has_pci_info = false;
if (cpu_model == NULL)
cpu_model = "486";
OpenPOWER on IntegriCloud