1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] test-announce-self: convert to qgraph

Paolo Bonzini posted 1 patch 5 years, 1 month ago
Test asan failed
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Test checkpatch passed
Failed in applying to current master (apply log)
There is a newer version of this series
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
[Qemu-devel] [PATCH] test-announce-self: convert to qgraph
Posted by Paolo Bonzini 5 years, 1 month ago 
This removes the duplicated initialization code.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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;
-- 
2.20.1
Re: [Qemu-devel] [PATCH] test-announce-self: convert to qgraph
Posted by Dr. David Alan Gilbert 5 years, 1 month ago 
* Paolo Bonzini (pbonzini@redhat.com) wrote:
> This removes the duplicated initialization code.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  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;
> -- 
> 2.20.1
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Re: [Qemu-devel] [PATCH] test-announce-self: convert to qgraph
Posted by Thomas Huth 5 years, 1 month ago 
On 12/03/2019 17.57, Paolo Bonzini wrote:
> This removes the duplicated initialization code.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  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);
> -}

This function has recently been removed to fix the memory leak here.
Could you please rebase your patch?

 Thomas

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.