[Qemu-devel] Another bugfix: tun-fd option does not work

[Qemu-devel] Another bugfix: tun-fd option does not work

[Renzo Davoli]

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

There is a small bug in the current cvs: file vl.c.

Moving the ne2k interface descriptors initialization from before the getopt
loop to just after it, the fd field get rewritten and the -tun-fd option
ceases to work.

the patch is here attached.

ciao
	renzo

[-- Attachment #2: vl.c.diff --]
[-- Type: text/plain, Size: 648 bytes --]

--- vl.c.orig	2004-04-03 14:37:10.000000000 +0200
+++ vl.c	2004-04-03 14:38:43.000000000 +0200
@@ -1728,6 +1728,9 @@
     macaddr[4] = 0x34;
     macaddr[5] = 0x56;
     
+    for(i = 0; i < MAX_NICS; i++) 
+        nd_table[i].fd = -1;
+    
     for(;;) {
         c = getopt_long_only(argc, argv, "hm:d:n:sp:L:", long_options, &long_index);
         if (c == -1)
@@ -1934,7 +1937,6 @@
     /* init host network redirectors */
     for(i = 0; i < MAX_NICS; i++) {
         NetDriverState *nd = &nd_table[i];
-        nd->fd = -1;
         /* init virtual mac address */
         nd->macaddr[0] = macaddr[0];
         nd->macaddr[1] = macaddr[1];

Re: [Qemu-devel] Another bugfix: tun-fd option does not work

[Fabrice Bellard]

Renzo Davoli wrote:
> There is a small bug in the current cvs: file vl.c.
> 
> Moving the ne2k interface descriptors initialization from before the getopt
> loop to just after it, the fd field get rewritten and the -tun-fd option
> ceases to work.
> 
> the patch is here attached.

Applied!

Fabrice.