From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37090) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dFdI0-0001tl-Fw for qemu-devel@nongnu.org; Tue, 30 May 2017 05:18:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dFdHw-0001bA-OA for qemu-devel@nongnu.org; Tue, 30 May 2017 05:18:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33192) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dFdHw-0001aB-Fc for qemu-devel@nongnu.org; Tue, 30 May 2017 05:18:04 -0400 References: <20170529192440.5990-1-aurelien@aurel32.net> <20170529192440.5990-30-aurelien@aurel32.net> From: Thomas Huth Message-ID: <5b84304b-7b41-df26-e845-2f52fb55079f@redhat.com> Date: Tue, 30 May 2017 11:18:01 +0200 MIME-Version: 1.0 In-Reply-To: <20170529192440.5990-30-aurelien@aurel32.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 29/29] target/s390x: update maximum TCG model to z800 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno , qemu-devel@nongnu.org Cc: Alexander Graf , Richard Henderson On 29.05.2017 21:24, Aurelien Jarno wrote: > At the same time fix the TCG version of get_max_cpu_model to return the > maximum model like on KVM. Remove the long-displacement facility from > the additional features as it is included in the z800. > > Signed-off-by: Aurelien Jarno > --- > target/s390x/cpu_models.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > index e5e005a430..5f2c195d53 100644 > --- a/target/s390x/cpu_models.c > +++ b/target/s390x/cpu_models.c > @@ -668,7 +668,6 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm) > static const int feats[] = { > S390_FEAT_STFLE, > S390_FEAT_EXTENDED_IMMEDIATE, > - S390_FEAT_LONG_DISPLACEMENT, > S390_FEAT_LONG_DISPLACEMENT_FAST, > S390_FEAT_STORE_CLOCK_FAST, > S390_FEAT_GENERAL_INSTRUCTIONS_EXT, > @@ -694,9 +693,9 @@ static S390CPUModel *get_max_cpu_model(Error **errp) > if (kvm_enabled()) { > kvm_s390_get_host_cpu_model(&max_model, errp); > } else { > - /* TCG emulates a z900 (with some optional additional features) */ > - max_model.def = &s390_cpu_defs[0]; > - bitmap_copy(max_model.features, max_model.def->default_feat, > + /* TCG emulates a z800 (with some optional additional features) */ > + max_model.def = s390_find_cpu_def(0x2066, 7, 3, NULL); > + bitmap_copy(max_model.features, max_model.def->full_feat, > S390_FEAT_MAX); > add_qemu_cpu_model_features(max_model.features); > } > @@ -954,8 +953,9 @@ static void s390_qemu_cpu_model_initfn(Object *obj) > S390CPU *cpu = S390_CPU(obj); > > cpu->model = g_malloc0(sizeof(*cpu->model)); > - /* TCG emulates a z900 (with some optional additional features) */ > - memcpy(&s390_qemu_cpu_defs, &s390_cpu_defs[0], sizeof(s390_qemu_cpu_defs)); > + /* TCG emulates a z800 (with some optional additional features) */ > + memcpy(&s390_qemu_cpu_defs, s390_find_cpu_def(0x2066, 7, 3, NULL), > + sizeof(s390_qemu_cpu_defs)); > add_qemu_cpu_model_features(s390_qemu_cpu_defs.full_feat); > cpu->model->def = &s390_qemu_cpu_defs; > bitmap_copy(cpu->model->features, cpu->model->def->default_feat, > Reviewed-by: Thomas Huth