qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Thomas Huth <thuth@redhat.com>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Sergio Lopez <slp@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Shannon Zhao <shannon.zhaosl@gmail.com>,
	qemu-arm@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Igor Mammedov <imammedo@redhat.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [PATCH v4 19/21] tests/acpi: allow override blkdev
Date: Thu,  2 Jul 2020 22:48:57 +0200	[thread overview]
Message-ID: <20200702204859.9876-20-kraxel@redhat.com> (raw)
In-Reply-To: <20200702204859.9876-1-kraxel@redhat.com>

microvm needs virtio-blk instead of ide.

Signed-off-by: Gerd Hoffmann <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 c315156858f4..24b715dce780 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;
@@ -635,9 +636,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.18.4



  parent reply	other threads:[~2020-07-02 20:57 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-02 20:48 [PATCH v4 00/21] microvm: add acpi support Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 01/21] microvm: name qboot binary qboot.rom Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 02/21] seabios: add microvm config, update build rules Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 03/21] seabios: add bios-microvm.bin binary Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 04/21] acpi: ged: add control regs Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 05/21] acpi: ged: add x86 device variant Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 06/21] acpi: move acpi_dsdt_add_power_button() to ged Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 07/21] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 08/21] microvm/acpi: add minimal acpi support Gerd Hoffmann
2020-07-03 13:09   ` Michael S. Tsirkin
2020-07-03 19:25     ` Gerd Hoffmann
2020-07-05 11:48       ` Michael S. Tsirkin
2020-07-06 14:11         ` Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 09/21] microvm/acpi: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 10/21] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 11/21] microvm/acpi: use seabios with acpi=on Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 12/21] microvm/acpi: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 13/21] x86: constify x86_machine_is_*_enabled Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 14/21] x86: move acpi_dev from pc/microvm Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 15/21] x86: move cpu plug from pc to x86 Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 16/21] microvm: wire up hotplug Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 17/21] tests/acpi: clear bios-tables-test-allowed-diff.h Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 18/21] tests/acpi: allow microvm test data updates Gerd Hoffmann
2020-07-02 20:48 ` Gerd Hoffmann [this message]
2020-07-02 20:48 ` [PATCH v4 20/21] tests/acpi: add microvm test Gerd Hoffmann
2020-07-02 20:48 ` [PATCH v4 21/21] tests/acpi: update expected data files for microvm Gerd Hoffmann
2020-07-02 21:13 ` [PATCH v4 00/21] microvm: add acpi support no-reply
2020-07-02 21:23 ` no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200702204859.9876-20-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=shannon.zhaosl@gmail.com \
    --cc=slp@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).