diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2022-02-03 15:15:32 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-02-21 10:15:55 +0100 |
| commit | 1a800870c5208e12e10fae638045121bb574d958 (patch) | |
| tree | e3eef06301410fe094147efb12f922d60a494234 /tests/qtest | |
| parent | fbd2913cce4cde4b8fc5a33da9782a7f638307d4 (diff) | |
| download | qemu-1a800870c5208e12e10fae638045121bb574d958.zip qemu-1a800870c5208e12e10fae638045121bb574d958.tar.gz qemu-1a800870c5208e12e10fae638045121bb574d958.tar.bz2 | |
tests/qtest: failover: use a macro for check_one_card()
This allows g_assert() to correctly report the line number of the error
in the test case.
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20220203141537.972317-3-lvivier@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/qtest')
| -rw-r--r-- | tests/qtest/virtio-net-failover.c | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c index 207c133..070e53d 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) { |