| Message ID | 20200526172427.17460-4-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | exec/cpu: Cleanups around "exec/hwaddr.h" (reserved to system-mode) | expand |
On Tue, May 26, 2020 at 07:24:23PM +0200, Philippe Mathieu-Daudé wrote: > When HVF is not available, the hvf_allowed variable does not exist. > > Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > v2: Fixed typo s/tcg_allowed/hvf_allowed/ (Edgar) > --- > include/sysemu/hvf.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h > index d211e808e9..fe95743124 100644 > --- a/include/sysemu/hvf.h > +++ b/include/sysemu/hvf.h > @@ -18,7 +18,6 @@ > #include "exec/memory.h" > #include "sysemu/accel.h" > > -extern bool hvf_allowed; > #ifdef CONFIG_HVF > #include <Hypervisor/hv.h> > #include <Hypervisor/hv_vmx.h> > @@ -26,11 +25,12 @@ extern bool hvf_allowed; > #include "target/i386/cpu.h" > uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, > int reg); > +extern bool hvf_allowed; > #define hvf_enabled() (hvf_allowed) > -#else > +#else /* !CONFIG_HVF */ > #define hvf_enabled() 0 > #define hvf_get_supported_cpuid(func, idx, reg) 0 > -#endif > +#endif /* !CONFIG_HVF */ > > /* hvf_slot flags */ > #define HVF_SLOT_LOG (1 << 0) > -- > 2.21.3 > Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com> Thanks, Roman
diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h index d211e808e9..fe95743124 100644 --- a/include/sysemu/hvf.h +++ b/include/sysemu/hvf.h @@ -18,7 +18,6 @@ #include "exec/memory.h" #include "sysemu/accel.h" -extern bool hvf_allowed; #ifdef CONFIG_HVF #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> @@ -26,11 +25,12 @@ extern bool hvf_allowed; #include "target/i386/cpu.h" uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, int reg); +extern bool hvf_allowed; #define hvf_enabled() (hvf_allowed) -#else +#else /* !CONFIG_HVF */ #define hvf_enabled() 0 #define hvf_get_supported_cpuid(func, idx, reg) 0 -#endif +#endif /* !CONFIG_HVF */ /* hvf_slot flags */ #define HVF_SLOT_LOG (1 << 0)