vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

specify vmchannel as a net option (Gleb Natapov) 

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6623 c046a42c-6fe2-441c-8c8c-71466251a162
master
aliguori 2009-02-16 15:34:18 +00:00
parent d85d0d3883
commit 8ca9217d04
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net.c
View File

@ -670,6 +670,23 @@ void do_info_slirp(void)
slirp_stats();
}
struct VMChannel {
CharDriverState *hd;
int port;
} *vmchannels;
static int vmchannel_can_read(void *opaque)
{
struct VMChannel *vmc = (struct VMChannel*)opaque;
return slirp_socket_can_recv(4, vmc->port);
}
static void vmchannel_read(void *opaque, const uint8_t *buf, int size)
{
struct VMChannel *vmc = (struct VMChannel*)opaque;
slirp_socket_recv(4, vmc->port, buf, size);
}
#endif /* CONFIG_SLIRP */
#if !defined(_WIN32)
@ -1630,6 +1647,30 @@ int net_client_init(const char *device, const char *p)
}
vlan->nb_host_devs++;
ret = net_slirp_init(vlan, device, name);
} else if (!strcmp(device, "channel")) {
long port;
char name[20], *devname;
struct VMChannel *vmc;
port = strtol(p, &devname, 10);
devname++;
if (port < 1 || port > 65535) {
fprintf(stderr, "vmchannel wrong port number\n");
return -1;
}
vmc = malloc(sizeof(struct VMChannel));
snprintf(name, 20, "vmchannel%ld", port);
vmc->hd = qemu_chr_open(name, devname, NULL);
if (!vmc->hd) {
fprintf(stderr, "qemu: could not open vmchannel device"
"'%s'\n", devname);
return -1;
}
vmc->port = port;
slirp_add_exec(3, vmc->hd, 4, port);
qemu_chr_add_handlers(vmc->hd, vmchannel_can_read, vmchannel_read,
NULL, vmc);
ret = 0;
} else
#endif
#ifdef _WIN32

3
qemu-doc.texi
View File

@ -643,6 +643,9 @@ Use the user mode network stack which requires no administrator
privilege to run. @option{hostname=name} can be used to specify the client
hostname reported by the builtin DHCP server.
@item -net channel,@var{port}:@var{dev}
Forward @option{user} TCP connection to port @var{port} to character device @var{dev}
@item -net tap[,vlan=@var{n}][,name=@var{name}][,fd=@var{h}][,ifname=@var{name}][,script=@var{file}][,downscript=@var{dfile}]
Connect the host TAP network interface @var{name} to VLAN @var{n}, use
the network script @var{file} to configure it and the network script