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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,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 0E3F9C2D0E4 for ; Tue, 24 Nov 2020 09:59:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3CEC020637 for ; Tue, 24 Nov 2020 09:59:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U4RZXxLf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CEC020637 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 ([::1]:44634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khV6t-0001Ai-0U for qemu-devel@archiver.kernel.org; Tue, 24 Nov 2020 04:59:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khV5q-0000JM-Su for qemu-devel@nongnu.org; Tue, 24 Nov 2020 04:58:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1khV5p-00013k-4n for qemu-devel@nongnu.org; Tue, 24 Nov 2020 04:58:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606211916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YGoMC95K7ZxVr5ibTTnzNL1wtVW9JtmdHwtt/zUJSDc=; b=U4RZXxLfnFxRU0ax+dCoVDOG8ujXscAgKELSKWl+sx5bf2nWI2IwsJ7KVgUMg+Y19mC9hJ ZOrooHm++77o54nSV9r1StdV++dvDKlD/0Cjci6EXE2KGg0+cEdCNf93M9tI/CF3mUSFOs GzW6RWOwKOUd5FN+XkauVLCuR6yYN5E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-64-E8Asj8ZkMgah8NcdW-WzHw-1; Tue, 24 Nov 2020 04:58:34 -0500 X-MC-Unique: E8Asj8ZkMgah8NcdW-WzHw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37506801ADF for ; Tue, 24 Nov 2020 09:58:33 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7622E5D9CA; Tue, 24 Nov 2020 09:58:29 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CC278113864E; Tue, 24 Nov 2020 10:58:27 +0100 (CET) From: Markus Armbruster To: Eduardo Habkost Subject: Re: [PATCH v3 11/19] qom: field_prop_set_default_value() helper References: <20201123194818.2773508-1-ehabkost@redhat.com> <20201123194818.2773508-12-ehabkost@redhat.com> Date: Tue, 24 Nov 2020 10:58:27 +0100 In-Reply-To: <20201123194818.2773508-12-ehabkost@redhat.com> (Eduardo Habkost's message of "Mon, 23 Nov 2020 14:48:10 -0500") Message-ID: <87tutfnkjg.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Daniel P. =?utf-8?Q?Berrang=C3=A9?=" , qemu-devel@nongnu.org, =?utf-8?Q?Marc-Andr?= =?utf-8?Q?=C3=A9?= Lureau Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eduardo Habkost writes: > Move code that sets the property default value to a separate > function, to reduce duplication and make refactoring easier. > > Signed-off-by: Eduardo Habkost > --- > This is a new patch added in v3 of this series. > Hopefully, this will make the series easier to review. > > The field_prop_set_default_value() was added in v2 at > "qom: Use qlit to represent property defaults". > --- > qom/field-property.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/qom/field-property.c b/qom/field-property.c > index cb729626ce..6a0df7c6ea 100644 > --- a/qom/field-property.c > +++ b/qom/field-property.c > @@ -62,6 +62,17 @@ static void static_prop_release_dynamic_prop(Object *obj, const char *name, > g_free(prop); > } > > +static void field_prop_set_default_value(ObjectProperty *op, > + Property *prop) > +{ > + if (!prop->set_default) { > + return; > + } > + > + assert(prop->info->set_default_value); > + prop->info->set_default_value(op, prop); > +} > + > ObjectProperty * > object_property_add_field(Object *obj, const char *name, > Property *prop, > @@ -83,11 +94,9 @@ object_property_add_field(Object *obj, const char *name, > object_property_set_description(obj, name, > newprop->info->description); > > - if (newprop->set_default) { > - newprop->info->set_default_value(op, newprop); > - if (op->init) { > - op->init(obj, op); > - } > + field_prop_set_default_value(op, newprop); > + if (op->init) { > + op->init(obj, op); > } op->init() is now called even when !newprop->set_default. Why is that okay? > > op->allow_set = allow_set; > @@ -113,9 +122,8 @@ object_class_property_add_field_static(ObjectClass *oc, const char *name, > prop->info->release, > prop); > } > - if (prop->set_default) { > - prop->info->set_default_value(op, prop); > - } > + > + field_prop_set_default_value(op, prop); > if (prop->info->description) { > object_class_property_set_description(oc, name, > prop->info->description);