| 1 | Index: ioemu/vl.c |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- ioemu.orig/vl.c 2007-05-02 16:05:51.000000000 +0100 |
|---|
| 4 | +++ ioemu/vl.c 2007-05-02 16:05:51.000000000 +0100 |
|---|
| 5 | @@ -5234,7 +5234,7 @@ |
|---|
| 6 | "-S freeze CPU at startup (use 'c' to start execution)\n" |
|---|
| 7 | "-s wait gdb connection to port %d\n" |
|---|
| 8 | "-p port change gdb connection port\n" |
|---|
| 9 | - "-d item1,... output log to %s (use -d ? for a list of log items)\n" |
|---|
| 10 | + "-l item1,... output log to %s (use -d ? for a list of log items)\n" |
|---|
| 11 | "-hdachs c,h,s[,t] force hard disk 0 physical geometry and the optional BIOS\n" |
|---|
| 12 | " translation (t=none or lba) (usually qemu can guess them)\n" |
|---|
| 13 | "-L path set the directory for the BIOS and VGA BIOS\n" |
|---|
| 14 | @@ -5307,7 +5307,7 @@ |
|---|
| 15 | QEMU_OPTION_S, |
|---|
| 16 | QEMU_OPTION_s, |
|---|
| 17 | QEMU_OPTION_p, |
|---|
| 18 | - QEMU_OPTION_d, |
|---|
| 19 | + QEMU_OPTION_l, |
|---|
| 20 | QEMU_OPTION_hdachs, |
|---|
| 21 | QEMU_OPTION_L, |
|---|
| 22 | #ifdef USE_CODE_COPY |
|---|
| 23 | @@ -5380,7 +5380,7 @@ |
|---|
| 24 | { "S", 0, QEMU_OPTION_S }, |
|---|
| 25 | { "s", 0, QEMU_OPTION_s }, |
|---|
| 26 | { "p", HAS_ARG, QEMU_OPTION_p }, |
|---|
| 27 | - { "d", HAS_ARG, QEMU_OPTION_d }, |
|---|
| 28 | + { "l", HAS_ARG, QEMU_OPTION_l }, |
|---|
| 29 | { "hdachs", HAS_ARG, QEMU_OPTION_hdachs }, |
|---|
| 30 | { "L", HAS_ARG, QEMU_OPTION_L }, |
|---|
| 31 | #ifdef USE_CODE_COPY |
|---|
| 32 | @@ -5640,6 +5640,8 @@ |
|---|
| 33 | char usb_devices[MAX_USB_CMDLINE][128]; |
|---|
| 34 | int usb_devices_index; |
|---|
| 35 | |
|---|
| 36 | + char qemu_dm_logfilename[64]; |
|---|
| 37 | + |
|---|
| 38 | LIST_INIT (&vm_change_state_head); |
|---|
| 39 | #ifndef _WIN32 |
|---|
| 40 | { |
|---|
| 41 | @@ -5719,6 +5721,11 @@ |
|---|
| 42 | nb_nics = 0; |
|---|
| 43 | /* default mac address of the first network interface */ |
|---|
| 44 | |
|---|
| 45 | + /* init debug */ |
|---|
| 46 | + sprintf(qemu_dm_logfilename, "/var/log/xen/qemu-dm.%ld.log", (long)getpid()); |
|---|
| 47 | + cpu_set_log_filename(qemu_dm_logfilename); |
|---|
| 48 | + cpu_set_log(0); |
|---|
| 49 | + |
|---|
| 50 | optind = 1; |
|---|
| 51 | for(;;) { |
|---|
| 52 | if (optind >= argc) |
|---|
| 53 | @@ -5909,7 +5916,7 @@ |
|---|
| 54 | exit(1); |
|---|
| 55 | } |
|---|
| 56 | break; |
|---|
| 57 | - case QEMU_OPTION_d: |
|---|
| 58 | + case QEMU_OPTION_l: |
|---|
| 59 | { |
|---|
| 60 | int mask; |
|---|
| 61 | CPULogItem *item; |
|---|
