OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: convert vde to NetClientInfo 

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-11-25 18:49:07 +00:00 committed by Anthony Liguori
parent ce20b5be50
commit b4e859c6a1
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
net/vde.c
View File

@ -34,7 +34,7 @@
#include "sysemu.h"
typedef struct VDEState {
VLANClientState *vc;
VLANClientState nc;
VDECONN *vde;
} VDEState;
@ -46,13 +46,13 @@ static void vde_to_qemu(void *opaque)
size = vde_recv(s->vde, (char *)buf, sizeof(buf), 0);
if (size > 0) {
qemu_send_packet(s->vc, buf, size);
qemu_send_packet(&s->nc, buf, size);
}
}
static ssize_t vde_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
static ssize_t vde_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
{
VDEState *s = vc->opaque;
VDEState *s = DO_UPCAST(VDEState, nc, nc);
ssize_t ret;
do {
@ -62,19 +62,27 @@ static ssize_t vde_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
return ret;
}
static void vde_cleanup(VLANClientState *vc)
static void vde_cleanup(VLANClientState *nc)
{
VDEState *s = vc->opaque;
VDEState *s = DO_UPCAST(VDEState, nc, nc);
qemu_set_fd_handler(vde_datafd(s->vde), NULL, NULL, NULL);
vde_close(s->vde);
qemu_free(s);
}
static NetClientInfo net_vde_info = {
.type = NET_CLIENT_TYPE_VDE,
.size = sizeof(VDEState),
.receive = vde_receive,
.cleanup = vde_cleanup,
};
static int net_vde_init(VLANState *vlan, const char *model,
const char *name, const char *sock,
int port, const char *group, int mode)
{
VLANClientState *nc;
VDEState *s;
VDECONN *vde;
char *init_group = (char *)group;
char *init_sock = (char *)sock;
@ -84,19 +92,22 @@ static int net_vde_init(VLANState *vlan, const char *model,
.mode = mode,
};
s = qemu_mallocz(sizeof(VDEState));
s->vde = vde_open(init_sock, (char *)"QEMU", &args);
if (!s->vde){
free(s);
vde = vde_open(init_sock, (char *)"QEMU", &args);
if (!vde){
return -1;
}
s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_VDE,
vlan, NULL, model, name, NULL,
vde_receive, NULL, NULL,
vde_cleanup, s);
nc = qemu_new_net_client(&net_vde_info, vlan, NULL, model, name);
snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d",
sock, vde_datafd(vde));
s = DO_UPCAST(VDEState, nc, nc);
s->vde = vde;
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;
}