From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Jason Wang <jasowang@redhat.com>,
Vincenzo Maffione <v.maffione@gmail.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Giuseppe Lettieri <g.lettieri@iet.unipi.it>,
Luigi Rizzo <rizzo@iet.unipi.it>
Subject: [Qemu-devel] [RFC PATCH v2 03/13] l2tpv3: Drop l2tpv3_can_send
Date: Thu, 14 May 2015 11:34:19 +0800 [thread overview]
Message-ID: <1431574469-9605-4-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1431574469-9605-1-git-send-email-famz@redhat.com>
This callback is called by main loop before polling s->fd, if it returns
false, the fd will not be polled in this iteration.
This is redundant with checks inside read callback. After this patch,
the data will be copied from s->fd to s->msgvec when it arrives. If the
device can't receive, it will be queued to incoming_queue, and when the
device status changes, this queue will be flushed.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
net/l2tpv3.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index 8c598b0..8eed06b 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -133,14 +133,12 @@ typedef struct NetL2TPV3State {
} NetL2TPV3State;
-static int l2tpv3_can_send(void *opaque);
static void net_l2tpv3_send(void *opaque);
static void l2tpv3_writable(void *opaque);
static void l2tpv3_update_fd_handler(NetL2TPV3State *s)
{
- qemu_set_fd_handler2(s->fd,
- s->read_poll ? l2tpv3_can_send : NULL,
+ qemu_set_fd_handler2(s->fd, NULL,
s->read_poll ? net_l2tpv3_send : NULL,
s->write_poll ? l2tpv3_writable : NULL,
s);
@@ -169,13 +167,6 @@ static void l2tpv3_writable(void *opaque)
qemu_flush_queued_packets(&s->nc);
}
-static int l2tpv3_can_send(void *opaque)
-{
- NetL2TPV3State *s = opaque;
-
- return qemu_can_send_packet(&s->nc);
-}
-
static void l2tpv3_send_completed(NetClientState *nc, ssize_t len)
{
NetL2TPV3State *s = DO_UPCAST(NetL2TPV3State, nc, nc);
--
2.4.0
next prev parent reply other threads:[~2015-05-14 3:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 3:34 [Qemu-devel] [RFC PATCH v2 00/13] main-loop: Get rid of fd_read_poll and qemu_set_fd_handler2 Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 01/13] stubs: Add qemu_set_fd_handler Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 02/13] qemu-nbd: Switch to qemu_set_fd_handler Fam Zheng
2015-05-14 3:34 ` Fam Zheng [this message]
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 04/13] netmap: Drop netmap_can_send Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 05/13] net/socket: Drop net_socket_can_send Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 06/13] tap: Drop tap_can_send Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 07/13] Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 08/13] main-loop: Drop qemu_set_fd_handler2 Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 09/13] alsaaudio: Remove unused error handling of qemu_set_fd_handler Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 10/13] oss: " Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 11/13] xen_backend: " Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 12/13] event-notifier: Always return 0 for posix implementation Fam Zheng
2015-05-14 3:34 ` [Qemu-devel] [RFC PATCH v2 13/13] iohandler: Use AioContext internally Fam Zheng
2015-05-14 4:35 ` Fam Zheng
2015-05-14 9:30 ` Paolo Bonzini
2015-05-14 4:39 ` [Qemu-devel] [RFC PATCH v2 00/13] main-loop: Get rid of fd_read_poll and qemu_set_fd_handler2 Fam Zheng
2015-05-14 9:36 ` Paolo Bonzini
2015-05-14 13:43 ` Fam Zheng
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=1431574469-9605-4-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=g.lettieri@iet.unipi.it \
--cc=jasowang@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rizzo@iet.unipi.it \
--cc=stefanha@redhat.com \
--cc=v.maffione@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).