From nobody Mon Feb 9 13:38:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1575050384; cv=pass; d=zohomail.com; s=zohoarc; b=drEfcWj2PVY3+G2MFIRmTi8dFxIreGKwshYgQsHQVj1iM8V7I6QJ1SX/Gf0XVGg8IoPqCfSszpwYLdH6DvjySFWLftwyhdNjpRFfGBagBfpQswvO64cwistVeWF71uBO/MpuiQcHAKSHbA9jjQPOF/BnwvHsP6Ub1TBTqcpRDvw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575050384; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/VWQLM4sX5qeykkiOYYdqhWfRwZl5KHgSxVCs4islm0=; b=MZQa3kA+Jb9PDMwnUtzdEJYMIRFap48Eas2W8zT2W9YoxyZ9odIciIwwzpxEK3kiM833BfzTeAnMTcrLGQMm0bf/DXrAjhQbjfF4WNgZddlvLEBJecCQMTAHEFmTq56hZsVXEGYveQXfQL9iPKH9r2ewt5YY6aLq6smz9D597TQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1575050384773717.5306076194285; Fri, 29 Nov 2019 09:59:44 -0800 (PST) Received: from localhost ([::1]:33300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iakYQ-000095-R9 for importer@patchew.org; Fri, 29 Nov 2019 12:59:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iakMC-00022o-4F for qemu-devel@nongnu.org; Fri, 29 Nov 2019 12:47:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iakM6-0000Hu-Ra for qemu-devel@nongnu.org; Fri, 29 Nov 2019 12:47:01 -0500 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]:31728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iakM3-0008QJ-76 for qemu-devel@nongnu.org; Fri, 29 Nov 2019 12:46:58 -0500 Received: from pps.filterd (m0127840.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xATHfgPp014251; Fri, 29 Nov 2019 09:46:52 -0800 Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2056.outbound.protection.outlook.com [104.47.36.56]) by mx0a-002c1b01.pphosted.com with ESMTP id 2whjspd8t3-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 29 Nov 2019 09:46:52 -0800 Received: from MWHPR02MB2656.namprd02.prod.outlook.com (10.168.206.142) by MWHPR02MB2239.namprd02.prod.outlook.com (10.168.244.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2474.17; Fri, 29 Nov 2019 17:46:50 +0000 Received: from MWHPR02MB2656.namprd02.prod.outlook.com ([fe80::f801:763d:e7fc:6bf]) by MWHPR02MB2656.namprd02.prod.outlook.com ([fe80::f801:763d:e7fc:6bf%7]) with mapi id 15.20.2474.023; Fri, 29 Nov 2019 17:46:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=/VWQLM4sX5qeykkiOYYdqhWfRwZl5KHgSxVCs4islm0=; b=i8T/M2Xb/eYg5RWRsZhIiSuOlx8T6dpByWO8MjV+6E+x3BcKs0jsOpayvluSRX2cnr9S 03S/ugc2zQPeP6M8Df5You0yJUEEKbcE7StCYMA7yQavNnv0Su9ybZNhOsaO8Hz2B/Jb La9S3K+ZFmInA67NEwx2OlcR0CsSQjZg+2YO+kud1US7BPxex3IubHHp93Zz9MCnbTjz SrmQNPB8vkKpEk4DimRzgKnWfjvdAxtnAS80Z23MnJouaGvRDgPtLCVg9QtisWBNx6ZA e1L7Jj8F1G2+FgLM8hB2pV7tQIwQsNJ/RMX4sCIx9LqZwuaBUyE4mlXCnoPLRZ6i+RQj Aw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oC984c/bgPdWqkKujTlPM4U3IPFcNLLh0wKzKX7GCNmN98UXWcM4v6jXrIsT5PUefgsE3GHIvdHCr8H4kYcQeOUu4Ph0z03kajZzcX+8ns/mfjYJvN9MtWQNm9/3Gpy4S0a+PBcStDI3RdzmM+z6vGbt/lvIUSN0x5XEjsVIM6BXga9ctCZR+WRNoqoGxqMq+vnJRdyORVddWUS2xxDKCpLBVa9KtrqSgYOMHaJIMjhjlX4ose/uFjEkcpFaORXa6Kz0KByYLFh5k8tL9bm845jWedTRrlggW9uMlEEyh9POgLC8lUTB4pQ6y3n/yN4WwpmVSSKh+JgJPlXsphfAgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/VWQLM4sX5qeykkiOYYdqhWfRwZl5KHgSxVCs4islm0=; b=Su8HCFzYNmXooxmUa6sFMz65l1ZSy6NiFL5hi/gO69lL4rBk7szE+sGQ2fE33WCHIRbhJXBtbCH4X57qbZ5v4e5G6hy0IQG3wAWrQDZbmpt4LApjSHRTr+I5kWoShvzP5ctNo+0fsbiiYZHFFOfClCE0q/rLU9/IOHhJazXxo7Fwzz/imLE0dIuCfPUeEpvZ22mlSsatyY6hTYzk8zxMLEDUqdofKLafW/fTEdBBFRbwO4iQml0jyO2B4CyGFuzFii6GDnk89IWqHaDGP9Kpb8RB94HPTmzrUuNI2JuQjbk+5oYesrwu1TYUlzr0V8XAvGsWxqGQkZqxevIiLE9eiA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none From: Felipe Franciosi To: Marc-Andre Lureau , Philippe Mathieu-Daude , Stefan Hajnoczi , Eduardo Habkost , Markus Armbruster , Alexey Kardashevskiy Subject: [PATCH v3 1/4] qom/object: enable setter for uint types Thread-Topic: [PATCH v3 1/4] qom/object: enable setter for uint types Thread-Index: AQHVptz6uBqYLWzQrUa3UuVE8gI3Tw== Date: Fri, 29 Nov 2019 17:46:49 +0000 Message-ID: <20191129174630.6922-2-felipe@nutanix.com> References: <20191129174630.6922-1-felipe@nutanix.com> In-Reply-To: <20191129174630.6922-1-felipe@nutanix.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0394.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:f::22) To MWHPR02MB2656.namprd02.prod.outlook.com (2603:10b6:300:45::14) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [62.254.189.133] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 56f30345-a61a-4556-1aa6-08d774f41c87 x-ms-traffictypediagnostic: MWHPR02MB2239: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-proofpoint-crosstenant: true x-ms-oob-tlc-oobclassifiers: OLM:287; x-forefront-prvs: 0236114672 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(136003)(376002)(346002)(366004)(199004)(189003)(386003)(66946007)(66476007)(305945005)(64756008)(6506007)(76176011)(66556008)(30864003)(6486002)(5660300002)(6512007)(25786009)(7736002)(66446008)(1076003)(36756003)(52116002)(66066001)(256004)(6436002)(71190400001)(186003)(26005)(86362001)(8936002)(110136005)(446003)(4326008)(54906003)(14454004)(102836004)(71200400001)(99286004)(81166006)(50226002)(6116002)(316002)(2906002)(478600001)(2616005)(81156014)(11346002)(3846002)(8676002)(64030200001)(579004); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR02MB2239; H:MWHPR02MB2656.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; received-spf: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TihHiymtK/oAT6ORfe/WT5JaLR4lTEOkv+qaIqDgJ4aUo/hp2j/LN4Jbjjk/JFoVAtkTHiu5w542WSgmZj2UWFMX8BIiguDyw8h89x+vKFMZ65ys7uBecfmL32wam4b3chWs4S2SG4vqv4XPJxcDOw8Xum/QHIbbrzS1cnmhx5WV2AjhjV+uPt3yu/ZEARzURB5x1nJaqe2V0OEedu+lmw0q7sQCXYgPo9a7fay3TVdhH5pQFuIzPWqcnW0G5+ZtEqgs7Z+WZSIl/kHN5yV6ssbztOaHncWSa/kjVZNhEEv3dlEzq+Ddw0CairnfaGsgQDBI9U8lPTk4E0fVvVUwKe54zyNm/sWpS6kyB6kj3Y6fV9Ugi2KKzakO/dTxWJdm2GK38yIAD68pn2/4N/B0SMhZY6WL2Xz1M2vVgAxPcXn9Wj5DXWe9/mSi8Gd95lQu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56f30345-a61a-4556-1aa6-08d774f41c87 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2019 17:46:49.8861 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: VEPbD3XoSQWKMH51ELUWAdSvaRKfDFniMyAx2asXNOhQMErQcS/mDzx4BhksykW9gJVMIOy+sltlb4VUR9bHa/Fd5g8qEy+VUSDsISLz6jE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2239 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-29_05:2019-11-29,2019-11-29 signatures=0 X-Proofpoint-Spam-Reason: safe X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.151.68 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: "qemu-devel@nongnu.org" , Felipe Franciosi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Traditionally, the uint-specific property helpers only offer getters. When adding object (or class) uint types, one must therefore use the generic property helper if a setter is needed (and probably duplicate some code writing their own getters/setters). This enhances the uint-specific property helper APIs by adding a bitwise-or'd 'flags' field and modifying all clients of that API to set this paramater to OBJ_PROP_FLAG_READ. This maintains the current behaviour whilst allowing others to also set OBJ_PROP_FLAG_WRITE (or use the more convenient OBJ_PROP_FLAG_READWRITE) in the future (which will automatically install a setter). Other flags may be added later. Signed-off-by: Felipe Franciosi Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/acpi/ich9.c | 4 +- hw/acpi/pcihp.c | 7 +- hw/acpi/piix4.c | 12 +-- hw/isa/lpc_ich9.c | 4 +- hw/ppc/spapr_drc.c | 3 +- include/qom/object.h | 44 +++++++-- qom/object.c | 216 ++++++++++++++++++++++++++++++++++++++----- ui/console.c | 4 +- 8 files changed, 246 insertions(+), 48 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 2034dd749e..742fb78226 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -454,12 +454,12 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMReg= s *pm, Error **errp) pm->s4_val =3D 2; =20 object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, - &pm->pm_io_base, errp); + &pm->pm_io_base, OBJ_PROP_FLAG_READ, er= rp); object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32", ich9_pm_get_gpe0_blk, NULL, NULL, pm, NULL); object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN, - &gpe0_len, errp); + &gpe0_len, OBJ_PROP_FLAG_READ, errp); object_property_add_bool(obj, "memory-hotplug-support", ich9_pm_get_memory_hotplug_support, ich9_pm_set_memory_hotplug_support, diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 8413348a33..4dcef372bf 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -80,7 +80,8 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque) =20 *bus_bsel =3D (*bsel_alloc)++; object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, - bus_bsel, &error_abort); + bus_bsel, OBJ_PROP_FLAG_READ, + &error_abort); } =20 return bsel_alloc; @@ -373,9 +374,9 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, = PCIBus *root_bus, memory_region_add_subregion(address_space_io, s->io_base, &s->io); =20 object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_= base, - &error_abort); + OBJ_PROP_FLAG_READ, &error_abort); object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_l= en, - &error_abort); + OBJ_PROP_FLAG_READ, &error_abort); } =20 const VMStateDescription vmstate_acpi_pcihp_pci_status =3D { diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 93aec2dd2c..fe05a3ce46 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -443,17 +443,17 @@ static void piix4_pm_add_propeties(PIIX4PMState *s) static const uint16_t sci_int =3D 9; =20 object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD, - &acpi_enable_cmd, NULL); + &acpi_enable_cmd, OBJ_PROP_FLAG_READ, NU= LL); object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD, - &acpi_disable_cmd, NULL); + &acpi_disable_cmd, OBJ_PROP_FLAG_READ, N= ULL); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK, - &gpe0_blk, NULL); + &gpe0_blk, OBJ_PROP_FLAG_READ, NULL); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN, - &gpe0_blk_len, NULL); + &gpe0_blk_len, OBJ_PROP_FLAG_READ, NULL); object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT, - &sci_int, NULL); + &sci_int, OBJ_PROP_FLAG_READ, NULL); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE, - &s->io_base, NULL); + &s->io_base, OBJ_PROP_FLAG_READ, NULL); } =20 static void piix4_pm_realize(PCIDevice *dev, Error **errp) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 17c292e306..99517c3946 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -645,9 +645,9 @@ static void ich9_lpc_add_properties(ICH9LPCState *lpc) ich9_lpc_get_sci_int, NULL, NULL, NULL, NULL); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CM= D, - &acpi_enable_cmd, NULL); + &acpi_enable_cmd, OBJ_PROP_FLAG_READ, NU= LL); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_C= MD, - &acpi_disable_cmd, NULL); + &acpi_disable_cmd, OBJ_PROP_FLAG_READ, N= ULL); =20 ich9_pm_add_properties(OBJECT(lpc), &lpc->pm, NULL); } diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 62f1a42592..bbd4bf35c7 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -553,7 +553,8 @@ static void spapr_dr_connector_instance_init(Object *ob= j) SpaprDrc *drc =3D SPAPR_DR_CONNECTOR(obj); SpaprDrcClass *drck =3D SPAPR_DR_CONNECTOR_GET_CLASS(drc); =20 - object_property_add_uint32_ptr(obj, "id", &drc->id, NULL); + object_property_add_uint32_ptr(obj, "id", &drc->id, OBJ_PROP_FLAG_READ, + NULL); object_property_add(obj, "index", "uint32", prop_get_index, NULL, NULL, NULL, NULL); object_property_add(obj, "fdt", "struct", prop_get_fdt, diff --git a/include/qom/object.h b/include/qom/object.h index 128d00c77f..d2bfd76741 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1579,65 +1579,93 @@ void object_class_property_add_tm(ObjectClass *klas= s, const char *name, void (*get)(Object *, struct tm *, Error= **), Error **errp); =20 +typedef enum { + /* Automatically add a getter to the property */ + OBJ_PROP_FLAG_READ =3D 1 << 0, + /* Automatically add a setter to the property */ + OBJ_PROP_FLAG_WRITE =3D 1 << 1, + /* Automatically add a getter and a setter to the property */ + OBJ_PROP_FLAG_READWRITE =3D (OBJ_PROP_FLAG_READ | OBJ_PROP_FLAG_WRITE), +} ObjectPropertyFlags; + /** * object_property_add_uint8_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @flags: bitwise-or'd ObjectPropertyFlags * @errp: if an error occurs, a pointer to an area to store the error * * Add an integer property in memory. This function will add a * property of type 'uint8'. */ void object_property_add_uint8_ptr(Object *obj, const char *name, - const uint8_t *v, Error **errp); + const uint8_t *v, ObjectPropertyFlags f= lags, + Error **errp); void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *n= ame, - const uint8_t *v, Error **errp); + const uint8_t *v, + ObjectPropertyFlags flags, + Error **errp); =20 /** * object_property_add_uint16_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @flags: bitwise-or'd ObjectPropertyFlags * @errp: if an error occurs, a pointer to an area to store the error * * Add an integer property in memory. This function will add a * property of type 'uint16'. */ void object_property_add_uint16_ptr(Object *obj, const char *name, - const uint16_t *v, Error **errp); + const uint16_t *v, + ObjectPropertyFlags flags, + Error **errp); void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *= name, - const uint16_t *v, Error **errp); + const uint16_t *v, + ObjectPropertyFlags flags, + Error **errp); =20 /** * object_property_add_uint32_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @flags: bitwise-or'd ObjectPropertyFlags * @errp: if an error occurs, a pointer to an area to store the error * * Add an integer property in memory. This function will add a * property of type 'uint32'. */ void object_property_add_uint32_ptr(Object *obj, const char *name, - const uint32_t *v, Error **errp); + const uint32_t *v, + ObjectPropertyFlags flags, + Error **errp); void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *= name, - const uint32_t *v, Error **errp); + const uint32_t *v, + ObjectPropertyFlags flags, + Error **errp); =20 /** * object_property_add_uint64_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @flags: bitwise-or'd ObjectPropertyFlags * @errp: if an error occurs, a pointer to an area to store the error * * Add an integer property in memory. This function will add a * property of type 'uint64'. */ void object_property_add_uint64_ptr(Object *obj, const char *name, - const uint64_t *v, Error **Errp); + const uint64_t *v, + ObjectPropertyFlags flags, + Error **Errp); void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *= name, - const uint64_t *v, Error **Errp); + const uint64_t *v, + ObjectPropertyFlags flags, + Error **Errp); =20 /** * object_property_add_alias: diff --git a/qom/object.c b/qom/object.c index d51b57fba1..77c2682296 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2326,6 +2326,22 @@ static void property_get_uint8_ptr(Object *obj, Visi= tor *v, const char *name, visit_type_uint8(v, name, &value, errp); } =20 +static void property_set_uint8_ptr(Object *obj, Visitor *v, const char *na= me, + void *opaque, Error **errp) +{ + uint8_t *field =3D opaque; + uint8_t value; + Error *local_err =3D NULL; + + visit_type_uint8(v, name, &value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + *field =3D value; +} + static void property_get_uint16_ptr(Object *obj, Visitor *v, const char *n= ame, void *opaque, Error **errp) { @@ -2333,6 +2349,22 @@ static void property_get_uint16_ptr(Object *obj, Vis= itor *v, const char *name, visit_type_uint16(v, name, &value, errp); } =20 +static void property_set_uint16_ptr(Object *obj, Visitor *v, const char *n= ame, + void *opaque, Error **errp) +{ + uint16_t *field =3D opaque; + uint16_t value; + Error *local_err =3D NULL; + + visit_type_uint16(v, name, &value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + *field =3D value; +} + static void property_get_uint32_ptr(Object *obj, Visitor *v, const char *n= ame, void *opaque, Error **errp) { @@ -2340,6 +2372,22 @@ static void property_get_uint32_ptr(Object *obj, Vis= itor *v, const char *name, visit_type_uint32(v, name, &value, errp); } =20 +static void property_set_uint32_ptr(Object *obj, Visitor *v, const char *n= ame, + void *opaque, Error **errp) +{ + uint32_t *field =3D opaque; + uint32_t value; + Error *local_err =3D NULL; + + visit_type_uint32(v, name, &value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + *field =3D value; +} + static void property_get_uint64_ptr(Object *obj, Visitor *v, const char *n= ame, void *opaque, Error **errp) { @@ -2347,60 +2395,180 @@ static void property_get_uint64_ptr(Object *obj, V= isitor *v, const char *name, visit_type_uint64(v, name, &value, errp); } =20 +static void property_set_uint64_ptr(Object *obj, Visitor *v, const char *n= ame, + void *opaque, Error **errp) +{ + uint64_t *field =3D opaque; + uint64_t value; + Error *local_err =3D NULL; + + visit_type_uint64(v, name, &value, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + + *field =3D value; +} + void object_property_add_uint8_ptr(Object *obj, const char *name, - const uint8_t *v, Error **errp) + const uint8_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_property_add(obj, name, "uint8", property_get_uint8_ptr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint8_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint8_ptr; + } + + object_property_add(obj, name, "uint8", + getter, setter, NULL, (void *)v, errp); } =20 void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *n= ame, - const uint8_t *v, Error **errp) + const uint8_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_class_property_add(klass, name, "uint8", property_get_uint8_ptr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint8_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint8_ptr; + } + + object_class_property_add(klass, name, "uint8", + getter, setter, NULL, (void *)v, errp); } =20 void object_property_add_uint16_ptr(Object *obj, const char *name, - const uint16_t *v, Error **errp) + const uint16_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_property_add(obj, name, "uint16", property_get_uint16_ptr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint16_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint16_ptr; + } + + object_property_add(obj, name, "uint16", + getter, setter, NULL, (void *)v, errp); } =20 void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *= name, - const uint16_t *v, Error **errp) + const uint16_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_class_property_add(klass, name, "uint16", property_get_uint16_p= tr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint16_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint16_ptr; + } + + object_class_property_add(klass, name, "uint16", + getter, setter, NULL, (void *)v, errp); } =20 void object_property_add_uint32_ptr(Object *obj, const char *name, - const uint32_t *v, Error **errp) + const uint32_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_property_add(obj, name, "uint32", property_get_uint32_ptr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint32_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint32_ptr; + } + + object_property_add(obj, name, "uint32", + getter, setter, NULL, (void *)v, errp); } =20 void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *= name, - const uint32_t *v, Error **errp) + const uint32_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_class_property_add(klass, name, "uint32", property_get_uint32_p= tr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint32_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint32_ptr; + } + + object_class_property_add(klass, name, "uint32", + getter, setter, NULL, (void *)v, errp); } =20 void object_property_add_uint64_ptr(Object *obj, const char *name, - const uint64_t *v, Error **errp) + const uint64_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_property_add(obj, name, "uint64", property_get_uint64_ptr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint64_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint64_ptr; + } + + object_property_add(obj, name, "uint64", + getter, setter, NULL, (void *)v, errp); } =20 void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *= name, - const uint64_t *v, Error **errp) + const uint64_t *v, + ObjectPropertyFlags flags, + Error **errp) { - object_class_property_add(klass, name, "uint64", property_get_uint64_p= tr, - NULL, NULL, (void *)v, errp); + ObjectPropertyAccessor *getter =3D NULL; + ObjectPropertyAccessor *setter =3D NULL; + + if ((flags & OBJ_PROP_FLAG_READ) =3D=3D OBJ_PROP_FLAG_READ) { + getter =3D property_get_uint64_ptr; + } + + if ((flags & OBJ_PROP_FLAG_WRITE) =3D=3D OBJ_PROP_FLAG_WRITE) { + setter =3D property_set_uint64_ptr; + } + + object_class_property_add(klass, name, "uint64", + getter, setter, NULL, (void *)v, errp); } =20 typedef struct { diff --git a/ui/console.c b/ui/console.c index 82d1ddac9c..bcbe65e696 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1296,8 +1296,8 @@ static QemuConsole *new_console(DisplayState *ds, con= sole_type_t console_type, object_property_allow_set_link, OBJ_PROP_LINK_STRONG, &error_abort); - object_property_add_uint32_ptr(obj, "head", - &s->head, &error_abort); + object_property_add_uint32_ptr(obj, "head", &s->head, + OBJ_PROP_FLAG_READ, &error_abort); =20 if (!active_console || ((active_console->console_type !=3D GRAPHIC_CON= SOLE) && (console_type =3D=3D GRAPHIC_CONSOLE))) { --=20 2.20.1