Commit 4ed34791 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/block' into staging 

# By Andreas Färber
# Via Stefan Hajnoczi
* stefanha/block:
  qtest: Use -display none by default
parents 1c46e594 2ad645d2

tests/boot-order-test.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void test_a_boot_order(const char *machine, 
    char *args;

    uint64_t actual;



    args = g_strdup_printf("-nodefaults -display none%s%s %s",

    args = g_strdup_printf("-nodefaults%s%s %s",

                           machine ? " -M " : "",

                           machine ?: "",

                           test_args);

tests/endianness-test.c

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static void test_endianness(gconstpointer data) 
    const TestCase *test = data;

    char *args;



    args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev",

    args = g_strdup_printf("-M %s%s%s -device pc-testdev",

                           test->machine,

                           test->superio ? " -device " : "",

                           test->superio ?: "");
@@ -196,7 +196,7 @@ static void test_endianness_split(gconstpointer data) 
    const TestCase *test = data;

    char *args;



    args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev",

    args = g_strdup_printf("-M %s%s%s -device pc-testdev",

                           test->machine,

                           test->superio ? " -device " : "",

                           test->superio ?: "");
@@ -243,7 +243,7 @@ static void test_endianness_combine(gconstpointer data) 
    const TestCase *test = data;

    char *args;



    args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev",

    args = g_strdup_printf("-M %s%s%s -device pc-testdev",

                           test->machine,

                           test->superio ? " -device " : "",

                           test->superio ?: "");

tests/fw_cfg-test.c

+1 −2
Original line number Diff line number Diff line
@@ -126,8 +126,7 @@ int main(int argc, char **argv) 
    g_test_add_func("/fw_cfg/numa", test_fw_cfg_numa);

    g_test_add_func("/fw_cfg/boot_menu", test_fw_cfg_boot_menu);



    cmdline = g_strdup_printf("-display none "

                              "-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");

    cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");

    s = qtest_start(cmdline);

    g_free(cmdline);

tests/hd-geo-test.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int setup_common(char *argv[], int argv_sz) 
{

    memset(cur_ide, 0, sizeof(cur_ide));

    return append_arg(0, argv, argv_sz,

                      g_strdup("-nodefaults -display none"));

                      g_strdup("-nodefaults"));

}



static void setup_mbr(int img_idx, MBRcontents mbr)

tests/i440fx-test.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ int main(int argc, char **argv) 


    data.num_cpus = 1;



    cmdline = g_strdup_printf("-display none -smp %d", data.num_cpus);

    cmdline = g_strdup_printf("-smp %d", data.num_cpus);

    s = qtest_start(cmdline);

    g_free(cmdline);