From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbv8E-00059e-6A for qemu-devel@nongnu.org; Fri, 23 Nov 2012 10:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tbv88-0008RY-5p for qemu-devel@nongnu.org; Fri, 23 Nov 2012 10:25:30 -0500 Received: from cantor2.suse.de ([195.135.220.15]:49107 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbv87-0008RT-SP for qemu-devel@nongnu.org; Fri, 23 Nov 2012 10:25:24 -0500 Message-ID: <50AF9561.2090802@suse.de> Date: Fri, 23 Nov 2012 16:25:21 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1353665892-35445-1-git-send-email-jfrei@linux.vnet.ibm.com> <1353665892-35445-2-git-send-email-jfrei@linux.vnet.ibm.com> In-Reply-To: <1353665892-35445-2-git-send-email-jfrei@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/3] S390: Basic CPU model support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jens Freimann Cc: Heinz Graalfs , qemu-devel , Alexander Graf , Viktor Mihajlovski , Christian Borntraeger , Cornelia Huck , Einar Lueck Am 23.11.2012 11:18, schrieb Jens Freimann: > From: Viktor Mihajlovski >=20 > This enables qemu -cpu ? to return the list of supported CPU models > on s390. Since only the host model is supported at this point in time > this is pretty straight-forward. Further, a validity check for the > requested CPU model was added. > This change is needed to allow libvirt exploiters (like OpenStack) > to specify a CPU model. >=20 > Signed-off-by: Viktor Mihajlovski > Signed-off-by: Jens Freimann > Reviewed-by: Christian Borntraeger > --- > hw/s390-virtio.c | 5 +++++ > target-s390x/cpu.c | 6 ++++++ > target-s390x/cpu.h | 3 +++ > 3 files changed, 14 insertions(+) >=20 > diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c > index 685cb54..7144ac1 100644 > --- a/hw/s390-virtio.c > +++ b/hw/s390-virtio.c > @@ -209,6 +209,11 @@ static void s390_init(QEMUMachineInitArgs *args) > cpu_model =3D "host"; > } > =20 > + if (strcmp(cpu_model, "host")) { > + fprintf(stderr, "S390 only supports host CPU model\n"); > + exit(1); > + } When Cornelia introduces a second machine for virtio-ccw, you will have to duplicate this logic. Other targets have an, e.g., cpu_s390_init() function that encapsulates the instantiation logic. Also, "host" doesn't make a lot of sense on non-s390 host, no? > + > ipi_states =3D g_malloc(sizeof(S390CPU *) * smp_cpus); > =20 > for (i =3D 0; i < smp_cpus; i++) { > diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c > index 619b202..03fdc31 100644 > --- a/target-s390x/cpu.c > +++ b/target-s390x/cpu.c > @@ -25,6 +25,12 @@ > #include "qemu-timer.h" > =20 > =20 > +/* generate CPU information for cpu -? */ > +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf) > +{ > + (*cpu_fprintf)(f, "s390 %16s\n", "[host]"); The other targets don't use a target prefix ("s390 "), but then again the text and layout are fully target-specific at this time. :) Regards, Andreas > +} > + > /* CPUClass::reset() */ > static void s390_cpu_reset(CPUState *s) > { > diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h > index 0f9a1f7..3513976 100644 > --- a/target-s390x/cpu.h > +++ b/target-s390x/cpu.h > @@ -350,6 +350,9 @@ static inline void cpu_set_tls(CPUS390XState *env, = target_ulong newtls) > #define cpu_gen_code cpu_s390x_gen_code > #define cpu_signal_handler cpu_s390x_signal_handler > =20 > +void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf); > +#define cpu_list s390_cpu_list > + > #include "exec-all.h" > =20 > #ifdef CONFIG_USER_ONLY >=20 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg