From patchwork Thu Oct 22 22:31:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1386454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Gk+60wrQ; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CHMb06kDmz9sSn for ; Fri, 23 Oct 2020 09:33:32 +1100 (AEDT) Received: from localhost ([::1]:49236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVj9G-0006Ld-Hb for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2020 18:33:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVj7p-0006Ji-08 for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVj7l-0007qj-6R for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603405913; 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=DbvZDt2YjT+OqOP+SYWN4gNFNx/iigt/9Fry3BpCckE=; b=Gk+60wrQo7Xu9/VLFHvEodh/3tVRBzws7MbrRptEEtUwhXad55SDvjIqGdsSYpDmtbYSzr NmNAOVolKvadVuE+pJmmZMuDJ2T7Lr1sZ+uFNsZrXg6wohtxvsCNxGVGD7aMxiS31oDyLS wMSSwtCASpeKoJ+xNe6rPWfWh1QEJZc= 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-518-m8O5ulxoO92EE6qiO8qzhg-1; Thu, 22 Oct 2020 18:31:51 -0400 X-MC-Unique: m8O5ulxoO92EE6qiO8qzhg-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 1D393800050; Thu, 22 Oct 2020 22:31:50 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C1B76266E; Thu, 22 Oct 2020 22:31:45 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 1/4] qom: object*_property_add_bool_ptr() functions Date: Thu, 22 Oct 2020 18:31:37 -0400 Message-Id: <20201022223140.2083123-2-ehabkost@redhat.com> In-Reply-To: <20201022223140.2083123-1-ehabkost@redhat.com> References: <20201022223140.2083123-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/10/22 08:09:01 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Igor Mammedov , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Provide helpers for registering boolean properties that simply read/write a struct field, to reduce the need to manually write property getters and setters. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: "Daniel P. Berrangé" Cc: Eduardo Habkost Cc: qemu-devel@nongnu.org --- include/qom/object.h | 23 +++++++++++++++++++++++ qom/object.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index a124cf897d..954a26c567 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1815,6 +1815,29 @@ ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass, ptrdiff_t offset, ObjectPropertyFlags flags); +/** + * object_property_add_bool_ptr: + * @obj: the object to add a property to + * @name: the name of the property + * @v: pointer to value + * @flags: bitwise-or'd ObjectPropertyFlags + * + * Add an bool property in memory. This function will add a + * property of type 'bool'. + * + * Returns: The newly added property on success, or %NULL on failure. + */ +ObjectProperty * +object_property_add_bool_ptr(Object *obj, const char *name, + bool *v, + ObjectPropertyFlags flags); + +ObjectProperty * +object_class_property_add_bool_ptr(ObjectClass *klass, + const char *name, + ptrdiff_t offset, + ObjectPropertyFlags flags); + /** * object_property_add_alias: * @obj: the object to add a property to diff --git a/qom/object.c b/qom/object.c index 73f27b8b7e..2abc2bda33 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2713,6 +2713,37 @@ object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, flags, offset); } +static void property_visit_bool_ptr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + PointerProperty *prop = opaque; + bool *field = pointer_property_get_ptr(obj, prop); + visit_type_bool(v, name, field, errp); +} + +ObjectProperty * +object_property_add_bool_ptr(Object *obj, const char *name, + bool *v, + ObjectPropertyFlags flags) +{ + return object_property_add_uint_ptr(obj, name, "bool", + property_visit_bool_ptr, + property_visit_bool_ptr, + flags, + (void *)v); +} + +ObjectProperty * +object_class_property_add_bool_ptr(ObjectClass *klass, const char *name, + ptrdiff_t offset, + ObjectPropertyFlags flags) +{ + return object_class_property_add_uint_ptr(klass, name, "bool", + property_visit_bool_ptr, + property_visit_bool_ptr, + flags, offset); +} + typedef struct { Object *target_obj; char *target_name; From patchwork Thu Oct 22 22:31: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: 1386463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=faBRSKQM; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CHMfD2sJgz9sTD for ; Fri, 23 Oct 2020 09:36:20 +1100 (AEDT) Received: from localhost ([::1]:55716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVjBy-0000ej-DQ for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2020 18:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVj7p-0006Jt-4F for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:35068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVj7m-0007qu-Px for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603405917; 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=CNrl9xgpABbIubEhK/YTHIB6JhzyiVoLX/QpInLarwk=; b=faBRSKQMy3+5R/e3hMHmNHUQv5MpYvqyyOs7GpDoAG3EqTK0x3+280CT6icZ1J89pivJ+p pQXxdod+pS5by7PyGUdvPzCfCHmrpKx1hJ2hft8TFk2IZHmt9NYVaN2CPVjYH84iTJZIpN N0vweswh5xSgTPw7eC1VzGVyTsbA5rU= 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-46-vULoavbYOYe8wtqTZWFm6A-1; Thu, 22 Oct 2020 18:31:55 -0400 X-MC-Unique: vULoavbYOYe8wtqTZWFm6A-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 12839107AFA5; Thu, 22 Oct 2020 22:31:54 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA07F5B4A2; Thu, 22 Oct 2020 22:31:50 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 2/4] autz/listfile: Use object_class_property_add_bool_ptr() Date: Thu, 22 Oct 2020 18:31:38 -0400 Message-Id: <20201022223140.2083123-3-ehabkost@redhat.com> In-Reply-To: <20201022223140.2083123-1-ehabkost@redhat.com> References: <20201022223140.2083123-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/10/22 08:09:01 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Igor Mammedov , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Eduardo Habkost --- Cc: "Daniel P. Berrangé" Cc: qemu-devel@nongnu.org --- authz/listfile.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/authz/listfile.c b/authz/listfile.c index aaf930453d..911c4e45f2 100644 --- a/authz/listfile.c +++ b/authz/listfile.c @@ -184,27 +184,6 @@ qauthz_list_file_prop_get_filename(Object *obj, } -static void -qauthz_list_file_prop_set_refresh(Object *obj, - bool value, - Error **errp G_GNUC_UNUSED) -{ - QAuthZListFile *fauthz = QAUTHZ_LIST_FILE(obj); - - fauthz->refresh = value; -} - - -static bool -qauthz_list_file_prop_get_refresh(Object *obj, - Error **errp G_GNUC_UNUSED) -{ - QAuthZListFile *fauthz = QAUTHZ_LIST_FILE(obj); - - return fauthz->refresh; -} - - static void qauthz_list_file_finalize(Object *obj) { @@ -227,9 +206,9 @@ qauthz_list_file_class_init(ObjectClass *oc, void *data) object_class_property_add_str(oc, "filename", qauthz_list_file_prop_get_filename, qauthz_list_file_prop_set_filename); - object_class_property_add_bool(oc, "refresh", - qauthz_list_file_prop_get_refresh, - qauthz_list_file_prop_set_refresh); + object_class_property_add_bool_ptr(oc, "refresh", + offsetof(QAuthZListFile, refresh), + OBJ_PROP_FLAG_READWRITE); authz->is_allowed = qauthz_list_file_is_allowed; } From patchwork Thu Oct 22 22:31:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1386462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PktZUmsh; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CHMf956H3z9sTD for ; Fri, 23 Oct 2020 09:36:17 +1100 (AEDT) Received: from localhost ([::1]:55558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVjBv-0000aU-MC for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2020 18:36:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVj7v-0006ME-4d for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVj7r-0007rG-0S for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603405921; 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=IHHfJL2HKHTfdvkd7qqVNYxdcwNdTDTUok1ETVSGZcA=; b=PktZUmshL8ORRgZpZM/EjCQuYy6JqNfrUWSYr5Y56TV1v4brnjSMhURl6kWRQnH0eOYwf6 xnLvwSLDl83SQp3ypzMPrs1f0KwpBU+Li4/MoYfTw0S0Nv+NqjsymPBynYN4F9kkqEDTNP vgrT3WIPwOlJtRZdyr59xcjZ+BsC1zQ= 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-312-7VFkkiE9OQ2sXcoZzRwYyg-1; Thu, 22 Oct 2020 18:31:59 -0400 X-MC-Unique: 7VFkkiE9OQ2sXcoZzRwYyg-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 430998CAA24; Thu, 22 Oct 2020 22:31:58 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id C29FE5D9CC; Thu, 22 Oct 2020 22:31:54 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 3/4] machine: Use object_class_property_add_bool_ptr() when possible Date: Thu, 22 Oct 2020 18:31:39 -0400 Message-Id: <20201022223140.2083123-4-ehabkost@redhat.com> In-Reply-To: <20201022223140.2083123-1-ehabkost@redhat.com> References: <20201022223140.2083123-1-ehabkost@redhat.com> 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=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/10/22 08:09:01 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Igor Mammedov , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Get rid if some manually written properties getters/setters. Not all properties could be converted because they have extra logic in the property setter. Signed-off-by: Eduardo Habkost --- Cc: Eduardo Habkost Cc: Marcel Apfelbaum Cc: qemu-devel@nongnu.org --- hw/core/machine.c | 78 ++++++++--------------------------------------- 1 file changed, 13 insertions(+), 65 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index d740a7e963..21cad22b9e 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -325,34 +325,6 @@ static void machine_set_dt_compatible(Object *obj, const char *value, Error **er ms->dt_compatible = g_strdup(value); } -static bool machine_get_dump_guest_core(Object *obj, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - return ms->dump_guest_core; -} - -static void machine_set_dump_guest_core(Object *obj, bool value, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - ms->dump_guest_core = value; -} - -static bool machine_get_mem_merge(Object *obj, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - return ms->mem_merge; -} - -static void machine_set_mem_merge(Object *obj, bool value, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - ms->mem_merge = value; -} - static bool machine_get_usb(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); @@ -368,20 +340,6 @@ static void machine_set_usb(Object *obj, bool value, Error **errp) ms->usb_disabled = !value; } -static bool machine_get_graphics(Object *obj, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - return ms->enable_graphics; -} - -static void machine_set_graphics(Object *obj, bool value, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - ms->enable_graphics = value; -} - static char *machine_get_firmware(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); @@ -397,20 +355,6 @@ static void machine_set_firmware(Object *obj, const char *value, Error **errp) ms->firmware = g_strdup(value); } -static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - ms->suppress_vmdesc = value; -} - -static bool machine_get_suppress_vmdesc(Object *obj, Error **errp) -{ - MachineState *ms = MACHINE(obj); - - return ms->suppress_vmdesc; -} - static void machine_set_enforce_config_section(Object *obj, bool value, Error **errp) { @@ -449,7 +393,7 @@ static void machine_set_memory_encryption(Object *obj, const char *value, * so there's no point in it trying to merge areas. */ if (value) { - machine_set_mem_merge(obj, false, errp); + ms->mem_merge = false; } } @@ -827,13 +771,15 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "dt-compatible", "Overrides the \"compatible\" property of the dt root node"); - object_class_property_add_bool(oc, "dump-guest-core", - machine_get_dump_guest_core, machine_set_dump_guest_core); + object_class_property_add_bool_ptr(oc, "dump-guest-core", + offsetof(MachineState, dump_guest_core), + OBJ_PROP_FLAG_READWRITE); object_class_property_set_description(oc, "dump-guest-core", "Include guest memory in a core dump"); - object_class_property_add_bool(oc, "mem-merge", - machine_get_mem_merge, machine_set_mem_merge); + object_class_property_add_bool_ptr(oc, "mem-merge", + offsetof(MachineState, mem_merge), + OBJ_PROP_FLAG_READWRITE); object_class_property_set_description(oc, "mem-merge", "Enable/disable memory merge support"); @@ -842,8 +788,9 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "usb", "Set on/off to enable/disable usb"); - object_class_property_add_bool(oc, "graphics", - machine_get_graphics, machine_set_graphics); + object_class_property_add_bool_ptr(oc, "graphics", + offsetof(MachineState, enable_graphics), + OBJ_PROP_FLAG_READWRITE); object_class_property_set_description(oc, "graphics", "Set on/off to enable/disable graphics emulation"); @@ -852,8 +799,9 @@ static void machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, "firmware", "Firmware image"); - object_class_property_add_bool(oc, "suppress-vmdesc", - machine_get_suppress_vmdesc, machine_set_suppress_vmdesc); + object_class_property_add_bool_ptr(oc, "suppress-vmdesc", + offsetof(MachineState, suppress_vmdesc), + OBJ_PROP_FLAG_READWRITE); object_class_property_set_description(oc, "suppress-vmdesc", "Set on to disable self-describing migration"); From patchwork Thu Oct 22 22:31:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1386464 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UcsFCaZc; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4CHMhx1ds5z9sSn for ; Fri, 23 Oct 2020 09:38:41 +1100 (AEDT) Received: from localhost ([::1]:59908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVjEF-0002Vu-9G for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2020 18:38:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVj7v-0006NB-Or for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVj7s-0007rN-SY for qemu-devel@nongnu.org; Thu, 22 Oct 2020 18:32:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603405924; 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=QoFXLo8lO3rUNqTKjHIZBDthubuFa4/zr4nO6XUKvwo=; b=UcsFCaZcihgST6pJ+AErqCkRPw4aWa/EDuaOKcZcmq+Dvt/f4KxcP2BAdGKMdLHXArI6Li Z2G5twv5fMCywGs3wCneVITWoV0Dpg2JEaTZtICwWB+S5eVua3vfQcWzd5UDiI1HNMfliF 12H5bLsOGSwdRWZTYJGdf4r9+bRYI5I= 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-469-JZ2sQbkFPXShYO7ERswvXg-1; Thu, 22 Oct 2020 18:32:01 -0400 X-MC-Unique: JZ2sQbkFPXShYO7ERswvXg-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 79CD2186DD29; Thu, 22 Oct 2020 22:31:59 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F28B5B4A9; Thu, 22 Oct 2020 22:31:59 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 4/4] pc: Use object_class_property_add_bool_ptr() Date: Thu, 22 Oct 2020 18:31:40 -0400 Message-Id: <20201022223140.2083123-5-ehabkost@redhat.com> In-Reply-To: <20201022223140.2083123-1-ehabkost@redhat.com> References: <20201022223140.2083123-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=216.205.24.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/22 08:33:10 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_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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Igor Mammedov , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Get rid of manually written property getters/setters. Signed-off-by: Eduardo Habkost --- Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: "Michael S. Tsirkin" Cc: Marcel Apfelbaum Cc: qemu-devel@nongnu.org --- hw/i386/pc.c | 57 +++++++++------------------------------------------- 1 file changed, 9 insertions(+), 48 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4e323755d0..d5a5b1b2ae 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1493,48 +1493,6 @@ static void pc_machine_set_vmport(Object *obj, Visitor *v, const char *name, visit_type_OnOffAuto(v, name, &pcms->vmport, errp); } -static bool pc_machine_get_smbus(Object *obj, Error **errp) -{ - PCMachineState *pcms = PC_MACHINE(obj); - - return pcms->smbus_enabled; -} - -static void pc_machine_set_smbus(Object *obj, bool value, Error **errp) -{ - PCMachineState *pcms = PC_MACHINE(obj); - - pcms->smbus_enabled = value; -} - -static bool pc_machine_get_sata(Object *obj, Error **errp) -{ - PCMachineState *pcms = PC_MACHINE(obj); - - return pcms->sata_enabled; -} - -static void pc_machine_set_sata(Object *obj, bool value, Error **errp) -{ - PCMachineState *pcms = PC_MACHINE(obj); - - pcms->sata_enabled = value; -} - -static bool pc_machine_get_pit(Object *obj, Error **errp) -{ - PCMachineState *pcms = PC_MACHINE(obj); - - return pcms->pit_enabled; -} - -static void pc_machine_set_pit(Object *obj, bool value, Error **errp) -{ - PCMachineState *pcms = PC_MACHINE(obj); - - pcms->pit_enabled = value; -} - static void pc_machine_get_max_ram_below_4g(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) @@ -1697,14 +1655,17 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) object_class_property_set_description(oc, PC_MACHINE_VMPORT, "Enable vmport (pc & q35)"); - object_class_property_add_bool(oc, PC_MACHINE_SMBUS, - pc_machine_get_smbus, pc_machine_set_smbus); + object_class_property_add_bool_ptr(oc, PC_MACHINE_SMBUS, + offsetof(PCMachineState, smbus_enabled), + OBJ_PROP_FLAG_READWRITE); - object_class_property_add_bool(oc, PC_MACHINE_SATA, - pc_machine_get_sata, pc_machine_set_sata); + object_class_property_add_bool_ptr(oc, PC_MACHINE_SATA, + offsetof(PCMachineState, sata_enabled), + OBJ_PROP_FLAG_READWRITE); - object_class_property_add_bool(oc, PC_MACHINE_PIT, - pc_machine_get_pit, pc_machine_set_pit); + object_class_property_add_bool_ptr(oc, PC_MACHINE_PIT, + offsetof(PCMachineState, pit_enabled), + OBJ_PROP_FLAG_READWRITE); } static const TypeInfo pc_machine_info = {