| Message ID | 1499586614-20507-2-git-send-email-cota@braap.org |
|---|---|
| State | New |
| Headers | show |
On 07/08/2017 09:49 PM, Emilio G. Cota wrote: > 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> > --- > vl.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Reviewed-by: Richard Henderson <rth@twiddle.net> r~
Emilio G. Cota <cota@braap.org> writes: > 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> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Alex Bennée <alex.bennee@linaro.org> > --- > vl.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/vl.c b/vl.c > index d17c863..9ece570 100644 > --- a/vl.c > +++ b/vl.c > @@ -3933,10 +3933,10 @@ int main(int argc, char **argv, char **envp) > configure_rtc(opts); > break; > case QEMU_OPTION_tb_size: > - if (!tcg_enabled()) { > - error_report("TCG is disabled"); > - exit(1); > - } > +#ifndef CONFIG_TCG > + error_report("TCG is disabled"); > + exit(1); > +#endif > if (qemu_strtoul(optarg, NULL, 0, &tcg_tb_size) < 0) { > error_report("Invalid argument to -tb-size"); > exit(1); -- Alex Bennée
diff --git a/vl.c b/vl.c index d17c863..9ece570 100644 --- a/vl.c +++ b/vl.c @@ -3933,10 +3933,10 @@ int main(int argc, char **argv, char **envp) configure_rtc(opts); break; case QEMU_OPTION_tb_size: - if (!tcg_enabled()) { - error_report("TCG is disabled"); - exit(1); - } +#ifndef CONFIG_TCG + error_report("TCG is disabled"); + exit(1); +#endif if (qemu_strtoul(optarg, NULL, 0, &tcg_tb_size) < 0) { error_report("Invalid argument to -tb-size"); exit(1);
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> --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)