Commit 6b9e03a4 authored by John Snow's avatar John Snow Committed by Stefan Hajnoczi
Browse files

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: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-id: 1412187569-23452-6-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent d8f94e1b

tests/bios-tables-test.c

+4 −6
Original line number Diff line number Diff line
@@ -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 */