hw/i386/x86: Remove @pvh_enabled argument in x86_load_linux()
x86_load_linux()'s @pvh_enabled is now always %true: remove it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20260307152635.83893-4-philmd@linaro.org>
Philippe Mathieu-Daudé committed
Apr 29, 2025 at 16:50 UTC
b31f41d724cddfc9639bb574fa710082f9bc707e
6 files changed
+7
-9
hw/i386/microvm.c
+1
-1
@@ -330,7 +330,7 @@ static void microvm_memory_init(MicrovmMachineState *mms)
330
rom_set_fw(fw_cfg);
331
332
if (machine->kernel_filename != NULL) {
333
- mmc->x86_load_linux(x86ms, fw_cfg, 0, true);
333
+ mmc->x86_load_linux(x86ms, fw_cfg, 0);
334
}
335
336
if (mms->option_roms) {
hw/i386/nitro_enclave.c
+1
-1
@@ -199,7 +199,7 @@ static void x86_load_eif(X86MachineState *x86ms, FWCfgState *fw_cfg,
199
machine->kernel_cmdline = eif_cmdline;
200
}
201
202
- x86_load_linux(x86ms, fw_cfg, 0, true);
202
+ x86_load_linux(x86ms, fw_cfg, 0);
203
204
unlink(machine->kernel_filename);
205
unlink(machine->initrd_filename);
hw/i386/pc.c
+2
-2
@@ -597,7 +597,7 @@ void xen_load_linux(PCMachineState *pcms)
597
fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, x86ms->boot_cpus);
598
rom_set_fw(fw_cfg);
599
600
- x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true);
600
+ x86_load_linux(x86ms, fw_cfg, PC_FW_DATA);
601
for (i = 0; i < nb_option_roms; i++) {
602
assert(!strcmp(option_rom[i].name, "linuxboot_dma.bin") ||
603
!strcmp(option_rom[i].name, "pvh.bin") ||
@@ -931,7 +931,7 @@ void pc_memory_init(PCMachineState *pcms,
931
}
932
933
if (linux_boot) {
934
- x86_load_linux(x86ms, fw_cfg, PC_FW_DATA, true);
934
+ x86_load_linux(x86ms, fw_cfg, PC_FW_DATA);
935
}
936
937
for (i = 0; i < nb_option_roms; i++) {
hw/i386/x86-common.c
+1
-2
@@ -642,8 +642,7 @@ static bool load_elfboot(const char *kernel_filename,
642
643
void x86_load_linux(X86MachineState *x86ms,
644
FWCfgState *fw_cfg,
645
- int acpi_data_size,
646
- bool pvh_enabled)
645
+ int acpi_data_size)
646
{
647
uint16_t protocol;
648
int setup_size, kernel_size, cmdline_size;
include/hw/i386/microvm.h
+1
-1
@@ -79,7 +79,7 @@ struct MicrovmMachineClass {
79
HotplugHandler *(*orig_hotplug_handler)(MachineState *machine,
80
DeviceState *dev);
81
void (*x86_load_linux)(X86MachineState *x86ms, FWCfgState *fw_cfg,
82
- int acpi_data_size, bool pvh_enabled);
82
+ int acpi_data_size);
83
};
84
85
struct MicrovmMachineState {
include/hw/i386/x86.h
+1
-2
@@ -129,8 +129,7 @@ void x86_bios_rom_reload(X86MachineState *x86ms);
129
130
void x86_load_linux(X86MachineState *x86ms,
131
FWCfgState *fw_cfg,
132
- int acpi_data_size,
133
- bool pvh_enabled);
132
+ int acpi_data_size);
133
134
bool x86_machine_is_smm_enabled(const X86MachineState *x86ms);
135
bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms);