From patchwork Tue Mar 12 16:57:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1055572 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=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oncpXEEL"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JhXK2Wkrz9sBb for ; Wed, 13 Mar 2019 04:18:57 +1100 (AEDT) Received: from localhost ([127.0.0.1]:56238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3l3G-0005aT-Qz for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 13:18:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kip-0005i5-LK for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3kio-0004TJ-BP for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:57:47 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46238) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3kio-0004SS-1z for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:57:46 -0400 Received: by mail-wr1-x443.google.com with SMTP id 33so1005332wrb.13 for ; Tue, 12 Mar 2019 09:57:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LyoezgX4NlBI+2OF2FW7pWRaX0R0WYGu6DUJUQrdZ4g=; b=oncpXEELSOfTOmF3aQBbte/KbWxF7BuiBjtLt0whhUaIHajwZtDwVbCqeHhsX9Z0QG sdyrVJvWrhTVvbdKB4pdzJGnbJseP3hBIcH5uDkJ4P85+8O9ZiMcmQQO2eV6WoF2HS0m odrGXI75DzaOE4B3IXH9ksRc4DLgwfMnC54wZmwi2c296NbYYMhag7Gvtdq4c+3vd0Jc Pbqd5qGCXyNyDcrC7mfPSuKFJ2y/CNvDVtOICIeYkPRsNhLDbqyPitHOx3sksZxpV95Q nfHzXIZbKm3xlXP+HGxUfJYEbjnpV+26cKGiCt5Q2AY/8jX1KvE+G5Scs54B4IUkNaJ9 tuDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=LyoezgX4NlBI+2OF2FW7pWRaX0R0WYGu6DUJUQrdZ4g=; b=CijzED4o24CFC6WD1ugt+fb0+ew6KKsJjS0Zu1swMaChZbLMbKCeDQWs4JVdfg3PAi LXt0Ms1dyX40BGu2kd69q8XGWiMi97uQ0uagrA0qnIBKGZRgQC9Ivv/LHyca596Nt+kO FmzUBZXYHobnpdipYSDueiHxK3/xPCDvrEwMQrKhtcKfoqJqN8pfiAOXWtfY7zorj022 J+7BFuDeQesqNVVkOkcD/X8y9ues1txEkY1H+GQlhOYHId9ZUkZkuugxZWqnMoTRCpdG s0SAoH7P2h6uFmaycQvOHSka8mC6PGXfgGo5GL3btzMVE4URLX8zlL1++SS7d3tgzVUh THXg== X-Gm-Message-State: APjAAAVMZ6agnBi73lTq3w3Gry47TtQyhXuRWq2ZmpuoPUnLzv1/CShy 8MYu6cW2zIeMHcJKhdzO83YWbEw5 X-Google-Smtp-Source: APXvYqy8f09Ce3t1KkPHNc0cnU4mc1qrugN4oe8GkainE3j89sTPyB6XS3CbqP21A6tlmAIY4awImQ== X-Received: by 2002:a5d:6682:: with SMTP id l2mr23702191wru.271.1552409864581; Tue, 12 Mar 2019 09:57:44 -0700 (PDT) Received: from donizetti.fritz.box ([151.20.136.223]) by smtp.gmail.com with ESMTPSA id d1sm10287026wrs.13.2019.03.12.09.57.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:57:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 17:57:42 +0100 Message-Id: <20190312165742.31510-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH] test-announce-self: convert to qgraph 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, dgilbert@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This removes the duplicated initialization code. Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert --- tests/Makefile.include | 3 -- tests/test-announce-self.c | 82 -------------------------------------- tests/virtio-net-test.c | 30 ++++++++++++++ 3 files changed, 30 insertions(+), 85 deletions(-) delete mode 100644 tests/test-announce-self.c diff --git a/tests/Makefile.include b/tests/Makefile.include index a5719551dd..56764c7543 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -195,7 +195,6 @@ check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF) check-qtest-i386-y += tests/migration-test$(EXESUF) -check-qtest-i386-y += tests/test-announce-self$(EXESUF) check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF) check-qtest-i386-y += tests/numa-test$(EXESUF) check-qtest-x86_64-y += $(check-qtest-i386-y) @@ -232,7 +231,6 @@ check-qtest-ppc64-y += $(check-qtest-ppc-y) check-qtest-ppc64-$(CONFIG_PSERIES) += tests/device-plug-test$(EXESUF) check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF) check-qtest-ppc64-y += tests/migration-test$(EXESUF) -check-qtest-ppc64-y += tests/test-announce-self$(EXESUF) check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF) check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF) check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF) @@ -817,7 +815,6 @@ tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y) tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o tests/migration-test$(EXESUF): tests/migration-test.o -tests/test-announce-self$(EXESUF): tests/test-announce-self.o tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y) diff --git a/tests/test-announce-self.c b/tests/test-announce-self.c deleted file mode 100644 index 1644d34a3f..0000000000 --- a/tests/test-announce-self.c +++ /dev/null @@ -1,82 +0,0 @@ -/* - * QTest testcase for qemu_announce_self - * - * Copyright (c) 2017 Red hat, Inc. - * Copyright (c) 2014 SUSE LINUX Products GmbH - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qemu-common.h" -#include "qemu/sockets.h" -#include "qemu/iov.h" -#include "libqos/libqos-pc.h" -#include "libqos/libqos-spapr.h" - -#ifndef ETH_P_RARP -#define ETH_P_RARP 0x8035 -#endif - -static QTestState *test_init(int socket) -{ - char *args; - - args = g_strdup_printf("-netdev socket,fd=%d,id=hs0 -device " - "virtio-net-pci,netdev=hs0", socket); - - return qtest_start(args); -} - - -static void test_announce(int socket) -{ - char buffer[60]; - int len; - QDict *rsp; - int ret; - uint16_t *proto = (uint16_t *)&buffer[12]; - - rsp = qmp("{ 'execute' : 'announce-self', " - " 'arguments': {" - " 'initial': 50, 'max': 550," - " 'rounds': 10, 'step': 50 } }"); - assert(!qdict_haskey(rsp, "error")); - qobject_unref(rsp); - - /* Catch the packet and make sure it's a RARP */ - ret = qemu_recv(socket, &len, sizeof(len), 0); - g_assert_cmpint(ret, ==, sizeof(len)); - len = ntohl(len); - - ret = qemu_recv(socket, buffer, len, 0); - g_assert_cmpint(*proto, ==, htons(ETH_P_RARP)); -} - -static void setup(gconstpointer data) -{ - QTestState *qs; - void (*func) (int socket) = data; - int sv[2], ret; - - ret = socketpair(PF_UNIX, SOCK_STREAM, 0, sv); - g_assert_cmpint(ret, !=, -1); - - qs = test_init(sv[1]); - func(sv[0]); - - /* End test */ - close(sv[0]); - qtest_quit(qs); -} - -int main(int argc, char **argv) -{ - g_test_init(&argc, &argv, NULL); - qtest_add_data_func("/virtio/net/test_announce_self", test_announce, setup); - - return g_test_run(); -} diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index c58e670e2f..0d956f36fe 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -15,6 +15,10 @@ #include "libqos/qgraph.h" #include "libqos/virtio-net.h" +#ifndef ETH_P_RARP +#define ETH_P_RARP 0x8035 +#endif + #define PCI_SLOT_HP 0x06 #define PCI_SLOT 0x04 @@ -168,6 +172,31 @@ static void hotplug(void *obj, void *data, QGuestAllocator *t_alloc) } } +static void announce_self(void *obj, void *data, QGuestAllocator *t_alloc) +{ + int *sv = data; + char buffer[60]; + int len; + QDict *rsp; + int ret; + uint16_t *proto = (uint16_t *)&buffer[12]; + + rsp = qmp("{ 'execute' : 'announce-self', " + " 'arguments': {" + " 'initial': 50, 'max': 550," + " 'rounds': 10, 'step': 50 } }"); + assert(!qdict_haskey(rsp, "error")); + qobject_unref(rsp); + + /* Catch the packet and make sure it's a RARP */ + ret = qemu_recv(sv[0], &len, sizeof(len), 0); + g_assert_cmpint(ret, ==, sizeof(len)); + len = ntohl(len); + + ret = qemu_recv(sv[0], buffer, len, 0); + g_assert_cmpint(*proto, ==, htons(ETH_P_RARP)); +} + static void virtio_net_test_cleanup(void *sockets) { int *sv = sockets; @@ -233,6 +262,7 @@ static void register_virtio_net_test(void) qos_add_test("basic", "virtio-net", send_recv_test, &opts); qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts); #endif + qos_add_test("announce-self", "virtio-net", announce_self, &opts); /* These tests do not need a loopback backend. */ opts.before = virtio_net_test_setup_nosocket;