/[qemu]/qemu/vl.c
ViewVC logotype

Diff of /qemu/vl.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by bellard, Tue Sep 30 21:40:47 2003 UTC revision 1.21 by bellard, Tue Sep 30 22:11:17 2003 UTC
# Line 3393  void help(void) Line 3393  void help(void)
3393             "-snapshot       write to temporary files instead of disk image files\n"             "-snapshot       write to temporary files instead of disk image files\n"
3394             "-m megs         set virtual RAM size to megs MB\n"             "-m megs         set virtual RAM size to megs MB\n"
3395             "-n script       set network init script [default=%s]\n"             "-n script       set network init script [default=%s]\n"
3396               "-tun-fd fd      this fd talks to tap/tun, use it.\n"
3397             "-nographic      disable graphical output\n"             "-nographic      disable graphical output\n"
3398             "\n"             "\n"
3399             "Linux boot specific (does not require PC BIOS):\n"             "Linux boot specific (does not require PC BIOS):\n"
# Line 3422  struct option long_options[] = { Line 3423  struct option long_options[] = {
3423      { "nographic", 0, NULL, 0, },      { "nographic", 0, NULL, 0, },
3424      { "kernel", 1, NULL, 0, },      { "kernel", 1, NULL, 0, },
3425      { "append", 1, NULL, 0, },      { "append", 1, NULL, 0, },
3426        { "tun-fd", 1, NULL, 0, },
3427      { NULL, 0, NULL, 0 },      { NULL, 0, NULL, 0 },
3428  };  };
3429    
# Line 3514  int main(int argc, char **argv) Line 3516  int main(int argc, char **argv)
3516              case 7:              case 7:
3517                  kernel_cmdline = optarg;                  kernel_cmdline = optarg;
3518                  break;                  break;
3519                case 8:
3520                    net_fd = atoi(optarg);
3521                    break;
3522              }              }
3523              break;              break;
3524          case 'h':          case 'h':
# Line 3568  int main(int argc, char **argv) Line 3573  int main(int argc, char **argv)
3573      }      }
3574    
3575      /* init network tun interface */      /* init network tun interface */
3576      net_init();      if (net_fd < 0)
3577            net_init();
3578    
3579      /* init the memory */      /* init the memory */
3580      tmpdir = getenv("QEMU_TMPDIR");      tmpdir = getenv("QEMU_TMPDIR");

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26