[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/21] tests/acpi: allow override blkdev
From: |
Gerd Hoffmann |
Subject: |
[PULL 18/21] tests/acpi: allow override blkdev |
Date: |
Thu, 17 Sep 2020 15:53:20 +0200 |
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
---
tests/qtest/bios-tables-test.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 504b810af583..1779af1cc889 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -72,6 +72,7 @@ typedef struct {
const char *variant;
const char *uefi_fl1;
const char *uefi_fl2;
+ const char *blkdev;
const char *cd;
const uint64_t ram_start;
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 "
"-net none -display none %s "
"-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",
- params ? params : "", disk);
+ params ? params : "", disk,
+ data->blkdev ?: "ide-hd");
}
data->qts = qtest_init(args);
--
2.27.0
- [PULL 21/21] microvm: enable ramfb, (continued)
- [PULL 21/21] microvm: enable ramfb, Gerd Hoffmann, 2020/09/17
- [PULL 03/21] seabios: add bios-microvm.bin binary, Gerd Hoffmann, 2020/09/17
- [PULL 11/21] microvm/acpi: use seabios with acpi=on, Gerd Hoffmann, 2020/09/17
- [PULL 16/21] microvm: wire up hotplug, Gerd Hoffmann, 2020/09/17
- [PULL 20/21] tests/acpi: update expected data files for microvm, Gerd Hoffmann, 2020/09/17
- [PULL 06/21] acpi: move acpi_dsdt_add_power_button() to ged, Gerd Hoffmann, 2020/09/17
- [PULL 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86, Gerd Hoffmann, 2020/09/17
- [PULL 14/21] x86: move acpi_dev from pc/microvm, Gerd Hoffmann, 2020/09/17
- [PULL 08/21] microvm/acpi: add minimal acpi support, Gerd Hoffmann, 2020/09/17
- [PULL 15/21] x86: move cpu hotplug from pc to x86, Gerd Hoffmann, 2020/09/17
- [PULL 18/21] tests/acpi: allow override blkdev,
Gerd Hoffmann <=
- Re: [PULL 00/21] Microvm 20200917 patches, Peter Maydell, 2020/09/18