SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/qtest/bios-tables-test: Replace -no-hpet with hpet=off machine parameter

Browse Source 
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.

Message-Id: <20230109081205.116369-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-01-09 09:08:23 +01:00
parent beecc4b78d
commit 9a2112f9ae
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/qtest/bios-tables-test.c
View File

@ -78,6 +78,7 @@
typedef struct { typedef struct {
bool tcg_only; bool tcg_only;
const char *machine; const char *machine;
const char *machine_param;
const char *variant; const char *variant;
const char *uefi_fl1; const char *uefi_fl1;
const char *uefi_fl2; 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. * when arm/virt boad starts to support it.
*/ */
if (data->cd) { if (data->cd) {
args = g_strdup_printf("-machine %s %s -accel tcg " args = g_strdup_printf("-machine %s%s %s -accel tcg "
"-nodefaults -nographic " "-nodefaults -nographic "
"-drive if=pflash,format=raw,file=%s,readonly=on " "-drive if=pflash,format=raw,file=%s,readonly=on "
"-drive if=pflash,format=raw,file=%s,snapshot=on -cdrom %s %s", "-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 : ""); data->uefi_fl1, data->uefi_fl2, data->cd, params ? params : "");
} else { } else {
args = g_strdup_printf("-machine %s %s -accel tcg " args = g_strdup_printf("-machine %s%s %s -accel tcg "
"-nodefaults -nographic " "-nodefaults -nographic "
"-drive if=pflash,format=raw,file=%s,readonly=on " "-drive if=pflash,format=raw,file=%s,readonly=on "
"-drive if=pflash,format=raw,file=%s,snapshot=on %s", "-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 : ""); data->uefi_fl1, data->uefi_fl2, params ? params : "");
} }
} else { } else {
args = g_strdup_printf("-machine %s %s -accel tcg " args = g_strdup_printf("-machine %s%s %s -accel tcg "
"-net none %s " "-net none %s "
"-drive id=hd0,if=none,file=%s,format=raw " "-drive id=hd0,if=none,file=%s,format=raw "
"-device %s,drive=hd0 ", "-device %s,drive=hd0 ",
data->machine, data->tcg_only ? "" : "-accel kvm", data->machine, data->machine_param ?: "",
data->tcg_only ? "" : "-accel kvm",
params ? params : "", disk, params ? params : "", disk,
data->blkdev ?: "ide-hd"); data->blkdev ?: "ide-hd");
} }
@ -1141,8 +1145,9 @@ static void test_acpi_piix4_tcg_nohpet(void)
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.machine = MACHINE_PC; data.machine = MACHINE_PC;
data.machine_param = ",hpet=off";
data.variant = ".nohpet"; data.variant = ".nohpet";
test_acpi_one("-no-hpet", &data); test_acpi_one(NULL, &data);
free_test_data(&data); free_test_data(&data);
} }
@ -1210,8 +1215,9 @@ static void test_acpi_q35_tcg_nohpet(void)
memset(&data, 0, sizeof(data)); memset(&data, 0, sizeof(data));
data.machine = MACHINE_Q35; data.machine = MACHINE_Q35;
data.machine_param = ",hpet=off";
data.variant = ".nohpet"; data.variant = ".nohpet";
test_acpi_one("-no-hpet", &data); test_acpi_one(NULL, &data);
free_test_data(&data); free_test_data(&data);
} }