target/i386: move linuxboot_dma_enabled to X86MachineState
This removes a parameter from x86_load_linux, and will avoid code duplication between the linux and multiboot cases once multiboot starts to support DMA. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0b09d44164
commit
f014c97459
|
@ -331,7 +331,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
|
||||||
rom_set_fw(fw_cfg);
|
rom_set_fw(fw_cfg);
|
||||||
|
|
||||||
if (machine->kernel_filename != NULL) {
|
if (machine->kernel_filename != NULL) {
|
||||||
x86_load_linux(x86ms, fw_cfg, 0, true, true);
|
x86_load_linux(x86ms, fw_cfg, 0, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mms->option_roms) {
|
if (mms->option_roms) {
|
||||||
|
@ -667,6 +667,7 @@ static void microvm_machine_initfn(Object *obj)
|
||||||
|
|
||||||
static void microvm_class_init(ObjectClass *oc, void *data)
|
static void microvm_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
|
X86MachineClass *x86mc = X86_MACHINE_CLASS(oc);
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc);
|
||||||
|
|
||||||
|
@ -697,6 +698,8 @@ static void microvm_class_init(ObjectClass *oc, void *data)
|
||||||
hc->unplug_request = microvm_device_unplug_request_cb;
|
hc->unplug_request = microvm_device_unplug_request_cb;
|
||||||
hc->unplug = microvm_device_unplug_cb;
|
hc->unplug = microvm_device_unplug_cb;
|
||||||
|
|
||||||
|
x86mc->fwcfg_dma_enabled = true;
|
||||||
|
|
||||||
object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto",
|
object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto",
|
||||||
microvm_machine_get_pic,
|
microvm_machine_get_pic,
|
||||||
microvm_machine_set_pic,
|
microvm_machine_set_pic,
|
||||||
|
|
|
@ -775,7 +775,7 @@ void xen_load_linux(PCMachineState *pcms)
|
||||||
rom_set_fw(fw_cfg);
|
rom_set_fw(fw_cfg);
|
||||||
|
|
||||||
x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size,
|
x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size,
|
||||||
pcmc->pvh_enabled, pcmc->linuxboot_dma_enabled);
|
pcmc->pvh_enabled);
|
||||||
for (i = 0; i < nb_option_roms; i++) {
|
for (i = 0; i < nb_option_roms; i++) {
|
||||||
assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
|
assert(!strcmp(option_rom[i].name, "linuxboot.bin") ||
|
||||||
!strcmp(option_rom[i].name, "linuxboot_dma.bin") ||
|
!strcmp(option_rom[i].name, "linuxboot_dma.bin") ||
|
||||||
|
@ -927,7 +927,7 @@ void pc_memory_init(PCMachineState *pcms,
|
||||||
|
|
||||||
if (linux_boot) {
|
if (linux_boot) {
|
||||||
x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size,
|
x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size,
|
||||||
pcmc->pvh_enabled, pcmc->linuxboot_dma_enabled);
|
pcmc->pvh_enabled);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < nb_option_roms; i++) {
|
for (i = 0; i < nb_option_roms; i++) {
|
||||||
|
@ -1664,7 +1664,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
||||||
/* BIOS ACPI tables: 128K. Other BIOS datastructures: less than 4K reported
|
/* BIOS ACPI tables: 128K. Other BIOS datastructures: less than 4K reported
|
||||||
* to be used at the moment, 32K should be enough for a while. */
|
* to be used at the moment, 32K should be enough for a while. */
|
||||||
pcmc->acpi_data_size = 0x20000 + 0x8000;
|
pcmc->acpi_data_size = 0x20000 + 0x8000;
|
||||||
pcmc->linuxboot_dma_enabled = true;
|
|
||||||
pcmc->pvh_enabled = true;
|
pcmc->pvh_enabled = true;
|
||||||
pcmc->kvmclock_create_always = true;
|
pcmc->kvmclock_create_always = true;
|
||||||
assert(!mc->get_hotplug_handler);
|
assert(!mc->get_hotplug_handler);
|
||||||
|
|
|
@ -620,11 +620,12 @@ DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,
|
||||||
|
|
||||||
static void pc_i440fx_2_6_machine_options(MachineClass *m)
|
static void pc_i440fx_2_6_machine_options(MachineClass *m)
|
||||||
{
|
{
|
||||||
|
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
|
||||||
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||||||
|
|
||||||
pc_i440fx_2_7_machine_options(m);
|
pc_i440fx_2_7_machine_options(m);
|
||||||
pcmc->legacy_cpu_hotplug = true;
|
pcmc->legacy_cpu_hotplug = true;
|
||||||
pcmc->linuxboot_dma_enabled = false;
|
x86mc->fwcfg_dma_enabled = false;
|
||||||
compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len);
|
compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len);
|
||||||
compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len);
|
compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -573,11 +573,12 @@ DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
|
||||||
|
|
||||||
static void pc_q35_2_6_machine_options(MachineClass *m)
|
static void pc_q35_2_6_machine_options(MachineClass *m)
|
||||||
{
|
{
|
||||||
|
X86MachineClass *x86mc = X86_MACHINE_CLASS(m);
|
||||||
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
||||||
|
|
||||||
pc_q35_2_7_machine_options(m);
|
pc_q35_2_7_machine_options(m);
|
||||||
pcmc->legacy_cpu_hotplug = true;
|
pcmc->legacy_cpu_hotplug = true;
|
||||||
pcmc->linuxboot_dma_enabled = false;
|
x86mc->fwcfg_dma_enabled = false;
|
||||||
compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len);
|
compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len);
|
||||||
compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len);
|
compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len);
|
||||||
}
|
}
|
||||||
|
|
|
@ -764,9 +764,9 @@ static bool load_elfboot(const char *kernel_filename,
|
||||||
void x86_load_linux(X86MachineState *x86ms,
|
void x86_load_linux(X86MachineState *x86ms,
|
||||||
FWCfgState *fw_cfg,
|
FWCfgState *fw_cfg,
|
||||||
int acpi_data_size,
|
int acpi_data_size,
|
||||||
bool pvh_enabled,
|
bool pvh_enabled)
|
||||||
bool linuxboot_dma_enabled)
|
|
||||||
{
|
{
|
||||||
|
bool linuxboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled;
|
||||||
uint16_t protocol;
|
uint16_t protocol;
|
||||||
int setup_size, kernel_size, cmdline_size;
|
int setup_size, kernel_size, cmdline_size;
|
||||||
int dtb_size, setup_data_offset;
|
int dtb_size, setup_data_offset;
|
||||||
|
@ -1332,6 +1332,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data)
|
||||||
mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
|
mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
|
||||||
x86mc->compat_apic_id_mode = false;
|
x86mc->compat_apic_id_mode = false;
|
||||||
x86mc->save_tsc_khz = true;
|
x86mc->save_tsc_khz = true;
|
||||||
|
x86mc->fwcfg_dma_enabled = true;
|
||||||
nc->nmi_monitor_handler = x86_nmi;
|
nc->nmi_monitor_handler = x86_nmi;
|
||||||
|
|
||||||
object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto",
|
object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto",
|
||||||
|
|
|
@ -116,9 +116,6 @@ struct PCMachineClass {
|
||||||
/* generate legacy CPU hotplug AML */
|
/* generate legacy CPU hotplug AML */
|
||||||
bool legacy_cpu_hotplug;
|
bool legacy_cpu_hotplug;
|
||||||
|
|
||||||
/* use DMA capable linuxboot option rom */
|
|
||||||
bool linuxboot_dma_enabled;
|
|
||||||
|
|
||||||
/* use PVH to load kernels that support this feature */
|
/* use PVH to load kernels that support this feature */
|
||||||
bool pvh_enabled;
|
bool pvh_enabled;
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,8 @@ struct X86MachineClass {
|
||||||
bool save_tsc_khz;
|
bool save_tsc_khz;
|
||||||
/* Enables contiguous-apic-ID mode */
|
/* Enables contiguous-apic-ID mode */
|
||||||
bool compat_apic_id_mode;
|
bool compat_apic_id_mode;
|
||||||
|
/* use DMA capable linuxboot option rom */
|
||||||
|
bool fwcfg_dma_enabled;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct X86MachineState {
|
struct X86MachineState {
|
||||||
|
@ -120,8 +122,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware,
|
||||||
void x86_load_linux(X86MachineState *x86ms,
|
void x86_load_linux(X86MachineState *x86ms,
|
||||||
FWCfgState *fw_cfg,
|
FWCfgState *fw_cfg,
|
||||||
int acpi_data_size,
|
int acpi_data_size,
|
||||||
bool pvh_enabled,
|
bool pvh_enabled);
|
||||||
bool linuxboot_dma_enabled);
|
|
||||||
|
|
||||||
bool x86_machine_is_smm_enabled(const X86MachineState *x86ms);
|
bool x86_machine_is_smm_enabled(const X86MachineState *x86ms);
|
||||||
bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms);
|
bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms);
|
||||||
|
|
Loading…
Reference in New Issue