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=-9.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D8606C55178 for ; Wed, 21 Oct 2020 13:32:54 +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 22BFE2080A for ; Wed, 21 Oct 2020 13:32:52 +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="Y6X4eSIN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22BFE2080A 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]:57262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVEEV-0006vv-5j for qemu-devel@archiver.kernel.org; Wed, 21 Oct 2020 09:32:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVECh-0004yP-89 for qemu-devel@nongnu.org; Wed, 21 Oct 2020 09:30:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVECZ-0004oB-TT for qemu-devel@nongnu.org; Wed, 21 Oct 2020 09:30:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603287049; 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=N0T8XO9idDdAwSP4d//3eITX7a7yEAKI3OG+c97Ozt4=; b=Y6X4eSINxyswypCz46u/pedwtQT57CBnjuaEvrx+SXOg8URa78QzlxFhhR7E/fm/Z7tGw+ 5DhJFDkk5ppBndCPaZJ+TQcgHccIv3x97cMhP30qDTU2rSZjyW1UY/U2uFGUhDuBdba3xT KU2fq4iNicGIBB2b0Tnhh8POlLcGzHE= 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-510-Uc-l9i43NgG7IMDCZ0Ea0A-1; Wed, 21 Oct 2020 09:30:46 -0400 X-MC-Unique: Uc-l9i43NgG7IMDCZ0Ea0A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED5749CC01 for ; Wed, 21 Oct 2020 13:30:45 +0000 (UTC) Received: from localhost (ovpn-66-44.rdu2.redhat.com [10.10.66.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26F121002C01; Wed, 21 Oct 2020 13:30:42 +0000 (UTC) Date: Wed, 21 Oct 2020 09:30:41 -0400 From: Eduardo Habkost To: Igor Mammedov Subject: Re: [PATCH 03/12] qom: Make object_class_property_add_uint*_ptr() get offset Message-ID: <20201021133041.GT5733@habkost.net> References: <20201009160122.1662082-1-ehabkost@redhat.com> <20201009160122.1662082-4-ehabkost@redhat.com> <20201021142408.72d2b92f@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201021142408.72d2b92f@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit 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/20 22:12:28 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 =?utf-8?B?UC4gQmVycmFuZ8Op?= , qemu-devel@nongnu.org, Markus Armbruster , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Paolo Bonzini , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Oct 21, 2020 at 02:24:08PM +0200, Igor Mammedov wrote: > On Fri, 9 Oct 2020 12:01:13 -0400 > Eduardo Habkost wrote: > > > The existing object_class_property_add_uint*_ptr() functions are > > not very useful, because they need a pointer to the property > > value, which can't really be provided before the object is > > created. > > > > Replace the pointer parameter in those functions with a > > `ptrdiff_t offset` parameter. > > > > Include a uint8 class property in check-qom-proplist unit tests, > > to ensure the feature is working. > > > Not sure I like approach, it's reinventing qdev pointer properties in QOM form. Yes, and that's on purpose. If we want to eventually merge the two competing APIs into a single one, we need to make them converge. > I had an impression that Paolo wanted qdev pointer properties be gone > and replaced by something like link properties. This is completely unrelated to qdev pointer properties and link properties. The properties that use object_property_add_uint*_ptr() today are not qdev pointer properties and will never be link properties. They are just integer properties. > > object_property_add_uintXX_ptr() were introduced as a quick hack, > when ACPI code generation was moved from Seabios, to avoid more > code shuffling in device models and adding more boiler plate in > form of custom setters/getters (the later didn't seem to bother > us everywhere else where we use object_[class_]property_add() ). > Then it spread little bit to another places. > > I'd rather get rid of object_property_add_uintXX_ptr() API altogether > in favor of object_[class_]property_add() like it is used in other places > to handle intXX properties. > Adding helpers similar to object_property_add_bool() for intXX > could reduce boiler plate need for converting current instances of > _ptr(), and such helpers would also help with reducing boilerplate > for the rest of instances where object_[class_]property_add() > currently is used for dealing with integers. I find object_property_add_bool() terrible. It requires too much boilerplate. I actually have plans to introduce object*_property_add_bool_ptr() to simplify existing object_property_add_bool() callers. I don't love object*_property_add_*_ptr() either. I consider the qdev property API better. But we need a reasonable alternative, because the qdev API can't be used by non-device objects yet. I don't think object*_property_add() and object*_property_add_bool() are reasonable alternatives. > > > > Signed-off-by: Eduardo Habkost > > --- > > Cc: Paolo Bonzini > > Cc: "Daniel P. Berrangé" > > Cc: Eduardo Habkost > > Cc: qemu-devel@nongnu.org > > --- > > include/qom/object.h | 8 ++++---- > > qom/object.c | 36 +++++++++++++++++++++++------------- > > tests/check-qom-proplist.c | 10 ++++++++-- > > 3 files changed, 35 insertions(+), 19 deletions(-) > > > > diff --git a/include/qom/object.h b/include/qom/object.h > > index d378f13a11..1634294e4f 100644 > > --- a/include/qom/object.h > > +++ b/include/qom/object.h > > @@ -1747,7 +1747,7 @@ ObjectProperty *object_property_add_uint8_ptr(Object *obj, const char *name, > > > > ObjectProperty *object_class_property_add_uint8_ptr(ObjectClass *klass, > > const char *name, > > - const uint8_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags); > > > > /** > > @@ -1768,7 +1768,7 @@ ObjectProperty *object_property_add_uint16_ptr(Object *obj, const char *name, > > > > ObjectProperty *object_class_property_add_uint16_ptr(ObjectClass *klass, > > const char *name, > > - const uint16_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags); > > > > /** > > @@ -1789,7 +1789,7 @@ ObjectProperty *object_property_add_uint32_ptr(Object *obj, const char *name, > > > > ObjectProperty *object_class_property_add_uint32_ptr(ObjectClass *klass, > > const char *name, > > - const uint32_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags); > > > > /** > > @@ -1810,7 +1810,7 @@ ObjectProperty *object_property_add_uint64_ptr(Object *obj, const char *name, > > > > ObjectProperty *object_class_property_add_uint64_ptr(ObjectClass *klass, > > const char *name, > > - const uint64_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags); > > > > /** > > diff --git a/qom/object.c b/qom/object.c > > index 17692ed5c3..bb32f5d3ad 100644 > > --- a/qom/object.c > > +++ b/qom/object.c > > @@ -2450,13 +2450,22 @@ static char *object_get_type(Object *obj, Error **errp) > > } > > > > typedef struct { > > - /* Pointer to property value */ > > - void *ptr; > > + bool is_offset; > > + union { > > + /* Pointer to property value. Valid if is_offset=false */ > > + void *ptr; > > + /* Offset in Object struct. Valid if is_offset=true */ > > + ptrdiff_t offset; > > + }; > > } PointerProperty; > > > > static void *pointer_property_get_ptr(Object *obj, PointerProperty *prop) > > { > > - return prop->ptr; > > + if (prop->is_offset) { > > + return (void *)obj + prop->offset; > > + } else { > > + return prop->ptr; > > + } > > } > > > > static void property_get_uint8_ptr(Object *obj, Visitor *v, const char *name, > > @@ -2573,10 +2582,11 @@ object_class_property_add_uint_ptr(ObjectClass *oc, const char *name, > > ObjectPropertyAccessor getter, > > ObjectPropertyAccessor setter, > > ObjectPropertyFlags flags, > > - void *ptr) > > + ptrdiff_t offset) > > { > > PointerProperty *prop = g_new0(PointerProperty, 1); > > - prop->ptr = ptr; > > + prop->is_offset = true; > > + prop->offset = offset; > > return object_class_property_add(oc, name, type, > > (flags & OBJ_PROP_FLAG_READ) ? getter : NULL, > > (flags & OBJ_PROP_FLAG_WRITE) ? setter : NULL, > > @@ -2597,13 +2607,13 @@ object_property_add_uint8_ptr(Object *obj, const char *name, > > > > ObjectProperty * > > object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, > > - const uint8_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags) > > { > > return object_class_property_add_uint_ptr(klass, name, "uint8", > > property_get_uint8_ptr, > > property_set_uint8_ptr, > > - flags, (void *)v); > > + flags, offset); > > } > > > > ObjectProperty * > > @@ -2620,13 +2630,13 @@ object_property_add_uint16_ptr(Object *obj, const char *name, > > > > ObjectProperty * > > object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, > > - const uint16_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags) > > { > > return object_class_property_add_uint_ptr(klass, name, "uint16", > > property_get_uint16_ptr, > > property_set_uint16_ptr, > > - flags, (void *)v); > > + flags, offset); > > } > > > > ObjectProperty * > > @@ -2643,13 +2653,13 @@ object_property_add_uint32_ptr(Object *obj, const char *name, > > > > ObjectProperty * > > object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, > > - const uint32_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags) > > { > > return object_class_property_add_uint_ptr(klass, name, "uint32", > > property_get_uint32_ptr, > > property_set_uint32_ptr, > > - flags, (void *)v); > > + flags, offset); > > } > > > > ObjectProperty * > > @@ -2666,13 +2676,13 @@ object_property_add_uint64_ptr(Object *obj, const char *name, > > > > ObjectProperty * > > object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, > > - const uint64_t *v, > > + ptrdiff_t offset, > > ObjectPropertyFlags flags) > > { > > return object_class_property_add_uint_ptr(klass, name, "uint64", > > property_get_uint64_ptr, > > property_set_uint64_ptr, > > - flags, (void *)v); > > + flags, offset); > > } > > > > typedef struct { > > diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c > > index 1b76581980..fba30c20b2 100644 > > --- a/tests/check-qom-proplist.c > > +++ b/tests/check-qom-proplist.c > > @@ -61,6 +61,7 @@ struct DummyObject { > > bool bv; > > DummyAnimal av; > > char *sv; > > + uint8_t u8v; > > }; > > > > struct DummyObjectClass { > > @@ -141,6 +142,9 @@ static void dummy_class_init(ObjectClass *cls, void *data) > > &dummy_animal_map, > > dummy_get_av, > > dummy_set_av); > > + object_class_property_add_uint8_ptr(cls, "u8v", > > + offsetof(DummyObject, u8v), > > + OBJ_PROP_FLAG_READWRITE); > > } > > > > > > @@ -385,12 +389,14 @@ static void test_dummy_createlist(void) > > "bv", "yes", > > "sv", "Hiss hiss hiss", > > "av", "platypus", > > + "u8v", "42", > > NULL)); > > > > g_assert(err == NULL); > > g_assert_cmpstr(dobj->sv, ==, "Hiss hiss hiss"); > > g_assert(dobj->bv == true); > > g_assert(dobj->av == DUMMY_PLATYPUS); > > + g_assert_cmpint(dobj->u8v, ==, 42); > > > > g_assert(object_resolve_path_component(parent, "dummy0") > > == OBJECT(dobj)); > > @@ -531,7 +537,7 @@ static void test_dummy_iterator(void) > > { > > const char *expected[] = { > > "type", /* inherited from TYPE_OBJECT */ > > - "sv", "av", /* class properties */ > > + "sv", "av", "u8v", /* class properties */ > > "bv"}; /* instance property */ > > Object *parent = object_get_objects_root(); > > DummyObject *dobj = DUMMY_OBJECT( > > @@ -552,7 +558,7 @@ static void test_dummy_iterator(void) > > > > static void test_dummy_class_iterator(void) > > { > > - const char *expected[] = { "type", "av", "sv" }; > > + const char *expected[] = { "type", "av", "sv", "u8v" }; > > ObjectPropertyIterator iter; > > ObjectClass *klass = object_class_by_name(TYPE_DUMMY); > > > -- Eduardo