[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 10/13] qapi: make query-cpu-model-expansion depe
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 10/13] qapi: make query-cpu-model-expansion depend on s390 or x86 |
Date: |
Tue, 18 Dec 2018 13:35:16 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
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)
{
- [Qemu-devel] [PATCH 02/13] qapi-commands: don't initialize command list in qmp_init_marshall(), (continued)
- [Qemu-devel] [PATCH 02/13] qapi-commands: don't initialize command list in qmp_init_marshall(), Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 03/13] qapi-commands: rename init_marshal() to register_commands(), Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 04/13] RFC: qapi: learn to split the schema by 'top-unit', Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 05/13] qapi: add a top-unit 'target' schema, Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 06/13] qapi: make rtc-reset-reinjection and SEV depend on TARGET_I386, Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 07/13] qapi: make s390 commands depend on TARGET_S390X, Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 08/13] target.json: add a note about query-cpu* not being s390x-specific, Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 09/13] qapi: make query-gic-capabilities depend on TARGET_ARM, Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 10/13] qapi: make query-cpu-model-expansion depend on s390 or x86, Marc-André Lureau, 2018/12/16
- Re: [Qemu-devel] [PATCH 10/13] qapi: make query-cpu-model-expansion depend on s390 or x86,
Markus Armbruster <=
- [Qemu-devel] [PATCH 11/13] qapi: make query-cpu-definitions depend on specific targets, Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 12/13] qapi: remove qmp_unregister_command(), Marc-André Lureau, 2018/12/16
- [Qemu-devel] [PATCH 13/13] qapi: move RTC_CHANGE to the target schema, Marc-André Lureau, 2018/12/16
- Re: [Qemu-devel] [PATCH 00/13] qapi: add #if pre-processor conditions to generated code (part 3), Markus Armbruster, 2018/12/18