david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure monitor appears as a vc

Browse Source 
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6358 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-16 21:48:20 +00:00
parent 35730fa055
commit 4c62180560
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vl.c
View File

@ -4529,7 +4529,7 @@ int main(int argc, char **argv, char **envp)
int hda_index; int hda_index;
int optind; int optind;
const char *r, *optarg; const char *r, *optarg;
CharDriverState *monitor_hd; CharDriverState *monitor_hd = NULL;
const char *monitor_device; const char *monitor_device;
const char *serial_devices[MAX_SERIAL_PORTS]; const char *serial_devices[MAX_SERIAL_PORTS];
int serial_device_index; int serial_device_index;
@ -5461,6 +5461,14 @@ int main(int argc, char **argv, char **envp)
} }
} }
if (monitor_device) {
monitor_hd = qemu_chr_open("monitor", monitor_device);
if (!monitor_hd) {
fprintf(stderr, "qemu: could not open monitor device '%s'\n", monitor_device);
exit(1);
}
}
for(i = 0; i < MAX_SERIAL_PORTS; i++) { for(i = 0; i < MAX_SERIAL_PORTS; i++) {
const char *devname = serial_devices[i]; const char *devname = serial_devices[i];
if (devname && strcmp(devname, "none")) { if (devname && strcmp(devname, "none")) {
@ -5573,14 +5581,8 @@ int main(int argc, char **argv, char **envp)
text_consoles_set_display(display_state); text_consoles_set_display(display_state);
if (monitor_device) { if (monitor_device && monitor_hd)
monitor_hd = qemu_chr_open("monitor", monitor_device);
if (!monitor_hd) {
fprintf(stderr, "qemu: could not open monitor device '%s'\n", monitor_device);
exit(1);
}
monitor_init(monitor_hd, !nographic); monitor_init(monitor_hd, !nographic);
}
for(i = 0; i < MAX_SERIAL_PORTS; i++) { for(i = 0; i < MAX_SERIAL_PORTS; i++) {
const char *devname = serial_devices[i]; const char *devname = serial_devices[i];