diff options
| author | Hu Tao <hutao@cn.fujitsu.com> | 2013-04-26 11:24:46 +0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-30 10:30:01 -0500 |
| commit | 3ab135f3462af4c523a4b5969f9d6c67b2ac427a (patch) | |
| tree | 185af1c5186fc74f6d74817ae3c40c2fadf05521 /hw/i386/pc_q35.c | |
| parent | b42ffe60d8b510cd2f76ef50f6a1057f91a3dd34 (diff) | |
| download | qemu-3ab135f3462af4c523a4b5969f9d6c67b2ac427a.tar.gz | |
pvpanic: create pvpanic by default for machine 1.5
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: f840042f0e1205041f8feaf0d39ca639884f3a00.1366945969.git.hutao@cn.fujitsu.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d445bdf4ca..d094041462 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -45,6 +45,8 @@ /* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 +static bool has_pvpanic = true; + /* PC hardware initialisation */ static void pc_q35_init(QEMUMachineInitArgs *args) { @@ -193,11 +195,16 @@ static void pc_q35_init(QEMUMachineInitArgs *args) if (pci_enabled) { pc_pci_device_init(host_bus); } + + if (has_pvpanic) { + pvpanic_init(isa_bus); + } } static void pc_q35_init_1_4(QEMUMachineInitArgs *args) { pc_sysfw_flash_vs_rom_bug_compatible = true; + has_pvpanic = false; pc_q35_init(args); } |