Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-03-28' into staging

[qemu.git] / tests / fw_cfg-test.c

diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
index 9be78e9564bf23b5faa7556848194be33fb7f1cf..688342bed589a4f870f5bc68eab709c73ac293ab 100644 (file)
--- a/tests/fw_cfg-test.c
+++ b/tests/fw_cfg-test.c
@@ -10,12 +10,10 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <string.h>
-#include <glib.h>
+#include "qemu/osdep.h"
 
 #include "libqtest.h"
-#define NO_QEMU_PROTOS
-#include "hw/nvram/fw_cfg.h"
+#include "hw/nvram/fw_cfg_keys.h"
 #include "libqos/fw_cfg.h"
 
 static uint64_t ram_size = 128 << 20;
@@ -37,7 +35,9 @@ static void test_fw_cfg_signature(void)
 
 static void test_fw_cfg_id(void)
 {
-    g_assert_cmpint(qfw_cfg_get_u32(fw_cfg, FW_CFG_ID), ==, 1);
+    uint32_t id = qfw_cfg_get_u32(fw_cfg, FW_CFG_ID);
+    g_assert((id == 1) ||
+             (id == 3));
 }
 
 static void test_fw_cfg_uuid(void)