tests/qtest/bios-tables-test: Replace -no-hpet with hpet=off machine parameter
PATCH 1/1 tests/qtest/bios-tables-test: Replace -no-hpet with hpet=off machine parameter
We are going to deprecate (and finally remove later) the -no-hpet command line option. Prepare the bios-tables-test by using the replacement hpet=off machine parameter instead.
Signed-off-by Thomas Huth <[email protected]>
--- tests/qtest/bios-tables-test.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
tests/qtest/bios-tables-test.c +14 -8
@@ -78,6 +78,7 @@ typedef struct { bool tcg_only; const char *machine; + const char *machine_param; const char *variant; const char *uefi_fl1; const char *uefi_fl2;
@@ -776,26 +777,29 @@ static char *test_acpi_create_args(test_data *data, const char *params,* when arm/virt boad starts to support it. */ if (data->cd) { - args =g_strdup_printf ("-machine %s %s -accel tcg " + args =g_strdup_printf ("-machine %s%s %s -accel tcg " "-nodefaults -nographic " "-drive if=pflash,format=raw,file=%s,readonly=on " "-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s" , - data->machine, data->tcg_only ?"" :"-accel kvm" , + data->machine, data->machine_param ?:"" , + data->tcg_only ?"" :"-accel kvm" , data->uefi_fl1, data->uefi_fl2, data->cd, params ? params :"" ); }else { - args =g_strdup_printf ("-machine %s %s -accel tcg " + args =g_strdup_printf ("-machine %s%s %s -accel tcg " "-nodefaults -nographic " "-drive if=pflash,format=raw,file=%s,readonly=on " "-drive if=pflash,format=raw,file=%s,snapshot=on %s" , - data->machine, data->tcg_only ?"" :"-accel kvm" , + data->machine, data->machine_param ?:"" , + data->tcg_only ?"" :"-accel kvm" , data->uefi_fl1, data->uefi_fl2, params ? params :"" ); } }else { - args =g_strdup_printf ("-machine %s %s -accel tcg " + args =g_strdup_printf ("-machine %s%s %s -accel tcg " "-net none %s " "-drive id=hd0,if=none,file=%s,format=raw " "-device %s,drive=hd0 " , - data->machine, data->tcg_only ?"" :"-accel kvm" , + data->machine, data->machine_param ?:"" , + data->tcg_only ?"" :"-accel kvm" , params ? params :"" , disk, data->blkdev ?:"ide-hd" ); }
@@ -1141,8 +1145,9 @@ static void test_acpi_piix4_tcg_nohpet(void)memset (&data,0 ,sizeof (data)); data.machine =MACHINE_PC ; + data.machine_param =",hpet=off" ; data.variant =".nohpet" ; -test_acpi_one ("-no-hpet" , &data); +test_acpi_one (NULL , &data);free_test_data (&data); }
@@ -1210,8 +1215,9 @@ static void test_acpi_q35_tcg_nohpet(void)memset (&data,0 ,sizeof (data)); data.machine =MACHINE_Q35 ; + data.machine_param =",hpet=off" ; data.variant =".nohpet" ; -test_acpi_one ("-no-hpet" , &data); +test_acpi_one (NULL , &data);free_test_data (&data); }
Signature · 1 line
2.31.1
Quoted 8 lines · Thomas Huth
We are going to deprecate (and finally remove later) the -no-hpet command line option. Prepare the bios-tables-test by using the replacement hpet=off machine parameter instead.
Signed-off-by Thomas Huth <[email protected]>--- tests/qtest/bios-tables-test.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
Reviewed-by Daniel P. Berrangé <[email protected]>
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|