[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] net/filter-mirror.c: Rename filter_mirror_send()
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 7/9] net/filter-mirror.c: Rename filter_mirror_send() and fix codestyle |
Date: |
Tue, 23 May 2017 10:43:57 +0800 |
From: Zhang Chen <address@hidden>
Because filter_mirror_receive_iov() and filter_redirector_receive_iov()
both use the filter_mirror_send() to send packet, so I change
filter_mirror_send() to filter_send() that looks more common.
And fix some codestyle.
Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/filter-mirror.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index fd0322f..8b1b069 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -43,9 +43,9 @@ typedef struct MirrorState {
SocketReadState rs;
} MirrorState;
-static int filter_mirror_send(CharBackend *chr_out,
- const struct iovec *iov,
- int iovcnt)
+static int filter_send(CharBackend *chr_out,
+ const struct iovec *iov,
+ int iovcnt)
{
int ret = 0;
ssize_t size = 0;
@@ -141,9 +141,9 @@ static ssize_t filter_mirror_receive_iov(NetFilterState *nf,
MirrorState *s = FILTER_MIRROR(nf);
int ret;
- ret = filter_mirror_send(&s->chr_out, iov, iovcnt);
+ ret = filter_send(&s->chr_out, iov, iovcnt);
if (ret) {
- error_report("filter_mirror_send failed(%s)", strerror(-ret));
+ error_report("filter mirror send failed(%s)", strerror(-ret));
}
/*
@@ -164,9 +164,9 @@ static ssize_t filter_redirector_receive_iov(NetFilterState
*nf,
int ret;
if (qemu_chr_fe_get_driver(&s->chr_out)) {
- ret = filter_mirror_send(&s->chr_out, iov, iovcnt);
+ ret = filter_send(&s->chr_out, iov, iovcnt);
if (ret) {
- error_report("filter_mirror_send failed(%s)", strerror(-ret));
+ error_report("filter redirector send failed(%s)", strerror(-ret));
}
return iov_size(iov, iovcnt);
} else {
@@ -286,8 +286,9 @@ static char *filter_redirector_get_indev(Object *obj, Error
**errp)
return g_strdup(s->indev);
}
-static void
-filter_redirector_set_indev(Object *obj, const char *value, Error **errp)
+static void filter_redirector_set_indev(Object *obj,
+ const char *value,
+ Error **errp)
{
MirrorState *s = FILTER_REDIRECTOR(obj);
@@ -302,8 +303,9 @@ static char *filter_mirror_get_outdev(Object *obj, Error
**errp)
return g_strdup(s->outdev);
}
-static void
-filter_mirror_set_outdev(Object *obj, const char *value, Error **errp)
+static void filter_mirror_set_outdev(Object *obj,
+ const char *value,
+ Error **errp)
{
MirrorState *s = FILTER_MIRROR(obj);
@@ -323,8 +325,9 @@ static char *filter_redirector_get_outdev(Object *obj,
Error **errp)
return g_strdup(s->outdev);
}
-static void
-filter_redirector_set_outdev(Object *obj, const char *value, Error **errp)
+static void filter_redirector_set_outdev(Object *obj,
+ const char *value,
+ Error **errp)
{
MirrorState *s = FILTER_REDIRECTOR(obj);
--
2.7.4
- [Qemu-devel] [PULL 0/9] Net patches, Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 1/9] net/tap: Replace tap-haiku.c and tap-aix.c by a generic tap-stub.c, Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 2/9] net/dump: Issue a warning for the deprecated "-net dump", Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 3/9] virtio-net: fix wild pointer when remove virtio-net queues, Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 4/9] COLO-compare: Improve tcp compare trace event readability, Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 5/9] hmp / net: Mark host_net_add/remove as deprecated, Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 6/9] net/filter-mirror.c: Remove duplicate check code., Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 7/9] net/filter-mirror.c: Rename filter_mirror_send() and fix codestyle,
Jason Wang <=
- [Qemu-devel] [PULL 8/9] net/filter-rewriter: Remove unused option in filter-rewriter, Jason Wang, 2017/05/22
- [Qemu-devel] [PULL 9/9] e1000e: Fix ICR "Other" causes clear logic, Jason Wang, 2017/05/22
- Re: [Qemu-devel] [PULL 0/9] Net patches, Stefan Hajnoczi, 2017/05/23