From patchwork Mon Nov 25 15:36:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Franciosi X-Patchwork-Id: 11260557 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 E1A53109A for ; Mon, 25 Nov 2019 15:41:18 +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 A5DBF2082F for ; Mon, 25 Nov 2019 15:41:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nutanix.com header.i=@nutanix.com header.b="vbftO3TT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A5DBF2082F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nutanix.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]:45504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZGUH-00015I-EF for patchwork-qemu-devel@patchwork.kernel.org; Mon, 25 Nov 2019 10:41:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33295) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZGPq-0004PQ-0a for qemu-devel@nongnu.org; Mon, 25 Nov 2019 10:36:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZGPn-0007oz-Sn for qemu-devel@nongnu.org; Mon, 25 Nov 2019 10:36:41 -0500 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]:6750) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZGPn-0007oY-Lc for qemu-devel@nongnu.org; Mon, 25 Nov 2019 10:36:39 -0500 Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAPFVeZl009362; Mon, 25 Nov 2019 07:36:38 -0800 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=d52H99FygMBlQsaOLSfVBoDdwgiSasHyNJIWL0HMe2g=; b=vbftO3TTxH/Ngee8y/LjcQSu0AC7mcdCsSKwmFUVHCAvrWphZBQmh/dGq8rVx0W7AU/7 eZGJ2IkYBy7Y5mWTyxy/21ijMjEkgLE4j4CGXCPIyaq+xakHe2DfHkAqrZUGyuVZ073v of3UiPbv77z4pbiHeUCmHYeYIc2lcaJs8FNu8RwdwOePYvGZ6n4eY4GvYGpLpX9Ds9ny x++TWEra6CvQyNYPNZyUM8/whO8uwLdgz4fMoD5ALeWsQjlGKiE4CVE15iPwRoh6t3i4 Xe38UO/aabjyL8q1TdKosazFyTj0Chs3QeuhM9V6e2eDyQ0+pybdrZEsVYx8K6bdfw98 nw== Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2059.outbound.protection.outlook.com [104.47.36.59]) by mx0b-002c1b01.pphosted.com with ESMTP id 2wf4yn3unp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Nov 2019 07:36:37 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hl9iHKMZCEnaYfEn3qHzcFZ6uiFKyzVVO27hydlR3jPAAR/eFGFvZ9sXIFESUWd5HbKTzBFeanUbMrgq56NQsEfMmo569tDOKSsWnwPzQnmZa/y/1cGhWb29DskhUBM5JN4ls3tziuDpDK0XJFJo7DTFqpibaaT7xrcotEXlCQajpKLY3oZlr42fg+lBEyJ3UkrXp2ga4t0e7qcTI5X7i2osH7K819zEqLQ4n91YaGvHDFnu5hqQc7sl6/e1LppF1NrJRy6W4wE5BHc+fdQSswuDIngn1GKjVSFAmz7yc3h6o4IT98vCGDd4IzILnR7DYPD66tAVhjG07v/G7t8fJg== 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=d52H99FygMBlQsaOLSfVBoDdwgiSasHyNJIWL0HMe2g=; b=g4tTW41AJuBCJ5C3fLulx0cDTTMEZJmA5/y9/0okjBq18cJOR4CvVkUfimD/giX1mdBTSEdr9f7gyQ6zs5MXW9X1sMubsG08to06nGxV43HSssdzwTkyRbCYCQd5uX8Czl94k3mWT1F5RrtiHh4vjMDIx/v32d0z03kqG/zcPoZp+n+pTkV+E6P9lKyNzsu1gvCMuDRl4wkGOVSaWUvuHCUj9hmOPzuujzK71LN2C5U8wU3K77etabrmYlKh6d7FCuY+wYrTQSKqQoPaFPzJlriPhEmNYhli9AZpBXeNn9ErD0QDkHyqCBAUPje6f7APyCNsI5m6WonxvP3U06oUxw== 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 Received: from MWHPR02MB2656.namprd02.prod.outlook.com (10.168.206.142) by MWHPR02MB3183.namprd02.prod.outlook.com (10.164.133.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2474.19; Mon, 25 Nov 2019 15:36:36 +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; Mon, 25 Nov 2019 15:36:36 +0000 From: Felipe Franciosi To: Eduardo Habkost , Markus Armbruster , Stefan Hajnoczi Subject: [PATCH 1/4] qom/object: enable setter for uint types Thread-Topic: [PATCH 1/4] qom/object: enable setter for uint types Thread-Index: AQHVo6YfczBLJ5MzqUmyLMkT1QxxYw== Date: Mon, 25 Nov 2019 15:36:36 +0000 Message-ID: <20191125153619.39893-2-felipe@nutanix.com> References: <20191125153619.39893-1-felipe@nutanix.com> In-Reply-To: <20191125153619.39893-1-felipe@nutanix.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM0PR02CA0087.eurprd02.prod.outlook.com (2603:10a6:208:154::28) 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: 42bb2c3a-513f-486c-e061-08d771bd41b2 x-ms-traffictypediagnostic: MWHPR02MB3183: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-proofpoint-crosstenant: true x-ms-oob-tlc-oobclassifiers: OLM:249; x-forefront-prvs: 0232B30BBC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(136003)(376002)(396003)(39860400002)(366004)(189003)(199004)(4326008)(6512007)(86362001)(1076003)(3846002)(6116002)(386003)(6506007)(7736002)(305945005)(6436002)(6486002)(478600001)(54906003)(26005)(102836004)(110136005)(2906002)(36756003)(25786009)(14454004)(316002)(446003)(99286004)(256004)(107886003)(66066001)(66446008)(64756008)(66556008)(66476007)(11346002)(2616005)(5660300002)(66946007)(186003)(76176011)(52116002)(50226002)(81166006)(81156014)(8676002)(71200400001)(30864003)(8936002)(71190400001)(64030200001); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR02MB3183; H:MWHPR02MB2656.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; 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: Cva3ee0yvt1laopGQ+XACHUYiu00Q8akBuCCP9tDelzYLGkGVMYIkYy0GXFI42VtSOCIXLbM6snV08XTybXnWpZmPzmhlZo6+w3ulh3h47MEuxfwAikZP/BFeXWxIflbXAY5nSqfsebdITb5qo2bAqXtyUmxFAICuPNcCnkNdRq7KOZvBz99vCohTEQxLzMGaL1vt+OwbfDSkut96Uokj6OIpFhT+r42XVdHZpyHoAVzLsOxql8wDr87jAGK91R5gUBH7S5fiPIPt/JXffX0LOrf5At8TjcFrNRTCdY73xt9xIm/BZDVxpOOkNkOV2IuY8IMdzlcsCrHE2MTOfPcqlEpVWH4PIhtgzor16a8Sx6d3OToWtpR+do17ih3qv+t5ViHor1mE/M4lVn6o/Er4XMnXr1UoVHk7hm+EDnt17OnlQbnoiZTTKWHerrcOVAq MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42bb2c3a-513f-486c-e061-08d771bd41b2 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Nov 2019 15:36:36.3342 (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: Ej9B2IDWmn+fiV2O03OT5g7xPjvF6YBrFHktnl3a8kHnIXUdYyTQUOu1TPX16ePWAYLHunTj/6fQNoObTLhrJtqP+814KiX4yPliYHSf2pI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB3183 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-25_03:2019-11-21,2019-11-25 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.155.12 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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. This enhances the uint-specific property helper APIs by adding a 'readonly' field and modifying all users of that API to set this parameter to true. If 'readonly' is false, though, the helper will add an automatic setter for the value. Signed-off-by: Felipe Franciosi --- hw/acpi/ich9.c | 4 +- hw/acpi/pcihp.c | 6 +- hw/acpi/piix4.c | 12 ++-- hw/isa/lpc_ich9.c | 4 +- hw/ppc/spapr_drc.c | 2 +- include/qom/object.h | 28 +++++--- qom/object.c | 152 ++++++++++++++++++++++++++++++++++++------- ui/console.c | 3 +- 8 files changed, 163 insertions(+), 48 deletions(-) diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 2034dd749e..94dc5147ce 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -454,12 +454,12 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) pm->s4_val = 2; object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, - &pm->pm_io_base, errp); + &pm->pm_io_base, true, errp); 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, true, 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..70bc1408e6 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -80,7 +80,7 @@ static void *acpi_set_bsel(PCIBus *bus, void *opaque) *bus_bsel = (*bsel_alloc)++; object_property_add_uint32_ptr(OBJECT(bus), ACPI_PCIHP_PROP_BSEL, - bus_bsel, &error_abort); + bus_bsel, true, &error_abort); } return bsel_alloc; @@ -373,9 +373,9 @@ void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus, memory_region_add_subregion(address_space_io, s->io_base, &s->io); object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base, - &error_abort); + true, &error_abort); object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_len, - &error_abort); + true, &error_abort); } const VMStateDescription vmstate_acpi_pcihp_pci_status = { diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 93aec2dd2c..032ba11e62 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 = 9; object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_ENABLE_CMD, - &acpi_enable_cmd, NULL); + &acpi_enable_cmd, true, NULL); object_property_add_uint8_ptr(OBJECT(s), ACPI_PM_PROP_ACPI_DISABLE_CMD, - &acpi_disable_cmd, NULL); + &acpi_disable_cmd, true, NULL); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK, - &gpe0_blk, NULL); + &gpe0_blk, true, NULL); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_GPE0_BLK_LEN, - &gpe0_blk_len, NULL); + &gpe0_blk_len, true, NULL); object_property_add_uint16_ptr(OBJECT(s), ACPI_PM_PROP_SCI_INT, - &sci_int, NULL); + &sci_int, true, NULL); object_property_add_uint32_ptr(OBJECT(s), ACPI_PM_PROP_PM_IO_BASE, - &s->io_base, NULL); + &s->io_base, true, NULL); } 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..5555ce3342 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_CMD, - &acpi_enable_cmd, NULL); + &acpi_enable_cmd, true, NULL); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD, - &acpi_disable_cmd, NULL); + &acpi_disable_cmd, true, NULL); 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..76f389f56a 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -553,7 +553,7 @@ static void spapr_dr_connector_instance_init(Object *obj) SpaprDrc *drc = SPAPR_DR_CONNECTOR(obj); SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); - object_property_add_uint32_ptr(obj, "id", &drc->id, NULL); + object_property_add_uint32_ptr(obj, "id", &drc->id, true, 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..8fc28ed0c9 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -1584,60 +1584,72 @@ void object_class_property_add_tm(ObjectClass *klass, const char *name, * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @readonly: don't add setter for value * @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, bool readonly, + Error **errp); void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, - const uint8_t *v, Error **errp); + const uint8_t *v, bool readonly, + Error **errp); /** * object_property_add_uint16_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @readonly: don't add setter for value * @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, bool readonly, + Error **errp); void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, - const uint16_t *v, Error **errp); + const uint16_t *v, bool readonly, + Error **errp); /** * object_property_add_uint32_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @readonly: don't add setter for value * @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, bool readonly, + Error **errp); void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, - const uint32_t *v, Error **errp); + const uint32_t *v, bool readonly, + Error **errp); /** * object_property_add_uint64_ptr: * @obj: the object to add a property to * @name: the name of the property * @v: pointer to value + * @readonly: don't add setter for value * @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, bool readonly, + Error **Errp); void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, - const uint64_t *v, Error **Errp); + const uint64_t *v, bool readonly, + Error **Errp); /** * object_property_add_alias: diff --git a/qom/object.c b/qom/object.c index d51b57fba1..775f702465 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2326,6 +2326,26 @@ static void property_get_uint8_ptr(Object *obj, Visitor *v, const char *name, visit_type_uint8(v, name, &value, errp); } +static void property_set_uint8_ptr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint8_t *field = opaque; + uint8_t value; + Error *local_err = NULL; + + visit_type_uint8(v, name, &value, &local_err); + if (local_err) { + goto err; + } + + *field = value; + + return; + +err: + error_propagate(errp, local_err); +} + static void property_get_uint16_ptr(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -2333,6 +2353,26 @@ static void property_get_uint16_ptr(Object *obj, Visitor *v, const char *name, visit_type_uint16(v, name, &value, errp); } +static void property_set_uint16_ptr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint16_t *field = opaque; + uint16_t value; + Error *local_err = NULL; + + visit_type_uint16(v, name, &value, &local_err); + if (local_err) { + goto err; + } + + *field = value; + + return; + +err: + error_propagate(errp, local_err); +} + static void property_get_uint32_ptr(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -2340,6 +2380,26 @@ static void property_get_uint32_ptr(Object *obj, Visitor *v, const char *name, visit_type_uint32(v, name, &value, errp); } +static void property_set_uint32_ptr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint32_t *field = opaque; + uint32_t value; + Error *local_err = NULL; + + visit_type_uint32(v, name, &value, &local_err); + if (local_err) { + goto err; + } + + *field = value; + + return; + +err: + error_propagate(errp, local_err); +} + static void property_get_uint64_ptr(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { @@ -2347,60 +2407,104 @@ static void property_get_uint64_ptr(Object *obj, Visitor *v, const char *name, visit_type_uint64(v, name, &value, errp); } +static void property_set_uint64_ptr(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + uint64_t *field = opaque; + uint64_t value; + Error *local_err = NULL; + + visit_type_uint64(v, name, &value, &local_err); + if (local_err) { + goto err; + } + + *field = value; + + return; + +err: + error_propagate(errp, local_err); +} + void object_property_add_uint8_ptr(Object *obj, const char *name, - const uint8_t *v, Error **errp) + const uint8_t *v, bool readonly, + Error **errp) { - object_property_add(obj, name, "uint8", property_get_uint8_ptr, - NULL, NULL, (void *)v, errp); + object_property_add(obj, name, "uint8", + property_get_uint8_ptr, + readonly ? NULL : property_set_uint8_ptr, + NULL, (void *)v, errp); } void object_class_property_add_uint8_ptr(ObjectClass *klass, const char *name, - const uint8_t *v, Error **errp) + const uint8_t *v, bool readonly, + Error **errp) { - object_class_property_add(klass, name, "uint8", property_get_uint8_ptr, - NULL, NULL, (void *)v, errp); + object_class_property_add(klass, name, "uint8", + property_get_uint8_ptr, + readonly ? NULL : property_set_uint8_ptr, + NULL, (void *)v, errp); } void object_property_add_uint16_ptr(Object *obj, const char *name, - const uint16_t *v, Error **errp) + const uint16_t *v, bool readonly, + Error **errp) { - object_property_add(obj, name, "uint16", property_get_uint16_ptr, - NULL, NULL, (void *)v, errp); + object_property_add(obj, name, "uint16", + property_get_uint16_ptr, + readonly ? NULL : property_set_uint16_ptr, + NULL, (void *)v, errp); } void object_class_property_add_uint16_ptr(ObjectClass *klass, const char *name, - const uint16_t *v, Error **errp) + const uint16_t *v, bool readonly, + Error **errp) { - object_class_property_add(klass, name, "uint16", property_get_uint16_ptr, - NULL, NULL, (void *)v, errp); + object_class_property_add(klass, name, "uint16", + property_get_uint16_ptr, + readonly ? NULL : property_set_uint16_ptr, + NULL, (void *)v, errp); } void object_property_add_uint32_ptr(Object *obj, const char *name, - const uint32_t *v, Error **errp) + const uint32_t *v, bool readonly, + Error **errp) { - object_property_add(obj, name, "uint32", property_get_uint32_ptr, - NULL, NULL, (void *)v, errp); + object_property_add(obj, name, "uint32", + property_get_uint32_ptr, + readonly ? NULL : property_set_uint32_ptr, + NULL, (void *)v, errp); } void object_class_property_add_uint32_ptr(ObjectClass *klass, const char *name, - const uint32_t *v, Error **errp) + const uint32_t *v, bool readonly, + Error **errp) { - object_class_property_add(klass, name, "uint32", property_get_uint32_ptr, - NULL, NULL, (void *)v, errp); + object_class_property_add(klass, name, "uint32", + property_get_uint32_ptr, + readonly ? NULL : property_set_uint32_ptr, + NULL, (void *)v, errp); } void object_property_add_uint64_ptr(Object *obj, const char *name, - const uint64_t *v, Error **errp) + const uint64_t *v, bool readonly, + Error **errp) { - object_property_add(obj, name, "uint64", property_get_uint64_ptr, - NULL, NULL, (void *)v, errp); + object_property_add(obj, name, "uint64", + property_get_uint64_ptr, + property_set_uint64_ptr, + NULL, (void *)v, errp); } void object_class_property_add_uint64_ptr(ObjectClass *klass, const char *name, - const uint64_t *v, Error **errp) + const uint64_t *v, bool readonly, + Error **errp) { - object_class_property_add(klass, name, "uint64", property_get_uint64_ptr, - NULL, NULL, (void *)v, errp); + object_class_property_add(klass, name, "uint64", + property_get_uint64_ptr, + readonly ? NULL : property_set_uint64_ptr, + NULL, (void *)v, errp); } typedef struct { diff --git a/ui/console.c b/ui/console.c index 82d1ddac9c..3375c33d71 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1296,8 +1296,7 @@ static QemuConsole *new_console(DisplayState *ds, console_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, true, &error_abort); if (!active_console || ((active_console->console_type != GRAPHIC_CONSOLE) && (console_type == GRAPHIC_CONSOLE))) {