From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un3SQ-0006BQ-HF for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:04:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un3SP-0003av-AU for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:04:38 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:57660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un3SP-0003ao-3L for qemu-devel@nongnu.org; Thu, 13 Jun 2013 05:04:37 -0400 Received: by mail-pd0-f173.google.com with SMTP id v14so7202993pde.18 for ; Thu, 13 Jun 2013 02:04:36 -0700 (PDT) From: Liu Ping Fan Date: Thu, 13 Jun 2013 17:03:04 +0800 Message-Id: <1371114186-8854-5-git-send-email-qemulist@gmail.com> In-Reply-To: <1371114186-8854-1-git-send-email-qemulist@gmail.com> References: <1371114186-8854-1-git-send-email-qemulist@gmail.com> Subject: [Qemu-devel] [PATCH v2 4/6] net: force NetQue opaque to be NetClientState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth , Stefan Hajnoczi From: Liu Ping Fan qemu_net_client_setup() is the only user of qemu_new_net_queue(), which will pass in NetClientState. By forcing it be a NetClientState, we can ref/unref NetQueue's owner Signed-off-by: Liu Ping Fan --- include/net/queue.h | 2 +- net/queue.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/queue.h b/include/net/queue.h index fc02b33..ddb6d98 100644 --- a/include/net/queue.h +++ b/include/net/queue.h @@ -34,7 +34,7 @@ typedef void (NetPacketSent) (NetClientState *sender, ssize_t ret); #define QEMU_NET_PACKET_FLAG_NONE 0 #define QEMU_NET_PACKET_FLAG_RAW (1<<0) -NetQueue *qemu_new_net_queue(void *opaque); +NetQueue *qemu_new_net_queue(NetClientState *opaque); void qemu_del_net_queue(NetQueue *queue); diff --git a/net/queue.c b/net/queue.c index 7d6c52e..58222b0 100644 --- a/net/queue.c +++ b/net/queue.c @@ -49,7 +49,7 @@ struct NetPacket { }; struct NetQueue { - void *opaque; + NetClientState *opaque; uint32_t nq_maxlen; uint32_t nq_count; @@ -59,7 +59,7 @@ struct NetQueue { unsigned delivering : 1; }; -NetQueue *qemu_new_net_queue(void *opaque) +NetQueue *qemu_new_net_queue(NetClientState *opaque) { NetQueue *queue; -- 1.8.1.4