From patchwork Fri Dec 15 10:16:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 849075 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="LhrYfVCF"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yymbC6rlYz9sPm for ; Fri, 15 Dec 2017 21:17:59 +1100 (AEDT) Received: from localhost ([::1]:45465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn42-0000sq-1U for incoming@patchwork.ozlabs.org; Fri, 15 Dec 2017 05:17:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn37-0000pO-VQ for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePn34-0007Bg-17 for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:01 -0500 Received: from ozlabs.org ([103.22.144.67]:54295) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePn33-00077z-LM; Fri, 15 Dec 2017 05:16:57 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3yymYz0dKRz9t3t; Fri, 15 Dec 2017 21:16:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1513333015; bh=JxYCfDXEf/lDG0G0a03nkdqPXw1WGm2+HwFO2QfwVgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LhrYfVCFKSgSa0kCsDoAtQtttK7Xffji0Rr8BIbl7xOGnIZnmhuvKW+9tpD2ireZi apTNzMwShPKvax/VB72C6HaQirMp/kk266m65MxFDZ12hWmzD47ryQlpBexFAgtV6K cB28TXZXomvqOlEyGI6ojhnB/Yz03ng5zXpevOgA= From: David Gibson To: mst@redhat.com Date: Fri, 15 Dec 2017 21:16:48 +1100 Message-Id: <20171215101651.13911-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171215101651.13911-1-david@gibson.dropbear.id.au> References: <20171215101651.13911-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 1/4] tests/pxe-test: Remove unnecessary special case test functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" All of the x86 and some of the other test cases here use a common test function, test_pxe_ipv4(), but one ppc and one s390 test use different functions. In the s390 case, this is completely pointless, the right parameter to test_pxe_ipv4() will already do exactly the right thing. For the spapr-vlan case there's a slight difference - it will use IPv6 instead of IPv4. But testing just one case with IPv6 (and NOT IPv4) is rather haphazard. Change everything to use the common test function, until we have a better way of testing IPv6 across the board. Signed-off-by: David Gibson Reviewed-by: Thomas Huth --- tests/pxe-test.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index 937f29e631..eb70aa2bc6 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -47,16 +47,6 @@ static void test_pxe_ipv4(gconstpointer data) g_free(dev_arg); } -static void test_pxe_spapr_vlan(void) -{ - test_pxe_one("-device spapr-vlan,netdev=" NETNAME, true); -} - -static void test_pxe_virtio_ccw(void) -{ - test_pxe_one("-device virtio-net-ccw,bootindex=1,netdev=" NETNAME, false); -} - int main(int argc, char *argv[]) { int ret; @@ -79,13 +69,14 @@ int main(int argc, char *argv[]) qtest_add_data_func("pxe/vmxnet3", "vmxnet3", test_pxe_ipv4); } } else if (strcmp(arch, "ppc64") == 0) { - qtest_add_func("pxe/spapr-vlan", test_pxe_spapr_vlan); + qtest_add_data_func("pxe/spapr-vlan", "spapr-vlan", test_pxe_ipv4); if (g_test_slow()) { qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_ipv4); qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); } } else if (g_str_equal(arch, "s390x")) { - qtest_add_func("pxe/virtio-ccw", test_pxe_virtio_ccw); + qtest_add_data_func("pxe/virtio-ccw", + "virtio-net-ccw,bootindex=1", test_pxe_ipv4); } ret = g_test_run(); boot_sector_cleanup(disk); From patchwork Fri Dec 15 10:16:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 849077 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="V/jz1ryi"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yymfD6Wnxz9s4q for ; Fri, 15 Dec 2017 21:20:36 +1100 (AEDT) Received: from localhost ([::1]:45478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn6Y-0003IL-Sj for incoming@patchwork.ozlabs.org; Fri, 15 Dec 2017 05:20:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn37-0000pQ-W6 for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePn33-0007BT-Vb for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:01 -0500 Received: from ozlabs.org ([103.22.144.67]:45325) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePn33-00077j-Id; Fri, 15 Dec 2017 05:16:57 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3yymYy5vtRz9t3x; Fri, 15 Dec 2017 21:16:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1513333014; bh=joWlTm1epf5hBfHvHDliqTzrgmYPfSWH2hJmvJa3ATA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/jz1ryiNwrZqFvclDnST6g/rmIP7PpkZkNYDvRDx5/SznAaAplHVIFd7QfDOk9Rl F1Wf+b98gKRjoRWKRufX44tnitV9kpo1T7GxTE1lftxriIiUPz9Veo6f228gP46mSB Xd93lP4w0tWwXP2XMWLvxlmbB/1tsUv6lTOiI3RA= From: David Gibson To: mst@redhat.com Date: Fri, 15 Dec 2017 21:16:49 +1100 Message-Id: <20171215101651.13911-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171215101651.13911-1-david@gibson.dropbear.id.au> References: <20171215101651.13911-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 2/4] tests/pxe-test: Use table of testcases rather than open-coding X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Currently pxe-tests open codes the list of tests for each architecture. This changes it to use tables of test parameters, somewhat similar to boot-serial-test. This adds the machine type into the table as well, giving us the ability to perform tests on multiple machine types for architectures where there's more than one machine type that matters. NOTE: This changes the names of the tests in the output, to include the machine type and IPv4 vs. IPv6. I'm not sure if this has the potential to break existing tooling. Signed-off-by: David Gibson --- tests/pxe-test.c | 94 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 22 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index eb70aa2bc6..f9bca8976d 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -22,29 +22,86 @@ static char disk[] = "tests/pxe-test-disk-XXXXXX"; -static void test_pxe_one(const char *params, bool ipv6) +typedef struct testdef { + const char *machine; /* Machine type */ + const char *model; /* NIC device model (human readable)*/ + const char *extra; /* Extra parameters, overriding default */ +} testdef_t; + +static testdef_t x86_tests[] = { + { "pc", "e1000" }, + { "pc", "virtio", "-device virtio-net-pci,netdev=" NETNAME }, + { NULL }, +}; + +static testdef_t x86_tests_slow[] = { + { "pc", "ne2000", "-device ne2k_pci,netdev=" NETNAME }, + { "pc", "eepro100", "-device i82550,netdev=" NETNAME }, + { "pc", "rtl8139" }, + { "pc", "vmxnet3" }, + { NULL }, +}; + +static testdef_t ppc64_tests[] = { + { "pseries", "spapr-vlan" }, + { NULL }, +}; + +static testdef_t ppc64_tests_slow[] = { + { "pseries", "virtio", "-device virtio-net-pci,netdev=" NETNAME }, + { "pseries", "e1000" }, + { NULL }, +}; + +static testdef_t s390x_tests[] = { + { "s390-ccw-virtio", "virtio-ccw", + "-device virtio-net-ccw,bootindex=1,netdev=" NETNAME }, + { NULL }, +}; + +static void test_pxe_one(const testdef_t *test, bool ipv6) { char *args; + char *defextra; + const char *extra = test->extra; + + defextra = g_strdup_printf("-device %s,netdev=" NETNAME, test->model); + if (!extra) { + extra = defextra; + } - args = g_strdup_printf("-machine accel=kvm:tcg -nodefaults -boot order=n " - "-netdev user,id=" NETNAME ",tftp=./,bootfile=%s," - "ipv4=%s,ipv6=%s %s", disk, ipv6 ? "off" : "on", - ipv6 ? "on" : "off", params); + args = g_strdup_printf( + "-machine %s,accel=kvm:tcg -nodefaults -boot order=n " + "-netdev user,id=" NETNAME ",tftp=./,bootfile=%s,ipv4=%s,ipv6=%s %s", + test->machine, disk, ipv6 ? "off" : "on", ipv6 ? "on" : "off", extra); qtest_start(args); boot_sector_test(); qtest_quit(global_qtest); g_free(args); + g_free(defextra); } static void test_pxe_ipv4(gconstpointer data) { - const char *model = data; - char *dev_arg; + const testdef_t *test = data; + + test_pxe_one(test, false); +} - dev_arg = g_strdup_printf("-device %s,netdev=" NETNAME, model); - test_pxe_one(dev_arg, false); - g_free(dev_arg); +static void test_batch(const testdef_t *tests) +{ + int i; + + for (i = 0; tests[i].machine; i++) { + const testdef_t *test = &tests[i]; + char *testname; + + testname = g_strdup_printf("pxe/ipv4/%s/%s", + test->machine, test->model); + qtest_add_data_func(testname, test, test_pxe_ipv4); + g_free(testname); + } } int main(int argc, char *argv[]) @@ -59,24 +116,17 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { - qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); - qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_ipv4); + test_batch(x86_tests); if (g_test_slow()) { - qtest_add_data_func("pxe/ne2000", "ne2k_pci", test_pxe_ipv4); - qtest_add_data_func("pxe/eepro100", "i82550", test_pxe_ipv4); - qtest_add_data_func("pxe/pcnet", "pcnet", test_pxe_ipv4); - qtest_add_data_func("pxe/rtl8139", "rtl8139", test_pxe_ipv4); - qtest_add_data_func("pxe/vmxnet3", "vmxnet3", test_pxe_ipv4); + test_batch(x86_tests_slow); } } else if (strcmp(arch, "ppc64") == 0) { - qtest_add_data_func("pxe/spapr-vlan", "spapr-vlan", test_pxe_ipv4); + test_batch(ppc64_tests); if (g_test_slow()) { - qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_ipv4); - qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); + test_batch(ppc64_tests_slow); } } else if (g_str_equal(arch, "s390x")) { - qtest_add_data_func("pxe/virtio-ccw", - "virtio-net-ccw,bootindex=1", test_pxe_ipv4); + test_batch(s390x_tests); } ret = g_test_run(); boot_sector_cleanup(disk); From patchwork Fri Dec 15 10:16:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 849081 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="l6bkjUdV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yymhh2YGXz9s4q for ; Fri, 15 Dec 2017 21:22:44 +1100 (AEDT) Received: from localhost ([::1]:45496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn8c-0004yn-DA for incoming@patchwork.ozlabs.org; Fri, 15 Dec 2017 05:22:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn34-0000n1-JI for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePn33-0007Ay-Kk for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:16:58 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:51277) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePn33-00076y-5Y; Fri, 15 Dec 2017 05:16:57 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3yymYy4v3Tz9t2M; Fri, 15 Dec 2017 21:16:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1513333014; bh=4RZcqjI5O+xn1CdZ9Q/+1vfHrTgUE73/+fhwtAT+Rwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l6bkjUdVlPKGIoxmd2ygP0m/63njNwF6BTXlDqS9N8TC1H5IZSRaoElCLH63INeLl LOF+apR8xGAPP5u4SOj7jj+PZ9C4jBoUWC75veP1ZxKh1YZH0fmxBtV2L6R+Bgz6MW Hg7M6S/M4H104r1qbe+GmEAhHoN1ZHB+WgqYy6YE= From: David Gibson To: mst@redhat.com Date: Fri, 15 Dec 2017 21:16:50 +1100 Message-Id: <20171215101651.13911-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171215101651.13911-1-david@gibson.dropbear.id.au> References: <20171215101651.13911-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 3/4] tests/pxe-test: Test net booting over IPv6 in some cases X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This adds IPv6 net boot testing (in addition to IPv4) when in slow test mode on ppc64 or s390. IPv6 PXE doesn't seem to work on x86, I'm guessing out BIOS image doesn't support it. Signed-off-by: David Gibson --- tests/pxe-test.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index f9bca8976d..e7a0610070 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -89,7 +89,14 @@ static void test_pxe_ipv4(gconstpointer data) test_pxe_one(test, false); } -static void test_batch(const testdef_t *tests) +static void test_pxe_ipv6(gconstpointer data) +{ + const testdef_t *test = data; + + test_pxe_one(test, true); +} + +static void test_batch(const testdef_t *tests, bool ipv6) { int i; @@ -101,6 +108,13 @@ static void test_batch(const testdef_t *tests) test->machine, test->model); qtest_add_data_func(testname, test, test_pxe_ipv4); g_free(testname); + + if (ipv6) { + testname = g_strdup_printf("pxe/ipv6/%s/%s", + test->machine, test->model); + qtest_add_data_func(testname, test, test_pxe_ipv6); + g_free(testname); + } } } @@ -116,17 +130,17 @@ int main(int argc, char *argv[]) g_test_init(&argc, &argv, NULL); if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) { - test_batch(x86_tests); + test_batch(x86_tests, false); if (g_test_slow()) { - test_batch(x86_tests_slow); + test_batch(x86_tests_slow, false); } } else if (strcmp(arch, "ppc64") == 0) { - test_batch(ppc64_tests); + test_batch(ppc64_tests, g_test_slow()); if (g_test_slow()) { - test_batch(ppc64_tests_slow); + test_batch(ppc64_tests_slow, true); } } else if (g_str_equal(arch, "s390x")) { - test_batch(s390x_tests); + test_batch(s390x_tests, g_test_slow()); } ret = g_test_run(); boot_sector_cleanup(disk); From patchwork Fri Dec 15 10:16:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 849076 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="IbPcbZfu"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yymcc6W5Kz9sPm for ; Fri, 15 Dec 2017 21:19:12 +1100 (AEDT) Received: from localhost ([::1]:45470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn5D-00026G-0J for incoming@patchwork.ozlabs.org; Fri, 15 Dec 2017 05:19:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePn3A-0000pz-39 for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePn34-0007C3-6D for qemu-devel@nongnu.org; Fri, 15 Dec 2017 05:17:04 -0500 Received: from ozlabs.org ([103.22.144.67]:52551) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePn33-00078I-Qe; Fri, 15 Dec 2017 05:16:58 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3yymYz1MsGz9t3m; Fri, 15 Dec 2017 21:16:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1513333015; bh=+vfX52z7b8PuOOs7jXsoNVoEtaIEdoyszy56p7HmW0Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbPcbZfuSt/mPDVolCZuKSjgZI4o+IB108yAOY3wEcdzZpb1k+Ug8FdwQXZPFOx4x 7QP1/1k3MiQIM0JtTLC1UOdOyGe9LPfW4M3o0dbWOS+LpubJLshEU6sJ1bhXputzCd MrGUEINOQcfTFI/tEx/4u03f1IIa13khmFScNwOA= From: David Gibson To: mst@redhat.com Date: Fri, 15 Dec 2017 21:16:51 +1100 Message-Id: <20171215101651.13911-5-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171215101651.13911-1-david@gibson.dropbear.id.au> References: <20171215101651.13911-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PATCH 4/4] tests/pxe-test: Add some extra tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Previously virtio-net was only tested for ppc64 in "slow" mode. That doesn't make much sense since virtio-net is used much more often in practice than the spapr-vlan device which was tested always. So, move virtio-net to always be tested on ppc64. We had no tests at all for the q35 machine, which doesn't seem wise given it's increasing prominence. Add a couple of tests for it, including testing the newer e1000e adapter. Signed-off-by: David Gibson --- tests/pxe-test.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index e7a0610070..16e2520940 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -31,6 +31,8 @@ typedef struct testdef { static testdef_t x86_tests[] = { { "pc", "e1000" }, { "pc", "virtio", "-device virtio-net-pci,netdev=" NETNAME }, + { "q35", "e1000e" }, + { "q35", "virtio", "-device virtio-net-pci,netdev=" NETNAME }, { NULL }, }; @@ -44,11 +46,11 @@ static testdef_t x86_tests_slow[] = { static testdef_t ppc64_tests[] = { { "pseries", "spapr-vlan" }, + { "pseries", "virtio", "-device virtio-net-pci,netdev=" NETNAME }, { NULL }, }; static testdef_t ppc64_tests_slow[] = { - { "pseries", "virtio", "-device virtio-net-pci,netdev=" NETNAME }, { "pseries", "e1000" }, { NULL }, };