david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtest/bios-tables: Correct Q35 command line

Browse Source 
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>
This commit is contained in:
John Snow 2014-10-01 14:19:28 -04:00 committed by Stefan Hajnoczi
parent d8f94e1bb2
commit 6b9e03a4e7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/bios-tables-test.c
View File

@ -714,14 +714,12 @@ static void test_acpi_one(const char *params, test_data *data)
uint8_t signature_high; uint8_t signature_high;
uint16_t signature; uint16_t signature;
int i; int i;
const char *device = "";
if (!g_strcmp0(data->machine, MACHINE_Q35)) { args = g_strdup_printf("-net none -display none %s "
device = ",id=hd -device ide-hd,drive=hd"; "-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); qtest_start(args);
/* Wait at most 1 minute */ /* Wait at most 1 minute */