From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69D22C04A6B for ; Wed, 8 May 2019 05:54:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3DBB0205C9 for ; Wed, 8 May 2019 05:54:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DBB0205C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:59814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOFXA-0007ra-Ew for qemu-devel@archiver.kernel.org; Wed, 08 May 2019 01:54:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:36231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hOFVZ-0006lp-Ch for qemu-devel@nongnu.org; Wed, 08 May 2019 01:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hOFVY-0000px-92 for qemu-devel@nongnu.org; Wed, 08 May 2019 01:52:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hOFVY-0000pQ-1K for qemu-devel@nongnu.org; Wed, 08 May 2019 01:52:48 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4DB073097020; Wed, 8 May 2019 05:52:47 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-28.ams2.redhat.com [10.36.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 077315C22E; Wed, 8 May 2019 05:52:47 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7940C1132B35; Wed, 8 May 2019 07:52:45 +0200 (CEST) From: Markus Armbruster To: Eduardo Habkost References: <20190419061429.17695-1-ehabkost@redhat.com> <20190419061429.17695-6-ehabkost@redhat.com> <87pnovrer7.fsf@dusky.pond.sub.org> Date: Wed, 08 May 2019 07:52:45 +0200 In-Reply-To: <87pnovrer7.fsf@dusky.pond.sub.org> (Markus Armbruster's message of "Mon, 06 May 2019 13:42:04 +0200") Message-ID: <87woj17as2.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 08 May 2019 05:52:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH 5/7] cpu: Let architectures set CPU class name format X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , qemu-devel@nongnu.org, Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Markus Armbruster writes: > Eduardo Habkost writes: > >> Instead of requiring every architecture to implement a >> class_by_name function, let them set a format string at >> CPUClass::class_name_format. >> >> This will let us get rid of at least 16 class_by_name functions >> in the next commits. >> >> Signed-off-by: Eduardo Habkost >> --- >> include/qom/cpu.h | 12 ++++++++++++ >> qom/cpu.c | 18 ++++++++++++++++-- >> 2 files changed, 28 insertions(+), 2 deletions(-) >> >> diff --git a/include/qom/cpu.h b/include/qom/cpu.h >> index fefd5c26b0..eda6a46b82 100644 >> --- a/include/qom/cpu.h >> +++ b/include/qom/cpu.h >> @@ -163,7 +163,19 @@ typedef struct CPUClass { >> DeviceClass parent_class; >> /*< public >*/ >> >> + /* The following fields configure CPU model name -> QOM type translation: */ >> + >> + /* >> + * arch-specific CPU model -> QOM type translation function. >> + * Optional if @class_name_format is set. >> + */ >> ObjectClass *(*class_by_name)(const char *cpu_model); >> + /* >> + * Format string for g_strdup_printf(), used to generate the CPU >> + * class name. > > Please document acceptable conversion specifiers. > >> + */ >> + const char *class_name_format; >> + >> void (*parse_features)(const char *typename, char *str, Error **errp); >> >> void (*reset)(CPUState *cpu); >> diff --git a/qom/cpu.c b/qom/cpu.c >> index b971a56242..1fa64941b6 100644 >> --- a/qom/cpu.c >> +++ b/qom/cpu.c >> @@ -286,9 +286,23 @@ static bool cpu_common_has_work(CPUState *cs) >> CPUClass *cpu_class_by_name(const char *typename, const char *cpu_model) >> { >> CPUClass *cc = CPU_CLASS(object_class_by_name(typename)); >> + ObjectClass *oc; >> + char *class_name; >> >> - assert(cpu_model && cc->class_by_name); >> - return CPU_CLASS(cc->class_by_name(cpu_model)); >> + assert(cpu_model); >> + if (cc->class_by_name) { >> + return CPU_CLASS(cc->class_by_name(cpu_model)); >> + } >> + >> + assert(cc->class_name_format); >> + class_name = g_strdup_printf(cc->class_name_format, cpu_model); > > Defeats -Wformat. Triggers -Wformat-nonliteral, which we don't use, I > presume. Observation, not objection. > > cc->class_name_format must contain exactly one conversion specifier, > which must take a char *. s/exactly one/at most one/ PATCH 7 defines formats without a conversion specifier. >> + oc = object_class_by_name(class_name); >> + g_free(class_name); >> + if (!oc || !object_class_dynamic_cast(oc, typename) || >> + object_class_is_abstract(oc)) { >> + return NULL; >> + } >> + return CPU_CLASS(oc); >> } >> >> static void cpu_common_parse_features(const char *typename, char *features,