specify vmchannel as part of "user" net option
PATCH 1/1 specify vmchannel as part of "user" net option
To configure vmchannel and something like this to -net user:
channels=666:unix:/tmp/666,server,nowait;777:unix:/tmp/777,server
The parsing is little ugly :(
net.c +65 -0
@@ -644,6 +644,23 @@ void do_info_slirp(void) slirp_stats(); } +struct VMChannel { +CharDriverState *hd; +int port; +}; + +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)
@@ -1556,6 +1573,7 @@ int net_client_init(const char *device, const char *p) } else#ifdef CONFIG_SLIRP if (!strcmp (device,"user" )) { +char *c;if (get_param_value (buf,sizeof (buf),"hostname" , p)) {pstrcpy (slirp_hostname,sizeof (slirp_hostname), buf); }
@@ -1565,6 +1583,53 @@ int net_client_init(const char *device, const char *p)if (get_param_value (buf,sizeof (buf),"ip" , p)) { slirp_ip =strdup (buf); } +if ((c =strstr (p,"channels=" ))) { +int len; +char *e; + c +=strlen ("channels=" ); + e =index (c,'=' ); +if (e !=NULL ) { + e =rindex (c,',' ); + len = e - c; + }else { + len =strlen (c); + } +if (len >=sizeof (buf)) { +fprintf (stderr,"vmchannel parameter is too long\n" ); +return -1 ; + } +memcpy (buf, c, len); + buf[len +1 ] ='\0' ; + c = buf; +while (c && *c !='\0' ) { +int port; +char name[20 ], *devname; +struct VMChannel *vmc; + +if (*c ==';' ) + c++; + + port =strtol (c, &c,10 ); + c++; +if (port <1 || port >65535 ) { +fprintf (stderr,"vmchannel: wrong port number\n" ); +return -1 ; + } +snprintf (name,20 ,"vmchannel%u\n" , port); + devname =strsep (&c,";" ); + vmc =malloc (sizeof (struct VMChannel )); + vmc->hd =qemu_chr_open (name, devname); +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); + } + } vlan->nb_host_devs++; ret =net_slirp_init (vlan, device, name); }else
--
Gleb.
Quoted 3 lines · Gleb Natapov
To configure vmchannel and something like this to -net user:
channels=;777:unix:/tmp/777,server
I'd really like to avoid using ';' as a deliminator. Is the a more clever way we can do this without it totally sucking?
Regards,
Anthony Liguori
Quoted 98 lines
The parsing is little ugly :(
Signed-off-by Gleb Natapov <[email protected]>net.c +65
-1@@ -644,6 +644,23 @@ void do_info_slirp(void) slirp_stats(); } +struct VMChannel { +CharDriverState *hd; +int port; +}; + +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)@@ -1556,6 +1573,7 @@ int net_client_init(const char *device, const char *p) } else#ifdef CONFIG_SLIRP if (!strcmp (device,"user" )) { +char *c;if (get_param_value (buf,sizeof (buf),"hostname" , p)) {pstrcpy (slirp_hostname,sizeof (slirp_hostname), buf); }@@ -1565,6 +1583,53 @@ int net_client_init(const char *device, const char *p)if (get_param_value (buf,sizeof (buf),"ip" , p)) { slirp_ip =strdup (buf); } +if ((c =strstr (p,"channels=" ))) { +int len; +char *e; + c +=strlen ("channels=" ); + e =index (c,'=' ); +if (e !=NULL ) { + e =rindex (c,',' ); + len = e - c; + }else { + len =strlen (c); + } +if (len >=sizeof (buf)) { +fprintf (stderr,"vmchannel parameter is too long\n" ); +return -1 ; + } +memcpy (buf, c, len); + buf[len +1 ] ='\0' ; + c = buf; +while (c && *c !='\0' ) { +int port; +char name[20 ], *devname; +struct VMChannel *vmc; + +if (*c ==';' ) + c++; + + port =strtol (c, &c,10 ); + c++; +if (port <1 || port >65535 ) { +fprintf (stderr,"vmchannel: wrong port number\n" ); +return -1 ; + } +snprintf (name,20 ,"vmchannel%u\n" , port); + devname =strsep (&c,";" ); + vmc =malloc (sizeof (struct VMChannel )); + vmc->hd =qemu_chr_open (name, devname); +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); + } + } vlan->nb_host_devs++; ret =net_slirp_init (vlan, device, name); }else --Gleb.
Quoted 8 lines · Anthony Liguori
Quoted 3 lines · Gleb Natapov
To configure vmchannel and something like this to -net user:
channels=;777:unix:/tmp/777,serverI'd really like to avoid using ';' as a deliminator. Is the a more clever way we can do this without it totally sucking?
I can't say I like it, but we can't use ',' and ':' as parsing will be ambiguous. So what's left?
--
Gleb.
Quoted 8 lines · Gleb Natapov
Quoted 6 lines · Anthony Liguori
Quoted 4 lines · Gleb Natapov
To configure vmchannel and something like this to -net user:
channels=;777:unix:/tmp/777,server
Quoted 6 lines
Quoted 3 lines
I'd really like to avoid using ';' as a deliminator. Is the a more clever way we can do this without it totally sucking?
I can't say I like it, but we can't use ',' and ':' as parsing will be ambiguous. So what's left?
Brilliantly innovative alternative syntaxes?
If we can't think of anything better, I guess we're stuck with the semicolons, but they have to be escaped on the command line so it's extremely annoying.
Regards,
Anthony Liguori
Quoted 5 lines
--
Gleb.
Quoted 11 lines · Gleb Natapov
Quoted 8 lines · Anthony Liguori
Quoted 3 lines · Gleb Natapov
To configure vmchannel and something like this to -net user:
channels=;777:unix:/tmp/777,serverI'd really like to avoid using ';' as a deliminator. Is the a more clever way we can do this without it totally sucking?
I can't say I like it, but we can't use ',' and ':' as parsing will be ambiguous. So what's left?
Perhaps this is a sign that we should not try to overload it all into one argument after all. How about just having a separate -net option for each channel we wish to hook onto a NIC - a little cleverness behind the scenes could make them all backed by a single Slirp device, without forcing them to use a single ARGV for config
eg
qemu -net nic,vlan=8 \
-net channel=666,vlan=8,:unix:/tmp/666,server,nowait \
-net channel=777,vlan=8,:unix:/tmp/777,serverRegards,
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|