ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/i386/pc: enable PVH only for machine type >= 4.0 

In order to avoid migration issues, we enable PVH only for
machine type >= 4.0

Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefano Garzarella 2019-01-22 13:10:48 +01:00 committed by Paolo Bonzini
parent b1b876ca70
commit fda672b50e
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc.c
View File

@ -1220,7 +1220,8 @@ static void load_linux(PCMachineState *pcms,
* saving the PVH entry point used by the x86/HVM direct boot ABI. * saving the PVH entry point used by the x86/HVM direct boot ABI.
* If load_elfboot() is successful, populate the fw_cfg info. * If load_elfboot() is successful, populate the fw_cfg info.
*/ */
if (load_elfboot(kernel_filename, kernel_size, if (pcmc->pvh_enabled &&
load_elfboot(kernel_filename, kernel_size,
header, pvh_start_addr, fw_cfg)) { header, pvh_start_addr, fw_cfg)) {
fclose(f); fclose(f);
@ -2783,6 +2784,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
pcmc->acpi_data_size = 0x20000 + 0x8000; pcmc->acpi_data_size = 0x20000 + 0x8000;
pcmc->save_tsc_khz = true; pcmc->save_tsc_khz = true;
pcmc->linuxboot_dma_enabled = true; pcmc->linuxboot_dma_enabled = true;
pcmc->pvh_enabled = true;
assert(!mc->get_hotplug_handler); assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = pc_get_hotplug_handler; mc->get_hotplug_handler = pc_get_hotplug_handler;
mc->cpu_index_to_instance_props = pc_cpu_index_to_props; mc->cpu_index_to_instance_props = pc_cpu_index_to_props;

3
hw/i386/pc_piix.c
View File

@ -440,9 +440,12 @@ DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
static void pc_i440fx_3_1_machine_options(MachineClass *m) static void pc_i440fx_3_1_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_4_0_machine_options(m); pc_i440fx_4_0_machine_options(m);
m->is_default = 0; m->is_default = 0;
m->alias = NULL; m->alias = NULL;
pcmc->pvh_enabled = false;
compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len); compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
} }

3
hw/i386/pc_q35.c
View File

@ -376,9 +376,12 @@ DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
static void pc_q35_3_1_machine_options(MachineClass *m) static void pc_q35_3_1_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_4_0_machine_options(m); pc_q35_4_0_machine_options(m);
m->default_kernel_irqchip_split = false; m->default_kernel_irqchip_split = false;
m->alias = NULL; m->alias = NULL;
pcmc->pvh_enabled = false;
compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len); compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
} }

3
include/hw/i386/pc.h
View File

@ -133,6 +133,9 @@ typedef struct PCMachineClass {
/* use DMA capable linuxboot option rom */ /* use DMA capable linuxboot option rom */
bool linuxboot_dma_enabled; bool linuxboot_dma_enabled;
/* use PVH to load kernels that support this feature */
bool pvh_enabled;
} PCMachineClass; } PCMachineClass;
#define TYPE_PC_MACHINE "generic-pc-machine" #define TYPE_PC_MACHINE "generic-pc-machine"