diff options
| author | John Snow | 2014-10-01 20:19:28 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2014-10-03 11:30:33 +0200 |
| commit | 6b9e03a4e7598765a6cebb7618f2eeb22e928f6e (patch) | |
| tree | aa7a77dbb2d490d9af8a81a2b6f8cd3e86e074f1 | |
| parent | ide: Update ide_drive_get to be HBA agnostic (diff) | |
| download | qemu-6b9e03a4e7598765a6cebb7618f2eeb22e928f6e.tar.gz qemu-6b9e03a4e7598765a6cebb7618f2eeb22e928f6e.tar.xz qemu-6b9e03a4e7598765a6cebb7618f2eeb22e928f6e.zip | |
qtest/bios-tables: Correct Q35 command line
If the Q35 board types are to begin recognizing
and decoding syntactic sugar for drive/device
declarations, then workarounds found within
the qtests suite need to be adjusted to prevent
any test failures after the fix.
bios-tables-test improperly uses this cli:
-drive file=etc,id=hd -device ide-hd,drive=hd
Which will create a drive and device due to
the lack of specifying if=none. Then, it will
attempt to create a second device and fail.
This patch corrects this test to always use
the full, non-sugared -device/-drive syntax
for both PC and Q35.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1412187569-23452-6-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | tests/bios-tables-test.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 602932b888..9e4d20592b 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -714,14 +714,12 @@ static void test_acpi_one(const char *params, test_data *data) uint8_t signature_high; uint16_t signature; int i; - const char *device = ""; - if (!g_strcmp0(data->machine, MACHINE_Q35)) { - device = ",id=hd -device ide-hd,drive=hd"; - } + args = g_strdup_printf("-net none -display none %s " + "-drive id=hd0,if=none,file=%s " + "-device ide-hd,drive=hd0 ", + params ? params : "", disk); - args = g_strdup_printf("-net none -display none %s -drive file=%s%s,", - params ? params : "", disk, device); qtest_start(args); /* Wait at most 1 minute */ |