From nobody Sun May 5 19:51:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488750473395868.2948005266087; Sun, 5 Mar 2017 13:47:53 -0800 (PST) Received: from localhost ([::1]:40507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cke0O-0004tE-Au for importer@patchew.org; Sun, 05 Mar 2017 16:47:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckdzS-0004om-Ny for qemu-devel@nongnu.org; Sun, 05 Mar 2017 16:46:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckdzP-0006Qb-Il for qemu-devel@nongnu.org; Sun, 05 Mar 2017 16:46:54 -0500 Received: from mail.kernel.org ([198.145.29.136]:56642) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ckdzP-0006Or-90 for qemu-devel@nongnu.org; Sun, 05 Mar 2017 16:46:51 -0500 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C7EE20212; Sun, 5 Mar 2017 21:46:49 +0000 (UTC) Received: from localhost.localdomain (bzq-109-67-52-244.red.bezeqint.net [109.67.52.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A12720125; Sun, 5 Mar 2017 21:46:44 +0000 (UTC) From: Krzysztof Kozlowski To: Kevin Wolf , Paolo Bonzini , Max Reitz , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eduardo Habkost , Alex Williamson , qemu-devel@nongnu.org Date: Sun, 5 Mar 2017 23:46:33 +0200 Message-Id: <20170305214633.19844-1-krzk@kernel.org> X-Mailer: git-send-email 2.9.3 X-Virus-Scanned: ClamAV using ClamSMTP X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 198.145.29.136 Subject: [Qemu-devel] [PATCH] qdev: Constify data pointed by few arguments and local variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Krzysztof Kozlowski Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In few places the function arguments and local variables are not modifying data passed through pointers so this can be made const for code safeness. Signed-off-by: Krzysztof Kozlowski --- hw/core/qdev-properties-system.c | 6 +++--- hw/core/qdev-properties.c | 7 ++++--- include/hw/qdev-properties.h | 11 +++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index c34be1c1bace..abbf3ef754d8 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -405,7 +405,7 @@ void qdev_prop_set_drive(DeviceState *dev, const char *= name, if (value) { ref =3D blk_name(value); if (!*ref) { - BlockDriverState *bs =3D blk_bs(value); + const BlockDriverState *bs =3D blk_bs(value); if (bs) { ref =3D bdrv_get_node_name(bs); } @@ -416,7 +416,7 @@ void qdev_prop_set_drive(DeviceState *dev, const char *= name, } =20 void qdev_prop_set_chr(DeviceState *dev, const char *name, - Chardev *value) + const Chardev *value) { assert(!value || value->label); object_property_set_str(OBJECT(dev), @@ -424,7 +424,7 @@ void qdev_prop_set_chr(DeviceState *dev, const char *na= me, } =20 void qdev_prop_set_netdev(DeviceState *dev, const char *name, - NetClientState *value) + const NetClientState *value) { assert(!value || value->name); object_property_set_str(OBJECT(dev), diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 6ab4265eb478..34ec10f0caac 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1010,7 +1010,8 @@ void qdev_prop_set_string(DeviceState *dev, const cha= r *name, const char *value) object_property_set_str(OBJECT(dev), value, name, &error_abort); } =20 -void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *va= lue) +void qdev_prop_set_macaddr(DeviceState *dev, const char *name, + const uint8_t *value) { char str[2 * 6 + 5 + 1]; snprintf(str, sizeof(str), "%02x:%02x:%02x:%02x:%02x:%02x", @@ -1028,10 +1029,10 @@ void qdev_prop_set_enum(DeviceState *dev, const cha= r *name, int value) name, &error_abort); } =20 -void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) +void qdev_prop_set_ptr(DeviceState *dev, const char *name, const void *val= ue) { Property *prop; - void **ptr; + const void **ptr; =20 prop =3D qdev_prop_find(dev, name); assert(prop && prop->info =3D=3D &qdev_prop_ptr); diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 7ac315331aa0..659561daad0d 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -184,14 +184,17 @@ void qdev_prop_set_uint32(DeviceState *dev, const cha= r *name, uint32_t value); void qdev_prop_set_int32(DeviceState *dev, const char *name, int32_t value= ); void qdev_prop_set_uint64(DeviceState *dev, const char *name, uint64_t val= ue); void qdev_prop_set_string(DeviceState *dev, const char *name, const char *= value); -void qdev_prop_set_chr(DeviceState *dev, const char *name, Chardev *value); -void qdev_prop_set_netdev(DeviceState *dev, const char *name, NetClientSta= te *value); +void qdev_prop_set_chr(DeviceState *dev, const char *name, + const Chardev *value); +void qdev_prop_set_netdev(DeviceState *dev, const char *name, + const NetClientState *value); void qdev_prop_set_drive(DeviceState *dev, const char *name, BlockBackend *value, Error **errp); -void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *va= lue); +void qdev_prop_set_macaddr(DeviceState *dev, const char *name, + const uint8_t *value); void qdev_prop_set_enum(DeviceState *dev, const char *name, int value); /* FIXME: Remove opaque pointer properties. */ -void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value); +void qdev_prop_set_ptr(DeviceState *dev, const char *name, const void *val= ue); =20 void qdev_prop_register_global(GlobalProperty *prop); void qdev_prop_register_global_list(GlobalProperty *props); --=20 2.9.3