From patchwork Wed Nov 25 18:48:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 39416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC42EB6F1A for ; Thu, 26 Nov 2009 05:56:21 +1100 (EST) Received: from localhost ([127.0.0.1]:39600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDN2I-0000Br-Di for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2009 13:56:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDMye-0007M0-EV for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:32 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDMyZ-0007GI-L3 for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:29 -0500 Received: from [199.232.76.173] (port=48987 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDMyW-0007GB-QU for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25327) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDMyV-0000Df-RS for qemu-devel@nongnu.org; Wed, 25 Nov 2009 13:52:24 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqMn3016106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Nov 2009 13:52:23 -0500 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqLgl026869; Wed, 25 Nov 2009 13:52:22 -0500 Received: by blaa.localdomain (Postfix, from userid 500) id 68231B07D; Wed, 25 Nov 2009 18:49:39 +0000 (GMT) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Wed, 25 Nov 2009 18:48:55 +0000 Message-Id: <1259174977-26212-3-git-send-email-markmc@redhat.com> In-Reply-To: <1259174977-26212-1-git-send-email-markmc@redhat.com> References: <1259174977-26212-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 02/44] net: move vde code from net.c to net/vde.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Mark McLoughlin --- Makefile | 1 + net.c | 102 +------------------------------------------------- net/vde.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ net/vde.h | 36 ++++++++++++++++++ 4 files changed, 162 insertions(+), 101 deletions(-) create mode 100644 net/vde.c create mode 100644 net/vde.h diff --git a/Makefile b/Makefile index 45362fa..ee00ecc 100644 --- a/Makefile +++ b/Makefile @@ -107,6 +107,7 @@ net-nested-$(CONFIG_BSD) += tap-bsd.o net-nested-$(CONFIG_SOLARIS) += tap-solaris.o net-nested-$(CONFIG_AIX) += tap-aix.o net-nested-$(CONFIG_SLIRP) += slirp.o +net-nested-$(CONFIG_VDE) += vde.o net-obj-y += $(addprefix net/, $(net-nested-y)) ###################################################################### diff --git a/net.c b/net.c index 9b030a1..5f8457c 100644 --- a/net.c +++ b/net.c @@ -89,14 +89,11 @@ #include #endif -#if defined(CONFIG_VDE) -#include -#endif - #include "qemu-common.h" #include "net.h" #include "net/tap.h" #include "net/slirp.h" +#include "net/vde.h" #include "monitor.h" #include "sysemu.h" #include "qemu-timer.h" @@ -722,75 +719,6 @@ qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov, int iovcnt) return qemu_sendv_packet_async(vc, iov, iovcnt, NULL); } -#if defined(CONFIG_VDE) -typedef struct VDEState { - VLANClientState *vc; - VDECONN *vde; -} VDEState; - -static void vde_to_qemu(void *opaque) -{ - VDEState *s = opaque; - uint8_t buf[4096]; - int size; - - size = vde_recv(s->vde, (char *)buf, sizeof(buf), 0); - if (size > 0) { - qemu_send_packet(s->vc, buf, size); - } -} - -static ssize_t vde_receive(VLANClientState *vc, const uint8_t *buf, size_t size) -{ - VDEState *s = vc->opaque; - ssize_t ret; - - do { - ret = vde_send(s->vde, (const char *)buf, size, 0); - } while (ret < 0 && errno == EINTR); - - return ret; -} - -static void vde_cleanup(VLANClientState *vc) -{ - VDEState *s = vc->opaque; - qemu_set_fd_handler(vde_datafd(s->vde), NULL, NULL, NULL); - vde_close(s->vde); - qemu_free(s); -} - -static int net_vde_init(VLANState *vlan, const char *model, - const char *name, const char *sock, - int port, const char *group, int mode) -{ - VDEState *s; - char *init_group = (char *)group; - char *init_sock = (char *)sock; - - struct vde_open_args args = { - .port = port, - .group = init_group, - .mode = mode, - }; - - s = qemu_mallocz(sizeof(VDEState)); - s->vde = vde_open(init_sock, (char *)"QEMU", &args); - if (!s->vde){ - free(s); - return -1; - } - s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_VDE, - vlan, NULL, model, name, NULL, - vde_receive, NULL, NULL, - vde_cleanup, s); - qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s); - snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d", - sock, vde_datafd(s->vde)); - return 0; -} -#endif - /* network connection */ typedef struct NetSocketState { VLANClientState *vc; @@ -1603,34 +1531,6 @@ static int net_init_socket(QemuOpts *opts, return 0; } -#ifdef CONFIG_VDE -static int net_init_vde(QemuOpts *opts, - Monitor *mon, - const char *name, - VLANState *vlan) -{ - const char *sock; - const char *group; - int port, mode; - - sock = qemu_opt_get(opts, "sock"); - group = qemu_opt_get(opts, "group"); - - port = qemu_opt_get_number(opts, "port", 0); - mode = qemu_opt_get_number(opts, "mode", 0700); - - if (net_vde_init(vlan, "vde", name, sock, port, group, mode) == -1) { - return -1; - } - - if (vlan) { - vlan->nb_host_devs++; - } - - return 0; -} -#endif - static int net_init_dump(QemuOpts *opts, Monitor *mon, const char *name, diff --git a/net/vde.c b/net/vde.c new file mode 100644 index 0000000..4d09967 --- /dev/null +++ b/net/vde.c @@ -0,0 +1,124 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "net/vde.h" + +#include "config-host.h" + +#include + +#include "net.h" +#include "qemu-char.h" +#include "qemu-common.h" +#include "qemu-option.h" +#include "sysemu.h" + +typedef struct VDEState { + VLANClientState *vc; + VDECONN *vde; +} VDEState; + +static void vde_to_qemu(void *opaque) +{ + VDEState *s = opaque; + uint8_t buf[4096]; + int size; + + size = vde_recv(s->vde, (char *)buf, sizeof(buf), 0); + if (size > 0) { + qemu_send_packet(s->vc, buf, size); + } +} + +static ssize_t vde_receive(VLANClientState *vc, const uint8_t *buf, size_t size) +{ + VDEState *s = vc->opaque; + ssize_t ret; + + do { + ret = vde_send(s->vde, (const char *)buf, size, 0); + } while (ret < 0 && errno == EINTR); + + return ret; +} + +static void vde_cleanup(VLANClientState *vc) +{ + VDEState *s = vc->opaque; + qemu_set_fd_handler(vde_datafd(s->vde), NULL, NULL, NULL); + vde_close(s->vde); + qemu_free(s); +} + +static int net_vde_init(VLANState *vlan, const char *model, + const char *name, const char *sock, + int port, const char *group, int mode) +{ + VDEState *s; + char *init_group = (char *)group; + char *init_sock = (char *)sock; + + struct vde_open_args args = { + .port = port, + .group = init_group, + .mode = mode, + }; + + s = qemu_mallocz(sizeof(VDEState)); + s->vde = vde_open(init_sock, (char *)"QEMU", &args); + if (!s->vde){ + free(s); + return -1; + } + s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_VDE, + vlan, NULL, model, name, NULL, + vde_receive, NULL, NULL, + vde_cleanup, s); + qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s); + snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d", + sock, vde_datafd(s->vde)); + return 0; +} + +int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) +{ + const char *sock; + const char *group; + int port, mode; + + sock = qemu_opt_get(opts, "sock"); + group = qemu_opt_get(opts, "group"); + + port = qemu_opt_get_number(opts, "port", 0); + mode = qemu_opt_get_number(opts, "mode", 0700); + + if (net_vde_init(vlan, "vde", name, sock, port, group, mode) == -1) { + return -1; + } + + if (vlan) { + vlan->nb_host_devs++; + } + + return 0; +} diff --git a/net/vde.h b/net/vde.h new file mode 100644 index 0000000..3e6ca3e --- /dev/null +++ b/net/vde.h @@ -0,0 +1,36 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#ifndef QEMU_NET_VDE_H +#define QEMU_NET_VDE_H + +#include "qemu-common.h" +#include "qemu-option.h" + +#ifdef CONFIG_VDE + +int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan); + +#endif /* CONFIG_VDE */ + +#endif /* QEMU_NET_VDE_H */