From patchwork Thu Nov 12 21:43:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11901889 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 6CD951391 for ; Thu, 12 Nov 2020 22:17:12 +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 1987F2078D for ; Thu, 12 Nov 2020 22:17:12 +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="P+LfP1fe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1987F2078D 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]:57280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdKty-0001tN-Un for patchwork-qemu-devel@patchwork.kernel.org; Thu, 12 Nov 2020 17:17:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdKQr-0007xW-TE 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]:58987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kdKQp-0003g5-Th 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=1605217615; 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=r7TERLJpM+jpqFm63tOaEIhKSaxT38IN74gOJ5NgF+k=; b=P+LfP1fesKE34BiAXQqZXthIk8F9mm0OucwpkT/n7yqaTInzEn6jB9giw9VDJH8f19OsyD iPzD+pJl5dNnn0CYIoKTHUGGoFncig6kPYFK6YxmnfzN2eNHrUVs7MKCezuxhVOq/MUk4R wl7/9dveU+bfkOOvDcg68ndqTGQjh7o= 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-326-rkA8YRNeNAOJQAsH3Ow5qA-1; Thu, 12 Nov 2020 16:46:53 -0500 X-MC-Unique: rkA8YRNeNAOJQAsH3Ow5qA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83E5C57210; Thu, 12 Nov 2020 21:46:52 +0000 (UTC) Received: from localhost (ovpn-114-68.rdu2.redhat.com [10.10.114.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0797455763; Thu, 12 Nov 2020 21:46:48 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH v3 41/53] qdev: Make object_property_add_field() copy the Property struct Date: Thu, 12 Nov 2020 16:43:38 -0500 Message-Id: <20201112214350.872250-42-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.15 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" This will make the function more convenient to use, and allow us to reuse it for array element properties. I'm not adding a version of this function that doesn't copy the struct, because this function isn't supposed to be used widely. 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 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index d5773ffd8a..451bb54cf6 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -828,21 +828,23 @@ object_property_add_field(Object *obj, const char *name, ObjectPropertyAllowSet allow_set) { ObjectProperty *op; + Property *newprop = g_new0(Property, 1); assert(allow_set); assert(!prop->info->create); - op = object_property_add(obj, name, prop->info->name, - field_prop_getter(prop->info), - field_prop_setter(prop->info), - prop->info->release, - prop); + *newprop = *prop; + op = object_property_add(obj, name, newprop->info->name, + field_prop_getter(newprop->info), + field_prop_setter(newprop->info), + static_prop_release_dynamic_prop, + newprop); object_property_set_description(obj, name, - prop->info->description); + newprop->info->description); - if (prop->set_default) { - prop->info->set_default_value(op, prop); + if (newprop->set_default) { + newprop->info->set_default_value(op, newprop); if (op->init) { op->init(obj, op); }