From: Michael Mueller <mimu@linux.vnet.ibm.com> To: Eduardo Habkost <ehabkost@redhat.com> Cc: linux-s390@vger.kernel.org, kvm@vger.kernel.org, Gleb Natapov <gleb@kernel.org>, linux-kernel@vger.kernel.org, Alexander Graf <agraf@suse.de>, qemu-devel@nongnu.org, Christian Borntraeger <borntraeger@de.ibm.com>, Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>, "Jason J. Herne" <jjherne@linux.vnet.ibm.com>, Cornelia Huck <cornelia.huck@de.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, Andreas Faerber <afaerber@suse.de>, Richard Henderson <rth@twiddle.net> Subject: Re: [Qemu-devel] [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model Date: Tue, 31 Mar 2015 11:10:43 +0200 [thread overview] Message-ID: <20150331111043.078443f8@bee> (raw) In-Reply-To: <20150330195020.GD7031@thinpad.lan.raisama.net> On Mon, 30 Mar 2015 16:50:20 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: Hello Eduardo, > On Mon, Mar 30, 2015 at 04:28:24PM +0200, Michael Mueller wrote: > [...] > > diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c > > index 829945d..1698b52 100644 > > --- a/target-s390x/cpu.c > > +++ b/target-s390x/cpu.c > > @@ -37,6 +37,11 @@ > > #define CR0_RESET 0xE0UL > > #define CR14_RESET 0xC2000000UL; > > > > +static inline char *strdup_s390_cpu_name(S390CPUClass *cc) > > +{ > > + return g_strdup_printf("%04x-ga%u", cc->proc.type, cc->mach.ga); > > +} > > + > > /* generate CPU information for cpu -? */ > > void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) > > { > > @@ -74,6 +79,30 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) > > > > return entry; > > } > > + > > +CpuModelInfo *arch_query_cpu_model(Error **errp) > > +{ > > + CpuModelInfo *info; > > + S390CPUClass *cc; > > + > > + if (!s390_cpu_models_used()) { > > + return NULL; > > + } > > First question is: why you don't want to just return > { name: "none", accel: ... } > when TYPE_S390_CPU ("-cpu none") is used? That's a good idea, indeed! CPU model "none" is used as well in case option -cpu is omitted. > > Now, assuming that you really want to return NULL if -cpu none is used, > why don't you just ask for the first CPU (like you already do below) and > check if it is a named CPU model, instead of adding a new global? e.g.: > > static bool s390_cpu_class_is_model(S390CPUClass *cc) > { > return cpuid(cc->proc) != 0; > } > > CpuModelInfo *arch_query_cpu_model(Error **errp) > { > S390CPUClass *cc; > S390CPUClass *cc; > > cc = S390_CPU_GET_CLASS(s390_cpu_addr2state(0)); > if (!s390_cpu_class_is_model(cc)) { > return NULL; > } > [...] > } > > > > + info = g_try_new0(CpuModelInfo, 1); > > + if (!info) { > > + return NULL; > > + } > > + cc = S390_CPU_GET_CLASS(s390_cpu_addr2state(0)); > > + info->name = strdup_s390_cpu_name(cc); > > I don't think the current version of strdup_s390_cpu_name() can ever > return NULL. Do you expect it to return NULL in the future? No I do not expect this. I will drop the NULL test. > > > + if (!info->name) { > > + g_free(info); > > + return NULL; > > + } > > + if (kvm_enabled()) { > > + info->accel = ACCEL_ID_KVM; > > This could be a CPUState field, added automatically by > cpu_generic_init() using current_machine->accel. I will add a CPUState field and see how it works out... > > > + } > > + return info; > > +} > > #endif > > > > static void s390_cpu_set_pc(CPUState *cs, vaddr value) > > -- > > 1.8.3.1 > > > Thanks a lot, Michael
WARNING: multiple messages have this Message-ID (diff)
From: Michael Mueller <mimu@linux.vnet.ibm.com> To: Eduardo Habkost <ehabkost@redhat.com> Cc: linux-s390@vger.kernel.org, Cornelia Huck <cornelia.huck@de.ibm.com>, kvm@vger.kernel.org, Gleb Natapov <gleb@kernel.org>, qemu-devel@nongnu.org, linux-kernel@vger.kernel.org, Christian Borntraeger <borntraeger@de.ibm.com>, Alexander Graf <agraf@suse.de>, "Jason J. Herne" <jjherne@linux.vnet.ibm.com>, Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, Andreas Faerber <afaerber@suse.de>, Richard Henderson <rth@twiddle.net> Subject: Re: [Qemu-devel] [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model Date: Tue, 31 Mar 2015 11:10:43 +0200 [thread overview] Message-ID: <20150331111043.078443f8@bee> (raw) In-Reply-To: <20150330195020.GD7031@thinpad.lan.raisama.net> On Mon, 30 Mar 2015 16:50:20 -0300 Eduardo Habkost <ehabkost@redhat.com> wrote: Hello Eduardo, > On Mon, Mar 30, 2015 at 04:28:24PM +0200, Michael Mueller wrote: > [...] > > diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c > > index 829945d..1698b52 100644 > > --- a/target-s390x/cpu.c > > +++ b/target-s390x/cpu.c > > @@ -37,6 +37,11 @@ > > #define CR0_RESET 0xE0UL > > #define CR14_RESET 0xC2000000UL; > > > > +static inline char *strdup_s390_cpu_name(S390CPUClass *cc) > > +{ > > + return g_strdup_printf("%04x-ga%u", cc->proc.type, cc->mach.ga); > > +} > > + > > /* generate CPU information for cpu -? */ > > void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) > > { > > @@ -74,6 +79,30 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) > > > > return entry; > > } > > + > > +CpuModelInfo *arch_query_cpu_model(Error **errp) > > +{ > > + CpuModelInfo *info; > > + S390CPUClass *cc; > > + > > + if (!s390_cpu_models_used()) { > > + return NULL; > > + } > > First question is: why you don't want to just return > { name: "none", accel: ... } > when TYPE_S390_CPU ("-cpu none") is used? That's a good idea, indeed! CPU model "none" is used as well in case option -cpu is omitted. > > Now, assuming that you really want to return NULL if -cpu none is used, > why don't you just ask for the first CPU (like you already do below) and > check if it is a named CPU model, instead of adding a new global? e.g.: > > static bool s390_cpu_class_is_model(S390CPUClass *cc) > { > return cpuid(cc->proc) != 0; > } > > CpuModelInfo *arch_query_cpu_model(Error **errp) > { > S390CPUClass *cc; > S390CPUClass *cc; > > cc = S390_CPU_GET_CLASS(s390_cpu_addr2state(0)); > if (!s390_cpu_class_is_model(cc)) { > return NULL; > } > [...] > } > > > > + info = g_try_new0(CpuModelInfo, 1); > > + if (!info) { > > + return NULL; > > + } > > + cc = S390_CPU_GET_CLASS(s390_cpu_addr2state(0)); > > + info->name = strdup_s390_cpu_name(cc); > > I don't think the current version of strdup_s390_cpu_name() can ever > return NULL. Do you expect it to return NULL in the future? No I do not expect this. I will drop the NULL test. > > > + if (!info->name) { > > + g_free(info); > > + return NULL; > > + } > > + if (kvm_enabled()) { > > + info->accel = ACCEL_ID_KVM; > > This could be a CPUState field, added automatically by > cpu_generic_init() using current_machine->accel. I will add a CPUState field and see how it works out... > > > + } > > + return info; > > +} > > #endif > > > > static void s390_cpu_set_pc(CPUState *cs, vaddr value) > > -- > > 1.8.3.1 > > > Thanks a lot, Michael
next prev parent reply other threads:[~2015-03-31 9:10 UTC|newest] Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-30 14:28 [PATCH v4 00/15] s390x cpu model implementation Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` [PATCH v4 01/15] Introduce stub routine cpu_desc_avail Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` [PATCH v4 02/15] target-s390x: Introduce cpu facilities Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 03/15] target-s390x: Generate facility defines per cpu model Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` [PATCH v4 04/15] target-s390x: Introduce cpu models Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 05/15] target-s390x: Define cpu model specific facility lists Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 06/15] target-s390x: Add cpu model alias definition routines Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` [PATCH v4 07/15] target-s390x: Update linux-headers/asm-s390/kvm.h Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 19:36 ` Christian Borntraeger 2015-03-30 19:36 ` [Qemu-devel] " Christian Borntraeger 2015-03-30 19:36 ` Christian Borntraeger 2015-03-31 7:25 ` Michael Mueller 2015-03-31 7:25 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` [PATCH v4 08/15] target-s390x: Add KVM VM attribute interface for cpu models Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 09/15] target-s390x: Add cpu class initialization routines Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 10/15] target-s390x: Prepare accelerator during cpu object realization Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 19:33 ` Eduardo Habkost 2015-03-30 19:33 ` [Qemu-devel] " Eduardo Habkost 2015-03-31 10:26 ` Michael Mueller 2015-03-31 10:26 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 11/15] target-s390x: New QMP command query-cpu-model Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 19:50 ` Eduardo Habkost 2015-03-30 19:50 ` [Qemu-devel] " Eduardo Habkost 2015-03-31 9:10 ` Michael Mueller [this message] 2015-03-31 9:10 ` Michael Mueller 2015-03-30 20:17 ` Eduardo Habkost 2015-03-30 20:17 ` [Qemu-devel] " Eduardo Habkost 2015-03-30 20:17 ` Eduardo Habkost 2015-03-30 20:20 ` [Qemu-devel] " Eric Blake 2015-03-30 20:20 ` Eric Blake 2015-03-30 20:20 ` Eric Blake 2015-03-31 13:16 ` [Qemu-devel] " Eduardo Habkost 2015-03-31 13:16 ` Eduardo Habkost 2015-03-31 11:21 ` Michael Mueller 2015-03-31 11:21 ` Michael Mueller 2015-03-31 18:28 ` Eduardo Habkost 2015-03-31 18:28 ` Eduardo Habkost 2015-03-30 20:19 ` Eric Blake 2015-03-30 20:19 ` Eric Blake 2015-03-31 7:56 ` Michael Mueller 2015-03-31 7:56 ` Michael Mueller 2015-03-31 7:56 ` Michael Mueller 2015-03-31 18:35 ` Eduardo Habkost 2015-03-31 18:35 ` [Qemu-devel] " Eduardo Habkost 2015-03-31 20:09 ` Michael Mueller 2015-03-31 20:09 ` [Qemu-devel] " Michael Mueller 2015-03-31 20:09 ` Michael Mueller 2015-04-01 13:01 ` Eduardo Habkost 2015-04-01 13:01 ` [Qemu-devel] " Eduardo Habkost 2015-04-01 16:31 ` Michael Mueller 2015-04-01 16:31 ` Michael Mueller 2015-04-01 16:59 ` Eduardo Habkost 2015-04-01 16:59 ` Eduardo Habkost 2015-04-01 16:59 ` Eduardo Habkost 2015-04-01 19:05 ` [Qemu-devel] " Michael Mueller 2015-04-01 19:05 ` Michael Mueller 2015-04-01 19:05 ` Michael Mueller 2015-04-01 19:10 ` [Qemu-devel] " Michael Mueller 2015-04-01 19:10 ` Michael Mueller 2015-04-01 23:05 ` Eduardo Habkost 2015-04-01 23:05 ` Eduardo Habkost 2015-04-01 23:05 ` Eduardo Habkost 2015-04-02 7:09 ` [Qemu-devel] " Michael Mueller 2015-04-02 7:09 ` Michael Mueller 2015-04-02 7:09 ` Michael Mueller 2015-04-02 15:15 ` [Qemu-devel] " Eduardo Habkost 2015-04-02 15:15 ` Eduardo Habkost 2015-03-30 14:28 ` [PATCH v4 12/15] Add optional parameters to QMP command query-cpu-definitions Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 20:28 ` Eric Blake 2015-03-30 20:28 ` Eric Blake 2015-03-31 7:42 ` Michael Mueller 2015-03-31 7:42 ` Michael Mueller 2015-03-31 7:42 ` Michael Mueller 2015-03-31 19:46 ` Eduardo Habkost 2015-03-31 19:46 ` [Qemu-devel] " Eduardo Habkost 2015-03-31 19:46 ` Eduardo Habkost 2015-03-31 19:50 ` Eric Blake 2015-03-31 19:50 ` [Qemu-devel] " Eric Blake 2015-03-31 19:50 ` Eric Blake 2015-03-31 20:22 ` [Qemu-devel] " Michael Mueller 2015-03-31 20:22 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 13/15] target-s390x: Extend " Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 19:54 ` Eduardo Habkost 2015-03-30 19:54 ` [Qemu-devel] " Eduardo Habkost 2015-03-30 14:28 ` [PATCH v4 14/15] target-s390x: Introduce facility test routine Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller 2015-03-30 14:28 ` Michael Mueller 2015-03-30 14:28 ` [PATCH v4 15/15] target-s390x: Enable cpu model usage Michael Mueller 2015-03-30 14:28 ` [Qemu-devel] " Michael Mueller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150331111043.078443f8@bee \ --to=mimu@linux.vnet.ibm.com \ --cc=afaerber@suse.de \ --cc=agraf@suse.de \ --cc=borntraeger@de.ibm.com \ --cc=cornelia.huck@de.ibm.com \ --cc=daniel.hansel@linux.vnet.ibm.com \ --cc=ehabkost@redhat.com \ --cc=gleb@kernel.org \ --cc=jjherne@linux.vnet.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.