mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQEcBAABAgAGBQJWG2e/AAoJEO8Ells5jWIRcYcH/2D11W8cToCBjGDuw/u9K1ht S3oGyFasOEq3lm3+a3zQE+vDw0RDkjLEMhcTVwNskJQl6k6Ts5JleTZ6wffvUKPM UCozgPOCt1ZAdGskwdbByc+NhaVBHIiEsmlbDKqP22CENdDx6GWjcFW4brA4tQJQ AW36EH77j/M+7/KiSukcUfIexILUZJRfN+ICJVyNTpGsqUNJtFqiVPBMPyJhKCEq 3pr3yJ2lf78SAEF5kBeBc9r/PDWUhtqExBsrK0L8Ey1FdrCy8ldqDPGecT4TsxNv W/KX5AqhKSsMI8DQKdbv/IKaUdjYWNjTRQ2Qjm8Vt0hcW0PhxR0NYi6bV4yjDNM= =f26Q -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Mon 12 Oct 2015 08:56:47 BST using RSA key ID 398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: tests: add test cases for netfilter object netfilter: add a netbuffer filter net/queue: export qemu_net_queue_append_iov netfilter: print filter info associate with the netdev netfilter: add an API to pass the packet to next filter net/queue: introduce NetQueueDeliverFunc net: merge qemu_deliver_packet and qemu_deliver_packet_iov netfilter: hook packets before net queue send init/cleanup of netfilter object vl.c: init delayed object after net_init_clients vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO command e1000: use alias for default model vmxnet3: Support reading IMR registers on bar0 net/vmxnet3: Refine l2 header validation Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
0bf224d5da
20 changed files with 918 additions and 66 deletions
1
tests/.gitignore
vendored
1
tests/.gitignore
vendored
|
|
@ -49,5 +49,6 @@ test-vmstate
|
|||
test-write-threshold
|
||||
test-x86-cpuid
|
||||
test-xbzrle
|
||||
test-netfilter
|
||||
*-test
|
||||
qapi-schema/*.test.*
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@ gcov-files-i386-y += hw/pci-host/q35.c
|
|||
ifeq ($(CONFIG_VHOST_NET),y)
|
||||
check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
|
||||
endif
|
||||
check-qtest-i386-y += tests/test-netfilter$(EXESUF)
|
||||
check-qtest-x86_64-y = $(check-qtest-i386-y)
|
||||
gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
|
||||
gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
|
||||
|
|
@ -438,6 +439,7 @@ tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.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-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)
|
||||
tests/test-netfilter$(EXESUF): tests/test-netfilter.o $(qtest-obj-y)
|
||||
|
||||
ifeq ($(CONFIG_POSIX),y)
|
||||
LIBS += -lutil
|
||||
|
|
|
|||
200
tests/test-netfilter.c
Normal file
200
tests/test-netfilter.c
Normal file
|
|
@ -0,0 +1,200 @@
|
|||
/*
|
||||
* QTest testcase for netfilter
|
||||
*
|
||||
* Copyright (c) 2015 FUJITSU LIMITED
|
||||
* Author: Yang Hongyang <yanghy@cn.fujitsu.com>
|
||||
*
|
||||
* 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 <glib.h>
|
||||
#include "libqtest.h"
|
||||
|
||||
/* add a netfilter to a netdev and then remove it */
|
||||
static void add_one_netfilter(void)
|
||||
{
|
||||
QDict *response;
|
||||
|
||||
response = qmp("{'execute': 'object-add',"
|
||||
" 'arguments': {"
|
||||
" 'qom-type': 'filter-buffer',"
|
||||
" 'id': 'qtest-f0',"
|
||||
" 'props': {"
|
||||
" 'netdev': 'qtest-bn0',"
|
||||
" 'queue': 'rx',"
|
||||
" 'interval': 1000"
|
||||
"}}}");
|
||||
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'object-del',"
|
||||
" 'arguments': {"
|
||||
" 'id': 'qtest-f0'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
}
|
||||
|
||||
/* add a netfilter to a netdev and then remove the netdev */
|
||||
static void remove_netdev_with_one_netfilter(void)
|
||||
{
|
||||
QDict *response;
|
||||
|
||||
response = qmp("{'execute': 'object-add',"
|
||||
" 'arguments': {"
|
||||
" 'qom-type': 'filter-buffer',"
|
||||
" 'id': 'qtest-f0',"
|
||||
" 'props': {"
|
||||
" 'netdev': 'qtest-bn0',"
|
||||
" 'queue': 'rx',"
|
||||
" 'interval': 1000"
|
||||
"}}}");
|
||||
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'netdev_del',"
|
||||
" 'arguments': {"
|
||||
" 'id': 'qtest-bn0'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
/* add back the netdev */
|
||||
response = qmp("{'execute': 'netdev_add',"
|
||||
" 'arguments': {"
|
||||
" 'type': 'user',"
|
||||
" 'id': 'qtest-bn0'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
}
|
||||
|
||||
/* add multi(2) netfilters to a netdev and then remove them */
|
||||
static void add_multi_netfilter(void)
|
||||
{
|
||||
QDict *response;
|
||||
|
||||
response = qmp("{'execute': 'object-add',"
|
||||
" 'arguments': {"
|
||||
" 'qom-type': 'filter-buffer',"
|
||||
" 'id': 'qtest-f0',"
|
||||
" 'props': {"
|
||||
" 'netdev': 'qtest-bn0',"
|
||||
" 'queue': 'rx',"
|
||||
" 'interval': 1000"
|
||||
"}}}");
|
||||
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'object-add',"
|
||||
" 'arguments': {"
|
||||
" 'qom-type': 'filter-buffer',"
|
||||
" 'id': 'qtest-f1',"
|
||||
" 'props': {"
|
||||
" 'netdev': 'qtest-bn0',"
|
||||
" 'queue': 'rx',"
|
||||
" 'interval': 1000"
|
||||
"}}}");
|
||||
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'object-del',"
|
||||
" 'arguments': {"
|
||||
" 'id': 'qtest-f0'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'object-del',"
|
||||
" 'arguments': {"
|
||||
" 'id': 'qtest-f1'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
}
|
||||
|
||||
/* add multi(2) netfilters to a netdev and then remove the netdev */
|
||||
static void remove_netdev_with_multi_netfilter(void)
|
||||
{
|
||||
QDict *response;
|
||||
|
||||
response = qmp("{'execute': 'object-add',"
|
||||
" 'arguments': {"
|
||||
" 'qom-type': 'filter-buffer',"
|
||||
" 'id': 'qtest-f0',"
|
||||
" 'props': {"
|
||||
" 'netdev': 'qtest-bn0',"
|
||||
" 'queue': 'rx',"
|
||||
" 'interval': 1000"
|
||||
"}}}");
|
||||
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'object-add',"
|
||||
" 'arguments': {"
|
||||
" 'qom-type': 'filter-buffer',"
|
||||
" 'id': 'qtest-f1',"
|
||||
" 'props': {"
|
||||
" 'netdev': 'qtest-bn0',"
|
||||
" 'queue': 'rx',"
|
||||
" 'interval': 1000"
|
||||
"}}}");
|
||||
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
response = qmp("{'execute': 'netdev_del',"
|
||||
" 'arguments': {"
|
||||
" 'id': 'qtest-bn0'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
|
||||
/* add back the netdev */
|
||||
response = qmp("{'execute': 'netdev_add',"
|
||||
" 'arguments': {"
|
||||
" 'type': 'user',"
|
||||
" 'id': 'qtest-bn0'"
|
||||
"}}");
|
||||
g_assert(response);
|
||||
g_assert(!qdict_haskey(response, "error"));
|
||||
QDECREF(response);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int ret;
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
qtest_add_func("/netfilter/addremove_one", add_one_netfilter);
|
||||
qtest_add_func("/netfilter/remove_netdev_one",
|
||||
remove_netdev_with_one_netfilter);
|
||||
qtest_add_func("/netfilter/addremove_multi", add_multi_netfilter);
|
||||
qtest_add_func("/netfilter/remove_netdev_multi",
|
||||
remove_netdev_with_multi_netfilter);
|
||||
|
||||
qtest_start("-netdev user,id=qtest-bn0 -device e1000,netdev=qtest-bn0");
|
||||
ret = g_test_run();
|
||||
|
||||
qtest_end();
|
||||
|
||||
return ret;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue