From: Thomas Huth <thuth@redhat.com>
To: Laurent Vivier <lvivier@redhat.com>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Jens Freimann <jfreimann@redhat.com>,
Juan Quintela <quintela@redhat.com>
Subject: Re: [PATCH v6 2/6] tests/qtest: add some tests for virtio-net failover
Date: Tue, 7 Dec 2021 09:29:41 +0100 [thread overview]
Message-ID: <6b81b382-535f-41a1-5d9b-b6f0d7bebd06@redhat.com> (raw)
In-Reply-To: <20211206222040.3872253-3-lvivier@redhat.com>
On 06/12/2021 23.20, Laurent Vivier wrote:
> Add test cases to test several error cases that must be
> generated by invalid failover configuration.
>
> Add a combination of coldplug and hotplug test cases to be
> sure the primary is correctly managed according the
> presence or not of the STANDBY feature.
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> tests/qtest/meson.build | 3 +
> tests/qtest/virtio-net-failover.c | 690 ++++++++++++++++++++++++++++++
> 2 files changed, 693 insertions(+)
> create mode 100644 tests/qtest/virtio-net-failover.c
>
> diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
> index c9d8458062ff..6d66bf522156 100644
> --- a/tests/qtest/meson.build
> +++ b/tests/qtest/meson.build
> @@ -22,6 +22,9 @@ qtests_generic = \
> (config_all_devices.has_key('CONFIG_VIRTIO_SCSI') ? ['fuzz-virtio-scsi-test'] : []) + \
> (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \
> (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) + \
> + (config_all_devices.has_key('CONFIG_VIRTIO_NET') and \
> + config_all_devices.has_key('CONFIG_Q35') and \
> + config_all_devices.has_key('CONFIG_VIRTIO_PCI') ? ['virtio-net-failover'] : []) + \
I think you should only add this to qtests_i386 for now, since you later add
a check to skip on non-x86 architectures.
> [
> 'cdrom-test',
> 'device-introspect-test',
> diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c
> new file mode 100644
> index 000000000000..f8f5fbb3c7fe
> --- /dev/null
> +++ b/tests/qtest/virtio-net-failover.c
> @@ -0,0 +1,690 @@
Please add a short header with at least a one-liner what this is all about
and at least a SPDX license information here.
> +#include "qemu/osdep.h"
> +#include "libqos/libqtest.h"
> +#include "libqos/pci.h"
> +#include "libqos/pci-pc.h"
> +#include "qapi/qmp/qdict.h"
> +#include "qapi/qmp/qlist.h"
> +#include "qapi/qmp/qjson.h"
> +#include "libqos/malloc-pc.h"
> +#include "libqos/virtio-pci.h"
> +#include "hw/pci/pci.h"
> +
> +#define ACPI_PCIHP_ADDR_ICH9 0x0cc0
> +#define PCI_EJ_BASE 0x0008
> +
> +#define BASE_MACHINE "-M q35 -nodefaults " \
> + "-device pcie-root-port,id=root0,addr=0x1,bus=pcie.0,chassis=1 " \
> + "-device pcie-root-port,id=root1,addr=0x2,bus=pcie.0,chassis=2 "
> +
> +#define MAC_PRIMARY0 "52:54:00:11:11:11"
> +#define MAC_STANDBY0 "52:54:00:22:22:22"
> +
> +static QGuestAllocator guest_malloc;
> +static QPCIBus *pcibus;
> +
> +static QTestState *machine_start(const char *args, int numbus)
> +{
> + QTestState *qts;
> + QPCIDevice *dev;
> + int i;
Nit: Use a more descriptive name instead of "i" - like "bus"?
> + qts = qtest_init(args);
> +
> + pc_alloc_init(&guest_malloc, qts, 0);
> + pcibus = qpci_new_pc(qts, &guest_malloc);
> + g_assert(qpci_secondary_buses_init(pcibus) == numbus);
> +
> + for (i = 0; i < numbus; i++) {
> + dev = qpci_device_find(pcibus, QPCI_DEVFN(i + 1, 0));
> + g_assert_nonnull(dev);
> +
> + qpci_device_enable(dev);
> + qpci_iomap(dev, 4, NULL);
> +
> + g_free(dev);
> + }
> +
> + return qts;
> +}
> +
> +static void machine_stop(QTestState *qts)
> +{
> + qpci_free_pc(pcibus);
> + alloc_destroy(&guest_malloc);
> + qtest_quit(qts);
> +}
> +
> +static void test_error_id(void)
> +{
> + QTestState *qts;
> + QDict *resp;
> + QDict *err;
> +
> + qts = machine_start(BASE_MACHINE
> + "-device virtio-net,bus=root0,id=standby0,failover=on",
> + 2);
> +
> + resp = qtest_qmp(qts, "{'execute': 'device_add',"
> + "'arguments': {"
> + "'driver': 'virtio-net',"
> + "'bus': 'root1',"
> + "'failover_pair_id': 'standby0'"
> + "} }");
> + g_assert(qdict_haskey(resp, "error"));
> +
> + err = qdict_get_qdict(resp, "error");
> + g_assert(qdict_haskey(err, "desc"));
> +
> + g_assert_cmpstr(qdict_get_str(err, "desc"), ==,
> + "Device with failover_pair_id needs to have id");
> +
> + qobject_unref(resp);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_error_pcie(void)
> +{
> + QTestState *qts;
> + QDict *resp;
> + QDict *err;
> +
> + qts = machine_start(BASE_MACHINE
> + "-device virtio-net,bus=root0,id=standby0,failover=on",
> + 2);
> +
> + resp = qtest_qmp(qts, "{'execute': 'device_add',"
> + "'arguments': {"
> + "'driver': 'virtio-net',"
> + "'id': 'primary0',"
> + "'bus': 'pcie.0',"
> + "'failover_pair_id': 'standby0'"
> + "} }");
> + g_assert(qdict_haskey(resp, "error"));
> +
> + err = qdict_get_qdict(resp, "error");
> + g_assert(qdict_haskey(err, "desc"));
> +
> + g_assert_cmpstr(qdict_get_str(err, "desc"), ==,
> + "Bus 'pcie.0' does not support hotplugging");
> +
> + qobject_unref(resp);
> +
> + machine_stop(qts);
> +}
> +
> +static QDict *find_device(QDict *bus, const char *name)
> +{
> + const QObject *obj;
> + QList *devices;
> + QList *list;
> +
> + devices = qdict_get_qlist(bus, "devices");
> + if (devices == NULL) {
> + return NULL;
> + }
> +
> + list = qlist_copy(devices);
> + while ((obj = qlist_pop(list))) {
> + QDict *device;
> +
> + device = qobject_to(QDict, obj);
> +
> + if (qdict_haskey(device, "pci_bridge")) {
> + QDict *bridge;
> + QDict *bridge_device;
> +
> + bridge = qdict_get_qdict(device, "pci_bridge");
> +
> + if (qdict_haskey(bridge, "devices")) {
> + bridge_device = find_device(bridge, name);
> + if (bridge_device) {
> + qobject_unref(list);
> + return bridge_device;
> + }
> + }
> + }
> +
> + if (!qdict_haskey(device, "qdev_id")) {
> + continue;
> + }
> +
> + if (strcmp(qdict_get_str(device, "qdev_id"), name) == 0) {
> + qobject_ref(device);
> + qobject_unref(list);
> + return device;
> + }
> + }
> + qobject_unref(list);
> +
> + return NULL;
> +}
> +
> +static QDict *get_bus(QTestState *qts, int num)
> +{
> + QObject *obj;
> + QDict *resp;
> + QList *ret;
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'query-pci' }");
> + g_assert(qdict_haskey(resp, "return"));
> +
> + ret = qdict_get_qlist(resp, "return");
> + g_assert_nonnull(ret);
> +
> + while ((obj = qlist_pop(ret))) {
> + QDict *bus;
> +
> + bus = qobject_to(QDict, obj);
> + if (!qdict_haskey(bus, "bus")) {
> + continue;
> + }
> + if (qdict_get_int(bus, "bus") == num) {
> + qobject_ref(bus);
> + qobject_unref(resp);
> + return bus;
> + }
> + }
> + qobject_unref(resp);
> +
> + return NULL;
> +}
> +
> +static char *get_mac(QTestState *qts, const char *name)
> +{
> + QDict *resp;
> + char *mac;
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'qom-get', "
> + "'arguments': { "
> + "'path': %s, "
> + "'property': 'mac' } }", name);
> +
> + g_assert(qdict_haskey(resp, "return"));
> +
> + mac = g_strdup( qdict_get_str(resp, "return"));
> +
> + qobject_unref(resp);
> +
> + 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);
> +}
> +
> +static void test_on(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-device virtio-net,bus=root0,id=standby0,"
> + "failover=on,netdev=hs0,mac="MAC_STANDBY0" "
> + "-device virtio-net,bus=root1,id=primary0,"
> + "failover_pair_id=standby0,netdev=hs1,mac="MAC_PRIMARY0,
> + 2);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_on_mismatch(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-device virtio-net,bus=root0,id=standby0,"
> + "failover=on,netdev=hs0,mac="MAC_STANDBY0" "
> + "-netdev user,id=hs1 "
> + "-device virtio-net,bus=root1,id=primary0,"
> + "failover_pair_id=standby1,netdev=hs1,mac="MAC_PRIMARY0,
> + 2);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_off(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-device virtio-net,bus=root0,id=standby0,"
> + "failover=off,netdev=hs0,mac="MAC_STANDBY0" "
> + "-netdev user,id=hs1 "
> + "-device virtio-net,bus=root1,id=primary0,"
> + "failover_pair_id=standby0,netdev=hs1,mac="MAC_PRIMARY0,
> + 2);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void start_virtio_net(QTestState *qts, int bus, int slot,
> + const char *id)
> +{
> + QVirtioPCIDevice *dev;
> + uint64_t features;
> + QPCIAddress addr;
> + QDict *resp;
> + QDict *data;
> +
> + addr.devfn = QPCI_DEVFN((bus << 5) + slot, 0);
> + dev = virtio_pci_new(pcibus, &addr);
> + g_assert_nonnull(dev);
> + qvirtio_pci_device_enable(dev);
> + qvirtio_start_device(&dev->vdev);
> + features = qvirtio_get_features(&dev->vdev);
> + features = features & ~(QVIRTIO_F_BAD_FEATURE |
> + (1ull << VIRTIO_RING_F_INDIRECT_DESC) |
> + (1ull << VIRTIO_RING_F_EVENT_IDX));
> + qvirtio_set_features(&dev->vdev, features);
> + qvirtio_set_driver_ok(&dev->vdev);
> +
> + resp = qtest_qmp_eventwait_ref(qts, "FAILOVER_NEGOTIATED");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, id);
> +
> + qobject_unref(resp);
> +}
> +
> +static void test_enabled(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-device virtio-net,bus=root0,id=standby0,"
> + "failover=on,netdev=hs0,mac="MAC_STANDBY0" "
> + "-netdev user,id=hs1 "
> + "-device virtio-net,bus=root1,id=primary0,"
> + "failover_pair_id=standby0,netdev=hs1,mac="MAC_PRIMARY0" ",
> + 2);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_hotplug_1(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-device virtio-net,bus=root0,id=standby0,"
> + "failover=on,netdev=hs0,mac="MAC_STANDBY0" "
> + "-netdev user,id=hs1 ", 2);
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_hotplug_1_reverse(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 "
> + "-device virtio-net,bus=root1,id=primary0,"
> + "failover_pair_id=standby0,netdev=hs1,mac="MAC_PRIMARY0" ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_hotplug_2(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static void test_hotplug_2_reverse(void)
> +{
> + QTestState *qts;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + /* XXX: sounds like a bug */
Could you elaborate?
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + machine_stop(qts);
> +}
> +
> +static QDict *migrate_status(QTestState *qts)
> +{
> + QDict *resp, *ret;
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'query-migrate' }");
> + g_assert(qdict_haskey(resp, "return"));
> +
> + ret = qdict_get_qdict(resp, "return");
> + g_assert(qdict_haskey(ret, "status"));
> + qobject_ref(ret);
> + qobject_unref(resp);
> +
> + return ret;
> +}
> +
> +static void test_migrate_out(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *data, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat > %s", (gchar *)opaque);
> + const gchar *status;
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + start_virtio_net(qts, 1, 0, "standby0");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + /* the event is sent whan QEMU asks the OS to unplug the card */
> + resp = qtest_qmp_eventwait_ref(qts, "UNPLUG_PRIMARY");
> + g_assert(qdict_haskey(resp, "data"));
> +
> + data = qdict_get_qdict(resp, "data");
> + g_assert(qdict_haskey(data, "device-id"));
> + g_assert_cmpstr(qdict_get_str(data, "device-id"), ==, "primary0");
> +
> + qobject_unref(resp);
> +
> + qtest_outl(qts, ACPI_PCIHP_ADDR_ICH9 + PCI_EJ_BASE, 1);
> +
> + while (true) {
> + ret = migrate_status(qts);
> +
> + status = qdict_get_str(ret, "status");
> + if (strcmp(status, "completed") == 0) {
> + break;
> + }
> + g_assert_cmpstr(status, !=, "failed");
> + g_assert_cmpstr(status, !=, "cancelling");
> + g_assert_cmpstr(status, !=, "cancelled");
> + qobject_unref(ret);
> + }
> + qobject_unref(ret);
> +
> + qtest_qmp_eventwait(qts, "STOP");
> +
> + /*
> + * in fact, the card is ejected from the point of view of kernel
> + * but not really from QEMU to be able to hotplug it back if
> + * migration fails. So we can't check that:
> + * check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + * check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> + */
> +
> + machine_stop(qts);
> +}
> +
> +static void test_migrate_in(gconstpointer opaque)
> +{
> + QTestState *qts;
> + QDict *resp, *args, *ret;
> + g_autofree gchar *uri = g_strdup_printf("exec: cat %s", (gchar *)opaque);
> +
> + qts = machine_start(BASE_MACHINE
> + "-netdev user,id=hs0 "
> + "-netdev user,id=hs1 "
> + "-incoming defer ",
> + 2);
> +
> + check_one_card(qts, false, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "standby0",
> + "{'bus': 'root0',"
> + "'failover': 'on',"
> + "'netdev': 'hs0',"
> + "'mac': '"MAC_STANDBY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_device_add(qts, "virtio-net", "primary0",
> + "{'bus': 'root1',"
> + "'failover_pair_id': 'standby0',"
> + "'netdev': 'hs1',"
> + "'rombar': 0,"
> + "'romfile': '',"
> + "'mac': '"MAC_PRIMARY0"'}");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, false, "primary0", MAC_PRIMARY0);
> +
> + args = qdict_from_jsonf_nofail("{}");
> + g_assert_nonnull(args);
> + qdict_put_str(args, "uri", uri);
> +
> + resp = qtest_qmp(qts, "{ 'execute': 'migrate-incoming', 'arguments': %p}",
> + args);
> + g_assert(qdict_haskey(resp, "return"));
> + qobject_unref(resp);
> +
> + qtest_qmp_eventwait(qts, "MIGRATION");
> + qtest_qmp_eventwait(qts, "FAILOVER_NEGOTIATED");
> +
> + check_one_card(qts, true, "standby0", MAC_STANDBY0);
> + check_one_card(qts, true, "primary0", MAC_PRIMARY0);
> +
> + qtest_qmp_eventwait(qts, "RESUME");
> +
> + ret = migrate_status(qts);
> + g_assert_cmpstr(qdict_get_str(ret, "status"), ==, "completed");
> + qobject_unref(ret);
> +
> + machine_stop(qts);
> +}
> +
> +int main(int argc, char **argv)
> +{
> + gchar *tmpfile = g_strdup_printf("/tmp/failover_test_migrate-%u-%u",
> + getpid(), g_test_rand_int());
Could you please use g_get_tmp_dir() instead of hard-coding /tmp?
> + const char *arch;
> + int ret;
> +
> + g_test_init(&argc, &argv, NULL);
> +
> + arch = qtest_get_arch();
> + if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) {
> + g_test_message("Skipping test for non-x86");
> + return g_test_run();
> + }
You could skip that architecture test if you only add the test to
qtests_i386 in meson.build.
> + qtest_add_func("failover-virtio-net/params/error/id", test_error_id);
> + qtest_add_func("failover-virtio-net/params/error/pcie", test_error_pcie);
> + qtest_add_func("failover-virtio-net/params/on", test_on);
> + qtest_add_func("failover-virtio-net/params/on_mismatch",
> + test_on_mismatch);
> + qtest_add_func("failover-virtio-net/params/off", test_off);
> + qtest_add_func("failover-virtio-net/params/enabled", test_enabled);
> + qtest_add_func("failover-virtio-net/hotplug_1", test_hotplug_1);
> + qtest_add_func("failover-virtio-net/hotplug_1_reverse",
> + test_hotplug_1_reverse);
> + qtest_add_func("failover-virtio-net/hotplug_2", test_hotplug_2);
> + qtest_add_func("failover-virtio-net/hotplug_2_reverse",
> + test_hotplug_2_reverse);
> + qtest_add_data_func("failover-virtio-net/migrate/out", tmpfile,
> + test_migrate_out);
> + qtest_add_data_func("failover-virtio-net/migrate/in", tmpfile,
> + test_migrate_in);
> +
> + ret = g_test_run();
> +
> + unlink(tmpfile);
> + g_free(tmpfile);
> +
> + return ret;
> +}
>
Thomas
next prev parent reply other threads:[~2021-12-07 8:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-06 22:20 [PATCH v6 0/6] tests/qtest: add some tests for virtio-net failover Laurent Vivier
2021-12-06 22:20 ` [PATCH v6 1/6] qtest/libqos: add a function to initialize secondary PCI buses Laurent Vivier
2021-12-07 8:09 ` Thomas Huth
2021-12-06 22:20 ` [PATCH v6 2/6] tests/qtest: add some tests for virtio-net failover Laurent Vivier
2021-12-07 8:29 ` Thomas Huth [this message]
2021-12-06 22:20 ` [PATCH v6 3/6] failover: fix unplug pending detection Laurent Vivier
2021-12-07 4:13 ` Ani Sinha
2021-12-07 7:31 ` Laurent Vivier
2021-12-06 22:20 ` [PATCH v6 4/6] tests/libqtest: update virtio-net failover test Laurent Vivier
2021-12-07 8:33 ` Thomas Huth
2021-12-06 22:20 ` [PATCH v6 5/6] test/libqtest: add some virtio-net failover migration cancelling tests Laurent Vivier
2021-12-07 8:35 ` Thomas Huth
2021-12-08 7:44 ` Michael S. Tsirkin
2021-12-08 7:48 ` Thomas Huth
2021-12-08 7:53 ` Thomas Huth
2021-12-06 22:20 ` [PATCH v6 6/6] tests/libqtest: add a migration test with two couples of failover devices Laurent Vivier
2021-12-07 8:39 ` Thomas Huth
2021-12-08 7:44 ` [PATCH v6 0/6] tests/qtest: add some tests for virtio-net failover Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6b81b382-535f-41a1-5d9b-b6f0d7bebd06@redhat.com \
--to=thuth@redhat.com \
--cc=jfreimann@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).