From patchwork Thu Nov 12 21:43:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11901905 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9ABFA16C0 for ; Thu, 12 Nov 2020 22:22:19 +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 33BB5206C0 for ; Thu, 12 Nov 2020 22:22:19 +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="aHd30Ywu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33BB5206C0 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:42118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdKyw-0007VZ-2r for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 Nov 2020 17:22:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdKQr-0007wt-LY for qemu-devel@nongnu.org; Thu, 12 Nov 2020 16:47:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59084) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdKQp-0003gS-Ov for qemu-devel@nongnu.org; Thu, 12 Nov 2020 16:47:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605217621; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ja/YmWt/OMSFvhSVMA3UOQ10xojvR9RvVHDVddUDRaY=; b=aHd30YwuJfPw4TuBuqsQeDIbFu/ZYmd5SR2f0bINOk9HIEFPoLktwRg3eAwtgQAR0FzsD5 svn9ojTLflsqV42u1psX192LYrnwpjCjWDdvoB95rBS48zXLn0uzQ7guSEU0Z0jmRLg9Po 46Jlfsmnm7aBnrpn8O0KjVRtKgWwnDs= 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-68-NoCWWUqNOCWnU2OuJdpIXw-1; Thu, 12 Nov 2020 16:46:59 -0500 X-MC-Unique: NoCWWUqNOCWnU2OuJdpIXw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 764B7184217D; Thu, 12 Nov 2020 21:46:58 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D2D85B4C2; Thu, 12 Nov 2020 21:46:57 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 43/53] qdev: Move static_prop_release_dynamic_prop() closer to its usage Date: Thu, 12 Nov 2020 16:43:40 -0500 Message-Id: <20201112214350.872250-44-ehabkost@redhat.com> In-Reply-To: <20201112214350.872250-1-ehabkost@redhat.com> References: <20201112214350.872250-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/12 16:09:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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_H5=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: Kevin Wolf , "Daniel P. Berrange" , John Snow , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Marc?= =?utf-8?q?-Andr=C3=A9_Lureau?= , Paolo Bonzini , Igor Mammedov , Stefan Berger Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Move the function closer to where it's used, to make refactor and review simpler. While doing it, reformat the comment at the top to follow coding style. Signed-off-by: Eduardo Habkost --- This is a new patch added in v3 of the series. --- Cc: Paolo Bonzini Cc: "Daniel P. Berrangé" Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- hw/core/qdev-properties.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 83fd45add0..7aa5d2ff45 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -521,20 +521,6 @@ const PropertyInfo prop_info_size32 = { /* --- support for array properties --- */ -/* object property release callback for dynamically-created properties: - * we call the underlying element's property release hook, and - * then free the memory we allocated when we added the property. - */ -static void static_prop_release_dynamic_prop(Object *obj, const char *name, - void *opaque) -{ - Property *prop = opaque; - if (prop->info->release) { - prop->info->release(obj, name, opaque); - } - g_free(prop); -} - static void set_prop_arraylen(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -816,6 +802,21 @@ const PropertyInfo prop_info_link = { .create = create_link_property, }; +/* + * Property release callback for dynamically-created properties: + * We call the underlying element's property release hook, and + * then free the memory we allocated when we added the property. + */ +static void static_prop_release_dynamic_prop(Object *obj, const char *name, + void *opaque) +{ + Property *prop = opaque; + if (prop->info->release) { + prop->info->release(obj, name, opaque); + } + g_free(prop); +} + ObjectProperty * object_property_add_field(Object *obj, const char *name, Property *prop,