Commit 7f3e341a authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Anthony Liguori
Browse files

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: default avatarMarcel Apfelbaum <marcel.a@redhat.com>
Reviewed-by: default avatarHu Tao <hutao@cn.fujitsu.com>
Message-id: 1376233843-19410-2-git-send-email-marcel.a@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 8f3067bd

hw/i386/pc_piix.c

+4 −5
Original line number Diff line number Diff line
@@ -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";

hw/i386/pc_q35.c

+4 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
/* ICH9 AHCI has 6 ports */

#define MAX_SATA_PORTS     6



static bool has_pvpanic = true;

static bool has_pvpanic;

static bool has_pci_info = true;



/* PC hardware initialisation */
@@ -221,6 +221,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 
static void pc_q35_init_1_6(QEMUMachineInitArgs *args)

{

    has_pci_info = false;

    has_pvpanic = true;

    pc_q35_init(args);

}
@@ -231,9 +232,9 @@ static void pc_q35_init_1_5(QEMUMachineInitArgs *args) 


static void pc_q35_init_1_4(QEMUMachineInitArgs *args)

{

    has_pvpanic = false;

    x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);

    pc_q35_init_1_5(args);

    has_pci_info = false;

    pc_q35_init(args);

}



static QEMUMachine pc_q35_machine_v1_6 = {