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

vl: fix breakage of -tb-size

Browse Source 
Commit e7b161d573 ("vl: add tcg_enabled() for tcg related code") adds
a check to exit the program when !tcg_enabled() while parsing the -tb-size
flag.

It turns out that when the -tb-size flag is evaluated, tcg_enabled() can
only return 0, since it is set (or not) much later by configure_accelerator().

Fix it by unconditionally exiting if the flag is passed to a QEMU binary
built with !CONFIG_TCG.

Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Emilio G. Cota 2017-07-09 03:49:53 -04:00 committed by Paolo Bonzini
parent 081dd1fe36
commit f940488fea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vl.c
View File

@ -3933,10 +3933,10 @@ int main(int argc, char **argv, char **envp)
configure_rtc(opts); configure_rtc(opts);
break; break;
case QEMU_OPTION_tb_size: case QEMU_OPTION_tb_size:
if (!tcg_enabled()) { #ifndef CONFIG_TCG
error_report("TCG is disabled"); error_report("TCG is disabled");
exit(1); exit(1);
} #endif
if (qemu_strtoul(optarg, NULL, 0, &tcg_tb_size) < 0) { if (qemu_strtoul(optarg, NULL, 0, &tcg_tb_size) < 0) {
error_report("Invalid argument to -tb-size"); error_report("Invalid argument to -tb-size");
exit(1); exit(1);