[kvm-unit-tests PATCH 2/6] lib: Expose a subset of VMX's assertion macros

[Sean Christopherson <seanjc@xxxxxxxxxx>]

Expose VMX's TEST_EXPECT_EQ() macros so that they can be used outside of
x86's nested VMX tests, e.g. in x86's nested SVM tests.  Leave the "full"
assert macros in vmx.h, as gracfeully bailing from an arbitrary point in a
test requires additional infrastructure, e.g. to do setjmp() and longjmp().

Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
 lib/util.h | 31 +++++++++++++++++++++++++++++++
 x86/vmx.h  | 32 +++-----------------------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/lib/util.h b/lib/util.h
index 4c4b4413..f86af6d3 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -20,4 +20,35 @@
  */
 extern int parse_keyval(char *s, long *val);
 
+#define __TEST_EQ(a, b, a_str, b_str, assertion, do_abort, fmt, args...)		\
+do {											\
+	typeof(a) _a = a;								\
+	typeof(b) _b = b;								\
+	if (_a != _b) {									\
+		char _bin_a[BINSTR_SZ];							\
+		char _bin_b[BINSTR_SZ];							\
+		binstr(_a, _bin_a);							\
+		binstr(_b, _bin_b);							\
+		report_fail("%s:%d: %s failed: (%s) == (%s)\n"				\
+			    "\tLHS: %#018lx - %s - %lu\n"				\
+			    "\tRHS: %#018lx - %s - %lu%s" fmt,				\
+			    __FILE__, __LINE__,						\
+			    assertion ? "Assertion" : "Expectation", a_str, b_str,	\
+			    (unsigned long) _a, _bin_a, (unsigned long) _a,		\
+			    (unsigned long) _b, _bin_b, (unsigned long) _b,		\
+			    fmt[0] == '\0' ? "" : "\n", ## args);			\
+		dump_stack();								\
+		if (assertion)								\
+			do_abort();							\
+	}										\
+	report_passed();								\
+} while (0)
+
+/* FIXME: Extend VMX's assert/abort framework to SVM and other environs. */
+static inline void dummy_abort(void) {}
+
+#define TEST_EXPECT_EQ(a, b) __TEST_EQ(a, b, #a, #b, 0, dummy_abort, "")
+#define TEST_EXPECT_EQ_MSG(a, b, fmt, args...) \
+	__TEST_EQ(a, b, #a, #b, 0, dummy_abort fmt, ## args)
+
 #endif
diff --git a/x86/vmx.h b/x86/vmx.h
index 604c78f6..bc61a586 100644
--- a/x86/vmx.h
+++ b/x86/vmx.h
@@ -4,6 +4,7 @@
 #include "libcflat.h"
 #include "processor.h"
 #include "bitops.h"
+#include "util.h"
 #include "asm/page.h"
 #include "asm/io.h"
 
@@ -36,36 +37,9 @@ do {								\
 	report_passed();					\
 } while (0)
 
-#define __TEST_EQ(a, b, a_str, b_str, assertion, fmt, args...)	\
-do {								\
-	typeof(a) _a = a;					\
-	typeof(b) _b = b;					\
-	if (_a != _b) {						\
-		char _bin_a[BINSTR_SZ];				\
-		char _bin_b[BINSTR_SZ];				\
-		binstr(_a, _bin_a);				\
-		binstr(_b, _bin_b);				\
-		report_fail("%s:%d: %s failed: (%s) == (%s)\n"	\
-			    "\tLHS: %#018lx - %s - %lu\n"	\
-			    "\tRHS: %#018lx - %s - %lu%s" fmt,	\
-			    __FILE__, __LINE__,			\
-			    assertion ? "Assertion" : "Expectation", a_str, b_str,	\
-			    (unsigned long) _a, _bin_a, (unsigned long) _a,		\
-			    (unsigned long) _b, _bin_b, (unsigned long) _b,		\
-			    fmt[0] == '\0' ? "" : "\n", ## args);			\
-		dump_stack();					\
-		if (assertion)					\
-			__abort_test();				\
-	}							\
-	report_passed();					\
-} while (0)
-
-#define TEST_ASSERT_EQ(a, b) __TEST_EQ(a, b, #a, #b, 1, "")
+#define TEST_ASSERT_EQ(a, b) __TEST_EQ(a, b, #a, #b, 1, __abort_test, "")
 #define TEST_ASSERT_EQ_MSG(a, b, fmt, args...) \
-	__TEST_EQ(a, b, #a, #b, 1, fmt, ## args)
-#define TEST_EXPECT_EQ(a, b) __TEST_EQ(a, b, #a, #b, 0, "")
-#define TEST_EXPECT_EQ_MSG(a, b, fmt, args...) \
-	__TEST_EQ(a, b, #a, #b, 0, fmt, ## args)
+	__TEST_EQ(a, b, #a, #b, 1, __abort_test, fmt, ## args)
 
 struct vmcs_hdr {
 	u32 revision_id:31;
-- 
2.41.0.162.gfafddb0af9-goog