X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=tests%2Fboot-order-test.c;h=fc1e7941f79f415d25f48f657cc6117a05bd795f;hb=b4053c64833762f1249b2d704d2da30b5b10c8ff;hp=4b233d0b249caec2bcf7cfe6010db184a2189689;hpb=90c66f587c8d020a642d3c9376f9102c16f2234e;p=mirror_qemu.git

diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index 4b233d0b24..fc1e7941f7 100644
--- a/tests/boot-order-test.c
+++ b/tests/boot-order-test.c
@@ -10,14 +10,11 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <string.h>
-#include <glib.h>
+#include "qemu/osdep.h"
 #include "libqos/fw_cfg.h"
 #include "libqtest.h"
 
-#define NO_QEMU_PROTOS
-#include "hw/nvram/fw_cfg.h"
-#undef NO_QEMU_PROTOS
+#include "hw/nvram/fw_cfg_keys.h"
 
 typedef struct {
     const char *args;
@@ -34,19 +31,19 @@ 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);
     qtest_start(args);
     actual = read_boot_order();
     g_assert_cmphex(actual, ==, expected_boot);
-    qmp("{ 'execute': 'system_reset' }");
+    qmp_discard_response("{ 'execute': 'system_reset' }");
     /*
      * system_reset only requests reset.  We get a RESET event after
      * the actual reset completes.  Need to wait for that.
      */
-    qmp("");                    /* HACK: wait for event */
+    qmp_discard_response("");   /* HACK: wait for event */
     actual = read_boot_order();
     g_assert_cmphex(actual, ==, expected_reboot);
     qtest_quit(global_qtest);