These changes are the raw update to qemu-2.6.

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

diff --git a/qemu/tests/fw_cfg-test.c b/qemu/tests/fw_cfg-test.c
index 9be78e9..b4392c2 100644 (file)
--- a/qemu/tests/fw_cfg-test.c
+++ b/qemu/tests/fw_cfg-test.c
@@ -10,12 +10,11 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include <string.h>
+#include "qemu/osdep.h"
 #include <glib.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 +36,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)