net: move vde code from net.c to net/vde.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
68ac40d2c6
commit
5c361cc322
1
Makefile
1
Makefile
|
@ -107,6 +107,7 @@ net-nested-$(CONFIG_BSD) += tap-bsd.o
|
||||||
net-nested-$(CONFIG_SOLARIS) += tap-solaris.o
|
net-nested-$(CONFIG_SOLARIS) += tap-solaris.o
|
||||||
net-nested-$(CONFIG_AIX) += tap-aix.o
|
net-nested-$(CONFIG_AIX) += tap-aix.o
|
||||||
net-nested-$(CONFIG_SLIRP) += slirp.o
|
net-nested-$(CONFIG_SLIRP) += slirp.o
|
||||||
|
net-nested-$(CONFIG_VDE) += vde.o
|
||||||
net-obj-y += $(addprefix net/, $(net-nested-y))
|
net-obj-y += $(addprefix net/, $(net-nested-y))
|
||||||
|
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
102
net.c
102
net.c
|
@ -86,14 +86,11 @@
|
||||||
#include <util.h>
|
#include <util.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_VDE)
|
|
||||||
#include <libvdeplug.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "net/tap.h"
|
#include "net/tap.h"
|
||||||
#include "net/slirp.h"
|
#include "net/slirp.h"
|
||||||
|
#include "net/vde.h"
|
||||||
#include "monitor.h"
|
#include "monitor.h"
|
||||||
#include "sysemu.h"
|
#include "sysemu.h"
|
||||||
#include "qemu-timer.h"
|
#include "qemu-timer.h"
|
||||||
|
@ -719,75 +716,6 @@ qemu_sendv_packet(VLANClientState *vc, const struct iovec *iov, int iovcnt)
|
||||||
return qemu_sendv_packet_async(vc, iov, iovcnt, NULL);
|
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 */
|
/* network connection */
|
||||||
typedef struct NetSocketState {
|
typedef struct NetSocketState {
|
||||||
VLANClientState *vc;
|
VLANClientState *vc;
|
||||||
|
@ -1600,34 +1528,6 @@ static int net_init_socket(QemuOpts *opts,
|
||||||
return 0;
|
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,
|
static int net_init_dump(QemuOpts *opts,
|
||||||
Monitor *mon,
|
Monitor *mon,
|
||||||
const char *name,
|
const char *name,
|
||||||
|
|
124
net/vde.c
Normal file
124
net/vde.c
Normal file
|
@ -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 <libvdeplug.h>
|
||||||
|
|
||||||
|
#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;
|
||||||
|
}
|
36
net/vde.h
Normal file
36
net/vde.h
Normal file
|
@ -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 */
|
Loading…
Reference in a new issue