Re: Latest qemu tcg breakage

[Avi Kivity <avi@qumranet.com>]

Jerone Young wrote:
> So upstream qemu is being pervasive about changes with TCG, starting to
> place tcg only functions in exec.c . I've spun a quick patch that fixes
> things for PowerPC when building qemu. But we need to try and isolate
> TCG in upstream qemu as it is starting to leak, and I'm not sure of a
> good way to fix it as there is no CONFIG defined for tcg  currently.
>
>  
>  ifeq ($(USE_KVM), 1)
> diff --git a/qemu/exec.c b/qemu/exec.c
> --- a/qemu/exec.c
> +++ b/qemu/exec.c
> @@ -37,8 +37,11 @@
>  #include "exec-all.h"
>  #include "qemu-common.h"
>  
> +#ifdef USE_KVM
> +#include "qemu-kvm.h"
> +#else
>  #include "tcg.h"
> -#include "qemu-kvm.h"
> +#endif
>   

We want to keep the ability to have both emulation (-no-kvm) and 
virtualization, at least for x86, so let's keep tcg.h includable.

>  
>  #if defined(CONFIG_USER_ONLY)
>  #include <qemu.h>
> @@ -3197,7 +3200,9 @@ void dump_exec_info(FILE *f,
>      cpu_fprintf(f, "TB flush count      %d\n", tb_flush_count);
>      cpu_fprintf(f, "TB invalidate count %d\n",
> tb_phys_invalidate_count);
>      cpu_fprintf(f, "TLB flush count     %d\n", tlb_flush_count);
> +#if !defined(USE_KVM)
>      tcg_dump_info(f, cpu_fprintf);
> +#endif
>  }
>  
>   

How about

   #define tcg_dump_info(x, y) (void)0

in some strategic spot?


-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.