From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643898980188504.6185014900044; Thu, 3 Feb 2022 06:36:20 -0800 (PST) Received: from localhost ([::1]:47452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdDd-000348-AW for importer@patchew.org; Thu, 03 Feb 2022 09:36:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvN-0005Oh-5A for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcv6-00067N-Jk for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-83-Fnf_c3ZyOfmspdDUYQqQ7g-1; Thu, 03 Feb 2022 09:15:43 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B6743E745 for ; Thu, 3 Feb 2022 14:15:42 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0072E108647C; Thu, 3 Feb 2022 14:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j0ZzV7rfDIdIr2ESd5WQsHyyQclQNwsgLNl6hCtWf4A=; b=T3PDFwgp8gHomJLhQgsC6OnVqlaJqPUqqf9a74VoFvnmjdoGmH6WlDmF4t1sHIMMoIuxCh ymeubhWOrAs0B1u7Z8L5hnzO1HTEsdgN+fz6w7Zv29HtRMyvS4AUHlosBvK9sojsmGNXPy K5LWseSfFPxEedJ6Uyc0NX/rbm12sOs= X-MC-Unique: Fnf_c3ZyOfmspdDUYQqQ7g-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 1/7] tests/qtest: failover: clean up pathname of tests Date: Thu, 3 Feb 2022 15:15:31 +0100 Message-Id: <20220203141537.972317-2-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643898983187100003 Content-Type: text/plain; charset="utf-8" clearly indentify parameters, hotplug and migration tests Signed-off-by: Laurent Vivier --- tests/qtest/virtio-net-failover.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 22ad54bb9594..207c1330125b 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -1315,6 +1315,7 @@ int main(int argc, char **argv) g_assert_true(ret >=3D 0); close(ret); =20 + /* parameters tests */ qtest_add_func("failover-virtio-net/params/error/id", test_error_id); qtest_add_func("failover-virtio-net/params/error/pcie", test_error_pci= e); qtest_add_func("failover-virtio-net/params/on", test_on); @@ -1322,15 +1323,19 @@ int main(int argc, char **argv) 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", + + /* hotplug tests */ + 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", + 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, + + /* migration tests */ + qtest_add_data_func("failover-virtio-net/migrate/on/out", tmpfile, test_migrate_out); - qtest_add_data_func("failover-virtio-net/migrate/in", tmpfile, + qtest_add_data_func("failover-virtio-net/migrate/on/in", tmpfile, test_migrate_in); qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug", tmpfile, test_migrate_abort_wait_unplug); @@ -1340,9 +1345,9 @@ int main(int argc, char **argv) qtest_add_data_func("failover-virtio-net/migrate/abort/timeout", tmpfile, test_migrate_abort_timeout); } - qtest_add_data_func("failover-virtio-net/multi/out", + qtest_add_data_func("failover-virtio-net/migrate/multi/out", tmpfile, test_multi_out); - qtest_add_data_func("failover-virtio-net/multi/in", + qtest_add_data_func("failover-virtio-net/migrate/multi/in", tmpfile, test_multi_in); =20 ret =3D g_test_run(); --=20 2.34.1 From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643899496708747.8728168645547; Thu, 3 Feb 2022 06:44:56 -0800 (PST) Received: from localhost ([::1]:33072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdLz-0004OM-Vk for importer@patchew.org; Thu, 03 Feb 2022 09:44:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvV-0005al-09 for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:58886) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvM-00068y-Ql for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:32 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-489-d28GMLCXPtiXKmbsASyfgA-1; Thu, 03 Feb 2022 09:15:45 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0235D1006AA8 for ; Thu, 3 Feb 2022 14:15:45 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB7EF108648E; Thu, 3 Feb 2022 14:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wtm1moNUp0Y/PzBiO/jjq6Zvsj5+zV+lje5Cpnu/7aw=; b=PLwh8oHo4JxQTfTuWjOWpzk9FIZJZ0EHn2JNEPTTUm0suNEi/PIeOoQeohs062lbEj7hAg 23rjHYoJgXPZASHBQ4s5cx+dMx14krHZI5pwyeOaazHathCnoz/FYmol37FGBGpQSFwXXS yo0mrSbbmvBG97aYxCCv5uc8p2htwkk= X-MC-Unique: d28GMLCXPtiXKmbsASyfgA-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 2/7] tests/qtest: failover: use a macro for check_one_card() Date: Thu, 3 Feb 2022 15:15:32 +0100 Message-Id: <20220203141537.972317-3-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643899499598100001 Content-Type: text/plain; charset="utf-8" This allows g_assert() to correctly report the line number of the error in the test case. Signed-off-by: Laurent Vivier --- 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-fai= lover.c index 207c1330125b..070e53de1292 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 *nam= e) return mac; } =20 -static void check_one_card(QTestState *qts, bool present, - const char *id, const char *mac) -{ - QDict *device; - QDict *bus; - char *addr; - - bus =3D get_bus(qts, 0); - device =3D find_device(bus, id); - if (present) { - char *path; - - g_assert_nonnull(device); - qobject_unref(device); - - path =3D g_strdup_printf("/machine/peripheral/%s", id); - addr =3D get_mac(qts, path); - g_free(path); - g_assert_cmpstr(mac, =3D=3D, 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 =3D get_bus(qts, 0); \ + device =3D find_device(bus, id); \ + if (present) { \ + char *path; \ + g_assert_nonnull(device); \ + qobject_unref(device); \ + path =3D g_strdup_printf("/machine/peripheral/%s", id); \ + addr =3D get_mac(qts, path); \ + g_free(path); \ + g_assert_cmpstr(mac, =3D=3D, addr); \ + g_free(addr); \ + } else { \ + g_assert_null(device); \ + } \ + qobject_unref(bus); \ +} while (0) =20 static void test_on(void) { --=20 2.34.1 From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643898543034915.6793571416122; Thu, 3 Feb 2022 06:29:03 -0800 (PST) Received: from localhost ([::1]:33514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFd6c-0001zE-89 for importer@patchew.org; Thu, 03 Feb 2022 09:29:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvK-0005ND-9P for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36221) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcv8-0006AA-QQ for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:18 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-131-s8PZYk3RPpi-a9qiHl8jWw-1; Thu, 03 Feb 2022 09:15:48 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E826484DA42 for ; Thu, 3 Feb 2022 14:15:47 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A187108647C; Thu, 3 Feb 2022 14:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AoTyF1P1D4W5b4czTqtGncbS9M62aDlJP7cbGNaHPfI=; b=PZWfnbr11iC2xuD8Om6o40LHH9bjFwmHlrVFBiqmbRNBFlnG+PDhBKTvvKBlV5XKNvuhoH Q96M3ASXiFb/xnXY1/fAwy+ystq6RQoJN3UqaF3QhLWCHrJmrx+7ISi1/ILlCNef5apsFf p2+p529TG9/rWW1B5haS7g2qZjCCrmI= X-MC-Unique: s8PZYk3RPpi-a9qiHl8jWw-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 3/7] tests/qtest: failover: check the feature is correctly provided Date: Thu, 3 Feb 2022 15:15:33 +0100 Message-Id: <20220203141537.972317-4-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643898544580100001 Content-Type: text/plain; charset="utf-8" Check QEMU provides the VIRTIO_NET_F_STANDBY if failover is on, and doesn't if failover is off Signed-off-by: Laurent Vivier --- tests/qtest/virtio-net-failover.c | 139 ++++++++++++++++++------------ 1 file changed, 86 insertions(+), 53 deletions(-) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 070e53de1292..42367963685c 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -18,6 +18,8 @@ #include "libqos/virtio-pci.h" #include "hw/pci/pci.h" =20 +#define VIRTIO_NET_F_STANDBY 62 + #define ACPI_PCIHP_ADDR_ICH9 0x0cc0 #define PCI_EJ_BASE 0x0008 #define PCI_SEL_BASE 0x0010 @@ -246,6 +248,65 @@ do { = \ qobject_unref(bus); \ } while (0) =20 +static QDict *get_failover_negociated_event(QTestState *qts) +{ + QDict *resp; + QDict *data; + + resp =3D qtest_qmp_eventwait_ref(qts, "FAILOVER_NEGOTIATED"); + g_assert(qdict_haskey(resp, "data")); + + data =3D qdict_get_qdict(resp, "data"); + g_assert(qdict_haskey(data, "device-id")); + qobject_ref(data); + qobject_unref(resp); + + return data; +} + +static QVirtioPCIDevice *start_virtio_net_internal(QTestState *qts, + int bus, int slot, + uint64_t *features) +{ + QVirtioPCIDevice *dev; + QPCIAddress addr; + + addr.devfn =3D QPCI_DEVFN((bus << 5) + slot, 0); + dev =3D virtio_pci_new(pcibus, &addr); + g_assert_nonnull(dev); + qvirtio_pci_device_enable(dev); + qvirtio_start_device(&dev->vdev); + *features &=3D qvirtio_get_features(&dev->vdev); + qvirtio_set_features(&dev->vdev, *features); + qvirtio_set_driver_ok(&dev->vdev); + return dev; +} + +static QVirtioPCIDevice *start_virtio_net(QTestState *qts, int bus, int sl= ot, + const char *id, bool failover) +{ + QVirtioPCIDevice *dev; + uint64_t features; + + features =3D ~(QVIRTIO_F_BAD_FEATURE | + (1ull << VIRTIO_RING_F_INDIRECT_DESC) | + (1ull << VIRTIO_RING_F_EVENT_IDX)); + + dev =3D start_virtio_net_internal(qts, bus, slot, &features); + + g_assert(!!(features & (1ull << VIRTIO_NET_F_STANDBY)) =3D=3D failover= ); + + if (failover) { + QDict *resp; + + resp =3D get_failover_negociated_event(qts); + g_assert_cmpstr(qdict_get_str(resp, "device-id"), =3D=3D, id); + qobject_unref(resp); + } + + return dev; +} + static void test_on(void) { QTestState *qts; @@ -254,6 +315,7 @@ static void test_on(void) "-netdev user,id=3Dhs0 " "-device virtio-net,bus=3Droot0,id=3Dstandby0," "failover=3Don,netdev=3Dhs0,mac=3D"MAC_STANDBY0" " + "-netdev user,id=3Dhs1 " "-device virtio-net,bus=3Droot1,id=3Dprimary0," "failover_pair_id=3Dstandby0,netdev=3Dhs1,mac=3D"M= AC_PRIMARY0, 2); @@ -267,6 +329,7 @@ static void test_on(void) static void test_on_mismatch(void) { QTestState *qts; + QVirtioPCIDevice *vdev; =20 qts =3D machine_start(BASE_MACHINE "-netdev user,id=3Dhs0 " @@ -280,12 +343,19 @@ static void test_on_mismatch(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); =20 + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, true, "primary0", MAC_PRIMARY0); + + qos_object_destroy((QOSGraphObject *)vdev); machine_stop(qts); } =20 static void test_off(void) { QTestState *qts; + QVirtioPCIDevice *vdev; =20 qts =3D machine_start(BASE_MACHINE "-netdev user,id=3Dhs0 " @@ -299,50 +369,13 @@ static void test_off(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); =20 - machine_stop(qts); -} + vdev =3D start_virtio_net(qts, 1, 0, "standby0", false); =20 -static QDict *get_failover_negociated_event(QTestState *qts) -{ - QDict *resp; - QDict *data; - - resp =3D qtest_qmp_eventwait_ref(qts, "FAILOVER_NEGOTIATED"); - g_assert(qdict_haskey(resp, "data")); - - data =3D qdict_get_qdict(resp, "data"); - g_assert(qdict_haskey(data, "device-id")); - qobject_ref(data); - qobject_unref(resp); - - return data; -} - -static QVirtioPCIDevice *start_virtio_net(QTestState *qts, int bus, int sl= ot, - const char *id) -{ - QVirtioPCIDevice *dev; - uint64_t features; - QPCIAddress addr; - QDict *resp; - - addr.devfn =3D QPCI_DEVFN((bus << 5) + slot, 0); - dev =3D virtio_pci_new(pcibus, &addr); - g_assert_nonnull(dev); - qvirtio_pci_device_enable(dev); - qvirtio_start_device(&dev->vdev); - features =3D qvirtio_get_features(&dev->vdev); - features =3D 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 =3D get_failover_negociated_event(qts); - g_assert_cmpstr(qdict_get_str(resp, "device-id"), =3D=3D, id); - qobject_unref(resp); + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, true, "primary0", MAC_PRIMARY0); =20 - return dev; + qos_object_destroy((QOSGraphObject *)vdev); + machine_stop(qts); } =20 static void test_enabled(void) @@ -362,7 +395,7 @@ static void test_enabled(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); @@ -385,7 +418,7 @@ static void test_hotplug_1(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -427,7 +460,7 @@ static void test_hotplug_1_reverse(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); @@ -458,7 +491,7 @@ static void test_hotplug_2(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -514,7 +547,7 @@ static void test_hotplug_2_reverse(void) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); @@ -579,7 +612,7 @@ static void test_migrate_out(gconstpointer opaque) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -775,7 +808,7 @@ static void test_migrate_abort_wait_unplug(gconstpointe= r opaque) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -865,7 +898,7 @@ static void test_migrate_abort_active(gconstpointer opa= que) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -959,7 +992,7 @@ static void test_migrate_abort_timeout(gconstpointer op= aque) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - vdev =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -1070,7 +1103,7 @@ static void test_multi_out(gconstpointer opaque) check_one_card(qts, false, "standby1", MAC_STANDBY1); check_one_card(qts, false, "primary1", MAC_PRIMARY1); =20 - vdev0 =3D start_virtio_net(qts, 1, 0, "standby0"); + vdev0 =3D start_virtio_net(qts, 1, 0, "standby0", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); @@ -1101,7 +1134,7 @@ static void test_multi_out(gconstpointer opaque) check_one_card(qts, true, "standby1", MAC_STANDBY1); check_one_card(qts, false, "primary1", MAC_PRIMARY1); =20 - vdev1 =3D start_virtio_net(qts, 3, 0, "standby1"); + vdev1 =3D start_virtio_net(qts, 3, 0, "standby1", true); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); --=20 2.34.1 From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643899060228678.7653585575367; Thu, 3 Feb 2022 06:37:40 -0800 (PST) Received: from localhost ([::1]:48192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdEw-0003ZM-WA for importer@patchew.org; Thu, 03 Feb 2022 09:37:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvN-0005Ok-74 for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvD-0006Ap-4H for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-510-jnkhwIVlM4CeTh7Xa-JDrg-1; Thu, 03 Feb 2022 09:15:50 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BE7884DA42 for ; Thu, 3 Feb 2022 14:15:49 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58503108647C; Thu, 3 Feb 2022 14:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AVtbohUKlzYLhH8yUsA6xyHnuypJVP02C56tNJZAWPw=; b=OaDVuZkqTVY44OjdmI07qSbZk9oXhL2z+RLFzWuMaOk3wrCEXwfL1MrtfiuK/mI06Rz+v/ z9lbJsdGe4GZDg4y1zViMdt53oqBa95eJIIn4uZXKkOoOo7Ut6VHWqbPOO4nDMFAoLHmFd w9N1CNoPmp3C5M4hYWGPbrvcc0zFf2s= X-MC-Unique: jnkhwIVlM4CeTh7Xa-JDrg-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 4/7] tests/qtest: failover: check missing guest feature Date: Thu, 3 Feb 2022 15:15:34 +0100 Message-Id: <20220203141537.972317-5-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643899063064100001 Content-Type: text/plain; charset="utf-8" If QEMU provides the VIRTIO_NET_F_STANDBY feature but the guest doesn't the primary device must be kept hidden Signed-off-by: Laurent Vivier --- tests/qtest/virtio-net-failover.c | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 42367963685c..cbd8585fa853 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -404,6 +404,38 @@ static void test_enabled(void) machine_stop(qts); } =20 +static void test_guest_off(void) +{ + QTestState *qts; + QVirtioPCIDevice *vdev; + uint64_t features; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-device virtio-net,bus=3Droot0,id=3Dstandby0," + "failover=3Don,netdev=3Dhs0,mac=3D"MAC_STANDBY0" " + "-netdev user,id=3Dhs1 " + "-device virtio-net,bus=3Droot1,id=3Dprimary0," + "failover_pair_id=3Dstandby0,netdev=3Dhs1,mac=3D"MAC_= PRIMARY0" ", + 2); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + features =3D ~(QVIRTIO_F_BAD_FEATURE | + (1ull << VIRTIO_RING_F_INDIRECT_DESC) | + (1ull << VIRTIO_RING_F_EVENT_IDX) | + (1ull << VIRTIO_NET_F_STANDBY)); + + vdev =3D start_virtio_net_internal(qts, 1, 0, &features); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + qos_object_destroy((QOSGraphObject *)vdev); + machine_stop(qts); +} + static void test_hotplug_1(void) { QTestState *qts; @@ -1351,6 +1383,7 @@ int main(int argc, char **argv) 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/params/guest_off", test_guest_off); =20 /* hotplug tests */ qtest_add_func("failover-virtio-net/hotplug/1", test_hotplug_1); --=20 2.34.1 From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643898652926396.1911646265469; Thu, 3 Feb 2022 06:30:52 -0800 (PST) Received: from localhost ([::1]:36336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFd8N-0003tn-Ei for importer@patchew.org; Thu, 03 Feb 2022 09:30:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvI-0005Mr-At for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcv6-0006CC-Jj for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:16 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-661-3ZQg-18ENEawwQnzY0Adcw-1; Thu, 03 Feb 2022 09:15:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54FAE80ED84 for ; Thu, 3 Feb 2022 14:15:51 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id EE2F4108648D; Thu, 3 Feb 2022 14:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kr/5cUqVKcFKQ/1oVLCAEeWQBD1kHjfH6sk3ojud2b8=; b=gjHv08oeyaSefvfKcM46bCq3QsW5CnxuUPKB55fK/cg2uPvaTyRatuFiY4UmiHDMntKuGS 1gdJV8qpfdok/iqPplHRis+iXreKUStkVJ5M/qFURKshspyrSGfSxvgUDF5B7MIIjPFYid aiAlwTfonCVXtOYTg6e0C0t3/iUIp4M= X-MC-Unique: 3ZQg-18ENEawwQnzY0Adcw-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 5/7] tests/qtest: failover: check migration with failover off Date: Thu, 3 Feb 2022 15:15:35 +0100 Message-Id: <20220203141537.972317-6-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643898655276100001 Content-Type: text/plain; charset="utf-8" If failover is off, the primary device is not plugged and the migration is done only with the standby device. On destination, the primary device must not be plugged. Signed-off-by: Laurent Vivier --- tests/qtest/virtio-net-failover.c | 133 ++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index cbd8585fa853..c99599bdcc2a 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -815,6 +815,135 @@ static void test_migrate_in(gconstpointer opaque) machine_stop(qts); } =20 +static void test_off_migrate_out(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat > %s", (gchar *)o= paque); + const gchar *status; + QVirtioPCIDevice *vdev; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 ", + 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': 'off'," + "'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, true, "primary0", MAC_PRIMARY0); + + vdev =3D start_virtio_net(qts, 1, 0, "standby0", false); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, true, "primary0", MAC_PRIMARY0); + + args =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", ar= gs); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + while (true) { + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "completed") =3D=3D 0) { + qobject_unref(ret); + break; + } + g_assert_cmpstr(status, !=3D, "failed"); + g_assert_cmpstr(status, !=3D, "cancelling"); + g_assert_cmpstr(status, !=3D, "cancelled"); + qobject_unref(ret); + } + + qtest_qmp_eventwait(qts, "STOP"); + + qos_object_destroy((QOSGraphObject *)vdev); + machine_stop(qts); +} + +static void test_off_migrate_in(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat %s", (gchar *)opa= que); + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + "-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': 'off'," + "'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, true, "primary0", MAC_PRIMARY0); + + args =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate-incoming', 'arguments':= %p}", + args); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D get_migration_event(qts); + g_assert_cmpstr(qdict_get_str(resp, "status"), =3D=3D, "setup"); + qobject_unref(resp); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, true, "primary0", MAC_PRIMARY0); + + qtest_qmp_eventwait(qts, "RESUME"); + + ret =3D migrate_status(qts); + g_assert_cmpstr(qdict_get_str(ret, "status"), =3D=3D, "completed"); + qobject_unref(ret); + + machine_stop(qts); +} + static void test_migrate_abort_wait_unplug(gconstpointer opaque) { QTestState *qts; @@ -1398,6 +1527,10 @@ int main(int argc, char **argv) test_migrate_out); qtest_add_data_func("failover-virtio-net/migrate/on/in", tmpfile, test_migrate_in); + qtest_add_data_func("failover-virtio-net/migrate/off/out", tmpfile, + test_off_migrate_out); + qtest_add_data_func("failover-virtio-net/migrate/off/in", tmpfile, + test_off_migrate_in); qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug", tmpfile, test_migrate_abort_wait_unplug); qtest_add_data_func("failover-virtio-net/migrate/abort/active", tmpfil= e, --=20 2.34.1 From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643899237583935.275545158193; Thu, 3 Feb 2022 06:40:37 -0800 (PST) Received: from localhost ([::1]:54042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdHo-0007jd-Sa for importer@patchew.org; Thu, 03 Feb 2022 09:40:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvc-0005lK-U0 for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:30019) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvM-0006Cb-VW for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:40 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-125-QJMBL8-YMHWkRTMv2BMW4g-1; Thu, 03 Feb 2022 09:15:53 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E92E1193F56B for ; Thu, 3 Feb 2022 14:15:52 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id B68A7108648D; Thu, 3 Feb 2022 14:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kXJB2H/eRkwBq66eI0R1g+06MjSJeadVGw2tKx4ijZw=; b=aWIOvK1nsO+HJOnXBlSOOEvjHhe9AcjC6bsReDB8fP2HZg5+FmcjuFWmT2dDJo0dW8ui1b gfBgP/8QQ3jtwO6QTOG39rEpxkaJjKqq15RzD5XGVSBxzNgFGTbMYJFusr+TRLVZmsjb3p EOq7OCLsH0d8CEx8h5XLuElTydrDxDw= X-MC-Unique: QJMBL8-YMHWkRTMv2BMW4g-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 6/7] tests/qtest: failover: test migration if the guest doesn't support failover Date: Thu, 3 Feb 2022 15:15:36 +0100 Message-Id: <20220203141537.972317-7-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643899240747100001 Content-Type: text/plain; charset="utf-8" The primary device is not plugged and the migration is done only with the standby device Signed-off-by: Laurent Vivier --- tests/qtest/virtio-net-failover.c | 142 ++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index c99599bdcc2a..54a0a0324192 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -944,6 +944,144 @@ static void test_off_migrate_in(gconstpointer opaque) machine_stop(qts); } =20 +static void test_guest_off_migrate_out(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat > %s", (gchar *)o= paque); + const gchar *status; + QVirtioPCIDevice *vdev; + uint64_t features; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 ", + 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); + + features =3D ~(QVIRTIO_F_BAD_FEATURE | + (1ull << VIRTIO_RING_F_INDIRECT_DESC) | + (1ull << VIRTIO_RING_F_EVENT_IDX) | + (1ull << VIRTIO_NET_F_STANDBY)); + + vdev =3D start_virtio_net_internal(qts, 1, 0, &features); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + args =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", ar= gs); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + while (true) { + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "completed") =3D=3D 0) { + qobject_unref(ret); + break; + } + g_assert_cmpstr(status, !=3D, "failed"); + g_assert_cmpstr(status, !=3D, "cancelling"); + g_assert_cmpstr(status, !=3D, "cancelled"); + qobject_unref(ret); + } + + qtest_qmp_eventwait(qts, "STOP"); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + qos_object_destroy((QOSGraphObject *)vdev); + machine_stop(qts); +} + +static void test_guest_off_migrate_in(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat %s", (gchar *)opa= que); + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 " + "-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 =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate-incoming', 'arguments':= %p}", + args); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + resp =3D get_migration_event(qts); + g_assert_cmpstr(qdict_get_str(resp, "status"), =3D=3D, "setup"); + qobject_unref(resp); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + qtest_qmp_eventwait(qts, "RESUME"); + + ret =3D migrate_status(qts); + g_assert_cmpstr(qdict_get_str(ret, "status"), =3D=3D, "completed"); + qobject_unref(ret); + + machine_stop(qts); +} + static void test_migrate_abort_wait_unplug(gconstpointer opaque) { QTestState *qts; @@ -1531,6 +1669,10 @@ int main(int argc, char **argv) test_off_migrate_out); qtest_add_data_func("failover-virtio-net/migrate/off/in", tmpfile, test_off_migrate_in); + qtest_add_data_func("failover-virtio-net/migrate/guest_off/out", tmpfi= le, + test_guest_off_migrate_out); + qtest_add_data_func("failover-virtio-net/migrate/guest_off/in", tmpfil= e, + test_guest_off_migrate_in); qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug", tmpfile, test_migrate_abort_wait_unplug); qtest_add_data_func("failover-virtio-net/migrate/abort/active", tmpfil= e, --=20 2.34.1 From nobody Mon Feb 9 05:14:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1643899262907475.6184663940917; Thu, 3 Feb 2022 06:41:02 -0800 (PST) Received: from localhost ([::1]:54376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nFdIE-0007xa-3X for importer@patchew.org; Thu, 03 Feb 2022 09:41:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvN-0005Ou-Pf for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFcvD-0006DA-41 for qemu-devel@nongnu.org; Thu, 03 Feb 2022 09:17:25 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-63-2qQRTfYTN0mHD8Pfxw2ZVQ-1; Thu, 03 Feb 2022 09:15:56 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A178D193F578 for ; Thu, 3 Feb 2022 14:15:55 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.39.193.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CFEC108647C; Thu, 3 Feb 2022 14:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643897757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N9PSwprvbo1nQh5G7WZibNxih2Hsef7DDd8yH8YXI+Y=; b=KCv8B8O5228y/bDeJo7h+I/J9ySSaqYbA0bc4s8XP2TMnH34n8itmoOuE3rW/CYHAZtuXE VBD0VecqhCdOQF5wSxBCidASD0sLOaqIKU61Y/i0iQnV13imP6MUQ4gjskunyxnbzXf/Z1 z9yfJsXeAO2Ibj+jQks0n1mjuWfITXQ= X-MC-Unique: 2qQRTfYTN0mHD8Pfxw2ZVQ-1 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH 7/7] tests/qtest: failover: migration abort test with failover off Date: Thu, 3 Feb 2022 15:15:37 +0100 Message-Id: <20220203141537.972317-8-lvivier@redhat.com> In-Reply-To: <20220203141537.972317-1-lvivier@redhat.com> References: <20220203141537.972317-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lvivier@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lvivier@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.086, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1643899266077100001 Content-Type: text/plain; charset="utf-8" Test abort during active migration when failover is disabled from QEMU or from guest side. Signed-off-by: Laurent Vivier --- tests/qtest/virtio-net-failover.c | 180 ++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 54a0a0324192..80292eecf65f 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -1082,6 +1082,97 @@ static void test_guest_off_migrate_in(gconstpointer = opaque) machine_stop(qts); } =20 +static void test_migrate_guest_off_abort(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat > %s", (gchar *)o= paque); + const gchar *status; + QVirtioPCIDevice *vdev; + uint64_t features; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 ", + 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); + + features =3D ~(QVIRTIO_F_BAD_FEATURE | + (1ull << VIRTIO_RING_F_INDIRECT_DESC) | + (1ull << VIRTIO_RING_F_EVENT_IDX) | + (1ull << VIRTIO_NET_F_STANDBY)); + + vdev =3D start_virtio_net_internal(qts, 1, 0, &features); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + args =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", ar= gs); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + while (true) { + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "active") =3D=3D 0) { + qobject_unref(ret); + break; + } + g_assert_cmpstr(status, !=3D, "failed"); + qobject_unref(ret); + } + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + while (true) { + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "cancelled") =3D=3D 0) { + qobject_unref(ret); + break; + } + g_assert_cmpstr(status, !=3D, "failed"); + g_assert_cmpstr(status, !=3D, "active"); + qobject_unref(ret); + } + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + qos_object_destroy((QOSGraphObject *)vdev); + machine_stop(qts); +} + static void test_migrate_abort_wait_unplug(gconstpointer opaque) { QTestState *qts; @@ -1265,6 +1356,91 @@ static void test_migrate_abort_active(gconstpointer = opaque) machine_stop(qts); } =20 +static void test_migrate_off_abort(gconstpointer opaque) +{ + QTestState *qts; + QDict *resp, *args, *ret; + g_autofree gchar *uri =3D g_strdup_printf("exec: cat > %s", (gchar *)o= paque); + const gchar *status; + QVirtioPCIDevice *vdev; + + qts =3D machine_start(BASE_MACHINE + "-netdev user,id=3Dhs0 " + "-netdev user,id=3Dhs1 ", + 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': 'off'," + "'netdev': 'hs0'," + "'mac': '"MAC_STANDBY0"'}"); + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, false, "primary0", MAC_PRIMARY0); + + vdev =3D start_virtio_net(qts, 1, 0, "standby0", false); + + 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 =3D qdict_from_jsonf_nofail("{}"); + g_assert_nonnull(args); + qdict_put_str(args, "uri", uri); + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate', 'arguments': %p}", ar= gs); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + while (true) { + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "active") =3D=3D 0) { + qobject_unref(ret); + break; + } + g_assert_cmpstr(status, !=3D, "failed"); + qobject_unref(ret); + } + + resp =3D qtest_qmp(qts, "{ 'execute': 'migrate_cancel' }"); + g_assert(qdict_haskey(resp, "return")); + qobject_unref(resp); + + while (true) { + ret =3D migrate_status(qts); + + status =3D qdict_get_str(ret, "status"); + if (strcmp(status, "cancelled") =3D=3D 0) { + qobject_unref(ret); + break; + } + g_assert_cmpstr(status, !=3D, "failed"); + g_assert_cmpstr(status, !=3D, "active"); + qobject_unref(ret); + } + + check_one_card(qts, true, "standby0", MAC_STANDBY0); + check_one_card(qts, true, "primary0", MAC_PRIMARY0); + + qos_object_destroy((QOSGraphObject *)vdev); + machine_stop(qts); +} + static void test_migrate_abort_timeout(gconstpointer opaque) { QTestState *qts; @@ -1669,10 +1845,14 @@ int main(int argc, char **argv) test_off_migrate_out); qtest_add_data_func("failover-virtio-net/migrate/off/in", tmpfile, test_off_migrate_in); + qtest_add_data_func("failover-virtio-net/migrate/off/abort", tmpfile, + test_migrate_off_abort); qtest_add_data_func("failover-virtio-net/migrate/guest_off/out", tmpfi= le, test_guest_off_migrate_out); qtest_add_data_func("failover-virtio-net/migrate/guest_off/in", tmpfil= e, test_guest_off_migrate_in); + qtest_add_data_func("failover-virtio-net/migrate/guest_off/abort", tmp= file, + test_migrate_guest_off_abort); qtest_add_data_func("failover-virtio-net/migrate/abort/wait-unplug", tmpfile, test_migrate_abort_wait_unplug); qtest_add_data_func("failover-virtio-net/migrate/abort/active", tmpfil= e, --=20 2.34.1