tests/acpi: allow override blkdev

microvm needs virtio-blk instead of ide.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Message-id: 20200915120909.20838-19-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-09-15 14:09:06 +02:00
parent 34b36c3bee
commit 3cac3784f7

View File

@ -72,6 +72,7 @@ typedef struct {
const char *variant; const char *variant;
const char *uefi_fl1; const char *uefi_fl1;
const char *uefi_fl2; const char *uefi_fl2;
const char *blkdev;
const char *cd; const char *cd;
const uint64_t ram_start; const uint64_t ram_start;
const uint64_t scan_len; const uint64_t scan_len;
@ -666,9 +667,10 @@ static void test_acpi_one(const char *params, test_data *data)
args = g_strdup_printf("-machine %s,kernel-irqchip=off %s -accel tcg " args = g_strdup_printf("-machine %s,kernel-irqchip=off %s -accel tcg "
"-net none -display none %s " "-net none -display none %s "
"-drive id=hd0,if=none,file=%s,format=raw " "-drive id=hd0,if=none,file=%s,format=raw "
"-device ide-hd,drive=hd0 ", "-device %s,drive=hd0 ",
data->machine, data->tcg_only ? "" : "-accel kvm", data->machine, data->tcg_only ? "" : "-accel kvm",
params ? params : "", disk); params ? params : "", disk,
data->blkdev ?: "ide-hd");
} }
data->qts = qtest_init(args); data->qts = qtest_init(args);