From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753245AbbC3O2y (ORCPT ); Mon, 30 Mar 2015 10:28:54 -0400 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:43265 "EHLO e06smtp15.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752832AbbC3O2q (ORCPT ); Mon, 30 Mar 2015 10:28:46 -0400 From: Michael Mueller To: qemu-devel@nongnu.org, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Eduardo Habkost , Gleb Natapov , Alexander Graf , Christian Borntraeger , "Jason J. Herne" , Cornelia Huck , Paolo Bonzini , Michael Mueller , Andreas Faerber , Richard Henderson , Daniel Hansel Subject: [PATCH v4 01/15] Introduce stub routine cpu_desc_avail Date: Mon, 30 Mar 2015 16:28:14 +0200 Message-Id: <1427725708-52100-2-git-send-email-mimu@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> References: <1427725708-52100-1-git-send-email-mimu@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15033014-0021-0000-0000-000003684D38 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch introduces the function cpu_desc_avail() which returns by default true if not architecture specific implemented. Its intention is to indicate if the cpu model description is available for display by list_cpus(). This change allows cpu model descriptions to become dynamically created by evaluating the runtime context instead of putting static cpu model information at display. Signed-off-by: Michael Mueller Reviewed-by: Thomas Huth --- include/qemu-common.h | 2 ++ stubs/Makefile.objs | 1 + stubs/cpu-desc-avail.c | 6 ++++++ vl.c | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 stubs/cpu-desc-avail.c diff --git a/include/qemu-common.h b/include/qemu-common.h index 1b5cffb..386750f 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -484,4 +484,6 @@ int parse_debug_env(const char *name, int max, int initial); const char *qemu_ether_ntoa(const MACAddr *mac); +bool cpu_desc_avail(void); + #endif diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 8beff4c..dce9cd2 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -39,3 +39,4 @@ stub-obj-$(CONFIG_WIN32) += fd-register.o stub-obj-y += cpus.o stub-obj-y += kvm.o stub-obj-y += qmp_pc_dimm_device_list.o +stub-obj-y += cpu-desc-avail.o diff --git a/stubs/cpu-desc-avail.c b/stubs/cpu-desc-avail.c new file mode 100644 index 0000000..0cd594e --- /dev/null +++ b/stubs/cpu-desc-avail.c @@ -0,0 +1,6 @@ +#include "qemu-common.h" + +bool cpu_desc_avail(void) +{ + return true; +} diff --git a/vl.c b/vl.c index 74c2681..c552561 100644 --- a/vl.c +++ b/vl.c @@ -3820,7 +3820,7 @@ int main(int argc, char **argv, char **envp) */ cpudef_init(); - if (cpu_model && is_help_option(cpu_model)) { + if (cpu_model && cpu_desc_avail() && is_help_option(cpu_model)) { list_cpus(stdout, &fprintf, cpu_model); exit(0); } -- 1.8.3.1