From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkv2x-0000YL-Q7 for qemu-devel@nongnu.org; Thu, 24 Aug 2017 12:31:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkv2u-0007Pz-Ub for qemu-devel@nongnu.org; Thu, 24 Aug 2017 12:31:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53238) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkv2u-0007Pd-PH for qemu-devel@nongnu.org; Thu, 24 Aug 2017 12:31:52 -0400 From: Igor Mammedov Date: Thu, 24 Aug 2017 18:31:24 +0200 Message-Id: <1503592308-93913-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1503592308-93913-1-git-send-email-imammedo@redhat.com> References: <1503592308-93913-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-2.11 v3 01/25] qom: cpu: fix parsed feature string length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= since commit ( 9262685b cpu: Factor out cpu_generic_init() ) features parsed by it were truncated only to the 1st feature after CPU name due to fact that featurestr =3D strtok(NULL, ","); cc->parse_features(cpu, featurestr, &err); would extract exactly one feature and parse_features() callback would parse it and only it leaving the rest of features ignored. Reuse approach from x86 custom impl. i.e. replace strtok() token parsing with g_strsplit(), which would split feature string in 2 parts name and features list and pass the later to parse_features() callback. Signed-off-by: Igor Mammedov --- CC: Eduardo Habkost CC: Andreas F=C3=A4rber Probably due to existing users not actualy using/having any features to parse bug were unnoticed for 2 years but switching from custom cpu_foo_init() to cpu_generic_init() triggered it. --- qom/cpu.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/qom/cpu.c b/qom/cpu.c index 4f38db0..caf5c14 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -50,28 +50,26 @@ bool cpu_exists(int64_t id) =20 CPUState *cpu_generic_init(const char *typename, const char *cpu_model) { - char *str, *name, *featurestr; CPUState *cpu =3D NULL; ObjectClass *oc; CPUClass *cc; Error *err =3D NULL; + gchar **model_pieces; =20 - str =3D g_strdup(cpu_model); - name =3D strtok(str, ","); + model_pieces =3D g_strsplit(cpu_model, ",", 2); =20 - oc =3D cpu_class_by_name(typename, name); + oc =3D cpu_class_by_name(typename, model_pieces[0]); if (oc =3D=3D NULL) { - g_free(str); + g_strfreev(model_pieces); return NULL; } =20 cc =3D CPU_CLASS(oc); - featurestr =3D strtok(NULL, ","); /* TODO: all callers of cpu_generic_init() need to be converted to * call parse_features() only once, before calling cpu_generic_init(= ). */ - cc->parse_features(object_class_get_name(oc), featurestr, &err); - g_free(str); + cc->parse_features(object_class_get_name(oc), model_pieces[1], &err)= ; + g_strfreev(model_pieces); if (err !=3D NULL) { goto out; } --=20 2.7.4