Re: [Qemu-devel] [PATCH 10/13] qapi: make query-cpu-model-expansion depend on s390 or x86

[Markus Armbruster]

Marc-André Lureau <address@hidden> writes:

> Signed-off-by: Marc-André Lureau <address@hidden>
> Reviewed-by: Eduardo Habkost <address@hidden>
> Acked-by: Cornelia Huck <address@hidden>

Doesn't build linux-user:

    target/i386/cpu.o: In function `qmp_query_cpu_model_expansion':
    /work/armbru/qemu/target/i386/cpu.c:4082: undefined reference to 
`qapi_free_CpuModelExpansionInfo'
    collect2: error: ld returned 1 exit status
    make[1]: *** [Makefile:200: qemu-i386] Error 1

    target/i386/cpu.o: In function `qmp_query_cpu_model_expansion':
    /work/armbru/qemu/target/i386/cpu.c:4082: undefined reference to 
`qapi_free_CpuModelExpansionInfo'
    collect2: error: ld returned 1 exit status
    make[1]: *** [Makefile:200: qemu-x86_64] Error 1

Fixup:

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index dc0a7413a4..1554c0bd71 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3882,6 +3882,7 @@ static void x86_cpu_load_def(X86CPU *cpu, 
X86CPUDefinition *def, Error **errp)
 
 }
 
+#ifndef CONFIG_USER_ONLY
 /* Return a QDict containing keys for all properties that can be included
  * in static expansion of CPU models. All properties set by x86_cpu_load_def()
  * must be included in the dictionary.
@@ -4084,6 +4085,7 @@ out:
     }
     return ret;
 }
+#endif  /* !CONFIG_USER_ONLY */
 
 static gchar *x86_gdb_arch_name(CPUState *cs)
 {