From: Laurent Vivier <lviv...@redhat.com>
This allows g_assert() to correctly report the line number of the error
in the test case.
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
Message-Id: <20220203141537.972317-3-lviv...@redhat.com>
Signed-off-by: Thomas Huth <th...@redhat.com>
---
tests/qtest/virtio-net-failover.c | 47 ++++++++++++++-----------------
1 file changed, 21 insertions(+), 26 deletions(-)
diff --git a/tests/qtest/virtio-net-failover.c
b/tests/qtest/virtio-net-failover.c
index 207c133012..070e53de12 100644
--- a/tests/qtest/virtio-net-failover.c
+++ b/tests/qtest/virtio-net-failover.c
@@ -224,32 +224,27 @@ static char *get_mac(QTestState *qts, const char *name)
return mac;
}
-static void check_one_card(QTestState *qts, bool present,
- const char *id, const char *mac)
-{
- QDict *device;
- QDict *bus;
- char *addr;
-
- bus = get_bus(qts, 0);
- device = find_device(bus, id);
- if (present) {
- char *path;
-
- g_assert_nonnull(device);
- qobject_unref(device);
-
- path = g_strdup_printf("/machine/peripheral/%s", id);
- addr = get_mac(qts, path);
- g_free(path);
- g_assert_cmpstr(mac, ==, addr);
- g_free(addr);
- } else {
- g_assert_null(device);
- }
-
- qobject_unref(bus);
-}
+#define check_one_card(qts, present, id, mac) \
+do { \
+ QDict *device; \
+ QDict *bus; \
+ char *addr; \
+ bus = get_bus(qts, 0); \
+ device = find_device(bus, id); \
+ if (present) { \
+ char *path; \
+ g_assert_nonnull(device); \
+ qobject_unref(device); \
+ path = g_strdup_printf("/machine/peripheral/%s", id); \
+ addr = get_mac(qts, path); \
+ g_free(path); \
+ g_assert_cmpstr(mac, ==, addr); \
+ g_free(addr); \
+ } else { \
+ g_assert_null(device); \
+ } \
+ qobject_unref(bus); \
+} while (0)
static void test_on(void)
{
--
2.27.0
