From: "Michael S. Tsirkin" <mst@redhat.com>
To: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
Cc: qemu-devel@nongnu.org, quintela@redhat.com, jasowang@redhat.com,
eblake@redhat.com, armbru@redhat.com, berrange@redhat.com
Subject: Re: [Qemu-devel] [PATCH 9/9] tests: Add a test for qemu self announcments
Date: Mon, 28 Jan 2019 12:05:34 -0500 [thread overview]
Message-ID: <20190128120446-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20190128170321.16936-10-dgilbert@redhat.com>
On Mon, Jan 28, 2019 at 05:03:21PM +0000, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> We now expose qemu_announce_self through QMP and HMP. Add a test
> with some very basic packet validation (make sure we get a RARP).
>
> Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
typo in subject
> ---
> tests/Makefile.include | 2 +
> tests/test-announce-self.c | 83 ++++++++++++++++++++++++++++++++++++++
> 2 files changed, 85 insertions(+)
> create mode 100644 tests/test-announce-self.c
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 19b4c0a696..57ce722d73 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -143,6 +143,8 @@ check-qtest-generic-y += tests/qmp-cmd-test$(EXESUF)
>
> check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
> check-qtest-generic-y += tests/cdrom-test$(EXESUF)
> +check-qtest-generic-y += tests/test-announce-self$(EXESUF)
> +gcov-files-generic-y = migration/savevm.c
>
> check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
>
> diff --git a/tests/test-announce-self.c b/tests/test-announce-self.c
> new file mode 100644
> index 0000000000..2ff0c77255
> --- /dev/null
> +++ b/tests/test-announce-self.c
> @@ -0,0 +1,83 @@
> +/*
> + * 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': {"
> + " 'params': {"
> + " '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();
> +}
> --
> 2.20.1
next prev parent reply other threads:[~2019-01-28 17:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-28 17:03 [Qemu-devel] [PATCH 0/9] Network announce changes Dr. David Alan Gilbert (git)
2019-01-28 17:03 ` [Qemu-devel] [PATCH 1/9] net: Introduce announce timer Dr. David Alan Gilbert (git)
2019-01-28 17:42 ` Eric Blake
2019-01-29 11:27 ` Dr. David Alan Gilbert
2019-01-28 17:03 ` [Qemu-devel] [PATCH 2/9] migration: Add announce parameters Dr. David Alan Gilbert (git)
2019-01-28 17:45 ` Eric Blake
2019-01-29 11:34 ` Dr. David Alan Gilbert
2019-02-01 18:17 ` Markus Armbruster
2019-02-04 11:48 ` Dr. David Alan Gilbert
2019-01-28 17:03 ` [Qemu-devel] [PATCH 3/9] virtio-net: Switch to using announce timer Dr. David Alan Gilbert (git)
2019-01-28 17:03 ` [Qemu-devel] [PATCH 4/9] migration: " Dr. David Alan Gilbert (git)
2019-01-28 17:03 ` [Qemu-devel] [PATCH 5/9] net: Add a network device specific self-announcement ability Dr. David Alan Gilbert (git)
2019-01-28 17:03 ` [Qemu-devel] [PATCH 6/9] virtio-net: Allow qemu_announce_self to trigger virtio announcements Dr. David Alan Gilbert (git)
2019-01-28 17:03 ` [Qemu-devel] [PATCH 7/9] qmp: Add announce-self command Dr. David Alan Gilbert (git)
2019-01-28 17:47 ` Eric Blake
2019-01-29 11:42 ` Dr. David Alan Gilbert
2019-01-28 17:03 ` [Qemu-devel] [PATCH 8/9] hmp: Add hmp_announce_self Dr. David Alan Gilbert (git)
2019-01-28 17:03 ` [Qemu-devel] [PATCH 9/9] tests: Add a test for qemu self announcments Dr. David Alan Gilbert (git)
2019-01-28 17:05 ` Michael S. Tsirkin [this message]
2019-01-29 10:45 ` Dr. David Alan Gilbert
2019-01-28 17:12 ` [Qemu-devel] [PATCH 0/9] Network announce changes Michael S. Tsirkin
2019-01-28 17:25 ` Dr. David Alan Gilbert
2019-02-01 18:07 ` Markus Armbruster
2019-02-04 11:19 ` Dr. David Alan Gilbert
2019-02-03 15:52 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190128120446-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.