ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vl: Use &error_fatal when parsing VNC options 

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2016-05-12 11:09:59 -03:00
parent bacc344c54
commit 7b1ee0f2b7
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vl.c
View File

@ -2151,11 +2151,7 @@ static DisplayType select_display(const char *p)
#endif #endif
} else if (strstart(p, "vnc", &opts)) { } else if (strstart(p, "vnc", &opts)) {
if (*opts == '=') { if (*opts == '=') {
Error *err = NULL; vnc_parse(opts + 1, &error_fatal);
if (vnc_parse(opts + 1, &err) == NULL) {
error_report_err(err);
exit(1);
}
} else { } else {
error_report("VNC requires a display argument vnc=<display>"); error_report("VNC requires a display argument vnc=<display>");
exit(1); exit(1);
@ -3709,15 +3705,8 @@ int main(int argc, char **argv, char **envp)
} }
break; break;
case QEMU_OPTION_vnc: case QEMU_OPTION_vnc:
{ vnc_parse(optarg, &error_fatal);
Error *local_err = NULL;
if (vnc_parse(optarg, &local_err) == NULL) {
error_report_err(local_err);
exit(1);
}
break; break;
}
case QEMU_OPTION_no_acpi: case QEMU_OPTION_no_acpi:
acpi_enabled = 0; acpi_enabled = 0;
break; break;