From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXg3F-0000V9-J2 for qemu-devel@nongnu.org; Wed, 01 May 2013 19:03:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXg3D-0000tJ-T8 for qemu-devel@nongnu.org; Wed, 01 May 2013 19:03:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:46455 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXg3D-0000tD-KI for qemu-devel@nongnu.org; Wed, 01 May 2013 19:03:03 -0400 Message-ID: <51819F25.2090800@suse.de> Date: Thu, 02 May 2013 01:03:01 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1366657220-776-1-git-send-email-ehabkost@redhat.com> <1366657220-776-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1366657220-776-5-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-cpu 4/9] target-i386: Replace cpuid_*features fields with a feature word array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: libvir-list@redhat.com, Igor Mammedov , Jiri Denemark , qemu-devel@nongnu.org Am 22.04.2013 21:00, schrieb Eduardo Habkost: > This replaces the feature-bit fields on both X86CPU and x86_def_t > structs with an array. >=20 > With this, we will be able to simplify code that simply does the same > operation on all feature words (e.g. kvm_check_features_against_host(), > filter_features_for_kvm(), add_flagname_to_bitmaps(), CPU feature-bit > property lookup/registration, and the proposed "feature-words" property= ) >=20 > The following field replacements were made on X86CPU and x86_def_t: >=20 > (cpuid_)features -> features[FEAT_1_EDX] > (cpuid_)ext_features -> features[FEAT_1_ECX] > (cpuid_)ext2_features -> features[FEAT_8000_0001_EDX] > (cpuid_)ext3_features -> features[FEAT_8000_0001_ECX] > (cpuid_)ext4_features -> features[FEAT_C000_0001_EDX] > (cpuid_)kvm_features -> features[FEAT_KVM] > (cpuid_)svm_features -> features[FEAT_SVM] > (cpuid_)7_0_ebx_features -> features[FEAT_7_0_EBX] >=20 > Signed-off-by: Eduardo Habkost > Reviewed-By: Igor Mammedov [...] > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 73ae2ef..110ef98 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c [...] > @@ -1490,22 +1485,22 @@ static void cpu_x86_parse_featurestr(X86CPU *cp= u, char *features, Error **errp) > } > featurestr =3D strtok(NULL, ","); > } > - env->cpuid_features |=3D plus_features[FEAT_1_EDX]; > - env->cpuid_ext_features |=3D plus_features[FEAT_1_ECX]; > - env->cpuid_ext2_features |=3D plus_features[FEAT_8000_0001_EDX]; > - env->cpuid_ext3_features |=3D plus_features[FEAT_8000_0001_ECX]; > - env->cpuid_ext4_features |=3D plus_features[FEAT_C000_0001_EDX]; > - env->cpuid_kvm_features |=3D plus_features[FEAT_KVM]; > - env->cpuid_svm_features |=3D plus_features[FEAT_SVM]; > - env->cpuid_7_0_ebx_features |=3D plus_features[FEAT_7_0_EBX]; > - env->cpuid_features &=3D ~minus_features[FEAT_1_EDX]; > - env->cpuid_ext_features &=3D ~minus_features[FEAT_1_ECX]; > - env->cpuid_ext2_features &=3D ~minus_features[FEAT_8000_0001_EDX]; > - env->cpuid_ext3_features &=3D ~minus_features[FEAT_8000_0001_ECX]; > - env->cpuid_ext4_features &=3D ~minus_features[FEAT_C000_0001_EDX]; > - env->cpuid_kvm_features &=3D ~minus_features[FEAT_KVM]; > - env->cpuid_svm_features &=3D ~minus_features[FEAT_SVM]; > - env->cpuid_7_0_ebx_features &=3D ~minus_features[FEAT_7_0_EBX]; > + env->features[FEAT_1_EDX] |=3D plus_features[FEAT_1_EDX]; > + env->features[FEAT_1_ECX] |=3D plus_features[FEAT_1_ECX]; > + env->features[FEAT_8000_0001_EDX] |=3D plus_features[FEAT_8000_000= 1_EDX]; > + env->features[FEAT_8000_0001_ECX] |=3D plus_features[FEAT_8000_000= 1_ECX]; > + env->features[FEAT_C000_0001_EDX] |=3D plus_features[FEAT_C000_000= 1_EDX]; > + env->features[FEAT_KVM] |=3D plus_features[FEAT_KVM]; > + env->features[FEAT_SVM] |=3D plus_features[FEAT_SVM]; > + env->features[FEAT_7_0_EBX] |=3D plus_features[FEAT_7_0_EBX]; > + env->features[FEAT_1_EDX] &=3D ~minus_features[FEAT_1_EDX]; > + env->features[FEAT_1_ECX] &=3D ~minus_features[FEAT_1_ECX]; > + env->features[FEAT_8000_0001_EDX] &=3D ~minus_features[FEAT_8000_0= 001_EDX]; > + env->features[FEAT_8000_0001_ECX] &=3D ~minus_features[FEAT_8000_0= 001_ECX]; > + env->features[FEAT_C000_0001_EDX] &=3D ~minus_features[FEAT_C000_0= 001_EDX]; > + env->features[FEAT_KVM] &=3D ~minus_features[FEAT_KVM]; > + env->features[FEAT_SVM] &=3D ~minus_features[FEAT_SVM]; > + env->features[FEAT_7_0_EBX] &=3D ~minus_features[FEAT_7_0_EBX]; > =20 > out: > return; Can this be done in a loop as a follow-up? [...] > @@ -1630,24 +1625,24 @@ static void cpu_x86_register(X86CPU *cpu, const= char *name, Error **errp) > } > =20 > if (kvm_enabled()) { > - def->kvm_features |=3D kvm_default_features; > + def->features[FEAT_KVM] |=3D kvm_default_features; > } > - def->ext_features |=3D CPUID_EXT_HYPERVISOR; > + def->features[FEAT_1_ECX] |=3D CPUID_EXT_HYPERVISOR; > =20 > object_property_set_str(OBJECT(cpu), def->vendor, "vendor", errp); > object_property_set_int(OBJECT(cpu), def->level, "level", errp); > object_property_set_int(OBJECT(cpu), def->family, "family", errp); > object_property_set_int(OBJECT(cpu), def->model, "model", errp); > object_property_set_int(OBJECT(cpu), def->stepping, "stepping", er= rp); > - env->cpuid_features =3D def->features; > - env->cpuid_ext_features =3D def->ext_features; > - env->cpuid_ext2_features =3D def->ext2_features; > - env->cpuid_ext3_features =3D def->ext3_features; > + env->features[FEAT_1_EDX] =3D def->features[FEAT_1_EDX]; > + env->features[FEAT_1_ECX] =3D def->features[FEAT_1_ECX]; > + env->features[FEAT_8000_0001_EDX] =3D def->features[FEAT_8000_0001= _EDX]; > + env->features[FEAT_8000_0001_ECX] =3D def->features[FEAT_8000_0001= _ECX]; > object_property_set_int(OBJECT(cpu), def->xlevel, "xlevel", errp); > - env->cpuid_kvm_features =3D def->kvm_features; > - env->cpuid_svm_features =3D def->svm_features; > - env->cpuid_ext4_features =3D def->ext4_features; > - env->cpuid_7_0_ebx_features =3D def->cpuid_7_0_ebx_features; > + env->features[FEAT_KVM] =3D def->features[FEAT_KVM]; > + env->features[FEAT_SVM] =3D def->features[FEAT_SVM]; > + env->features[FEAT_C000_0001_EDX] =3D def->features[FEAT_C000_0001= _EDX]; > + env->features[FEAT_7_0_EBX] =3D def->features[FEAT_7_0_EBX]; > env->cpuid_xlevel2 =3D def->xlevel2; > =20 > object_property_set_str(OBJECT(cpu), def->model_id, "model-id", er= rp); [snip] Dito? Andreas --=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