Merge remote-tracking branch 'origin/master' into threadpool

[mirror_qemu.git] / qmp.c

diff --git a/qmp.c b/qmp.c
index d8a3c00b97e9e8e6cdeccd9684c1ed3bc1951ff0..638888a64e9742b1180dab33d0a48884652807b0 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -471,11 +471,12 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename,
     return prop_list;
 }
 
-CpuDefinitionInfoList GCC_WEAK *arch_query_cpu_definitions(Error **errp)
+static CpuDefinitionInfoList *default_arch_query_cpu_definitions(Error **errp)
 {
     error_set(errp, QERR_NOT_SUPPORTED);
     return NULL;
 }
+QEMU_WEAK_ALIAS(arch_query_cpu_definitions, default_arch_query_cpu_definitions);
 
 CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
 {