From nobody Tue Feb 10 04:16:55 2026 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.zohomail.com; dkim=fail; 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 1500027195402368.82785763373204; Fri, 14 Jul 2017 03:13:15 -0700 (PDT) Received: from localhost ([::1]:36713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxaz-00026i-Vt for importer@patchew.org; Fri, 14 Jul 2017 06:13:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVxYc-0000JK-8Y for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVxYZ-00051h-Qq for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:46 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:36258) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVxYZ-00051N-Fe for qemu-devel@nongnu.org; Fri, 14 Jul 2017 06:10:43 -0400 Received: by mail-wm0-x244.google.com with SMTP id y5so9944407wmh.3 for ; Fri, 14 Jul 2017 03:10:43 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id 143sm2934870wmg.9.2017.07.14.03.10.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 03:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=V3NgWYU++SaBZeap6bjDNovK52/Fpcr7IcWK8RMntqg=; b=OtFQI9VuFcA7h8q5UzuUMR1e1gNSo62Z+0PTQHX947Wf83+v5Qwa3rWvZ1GNSi8ZAc aeRx+wVV6y+wFSOYXzPCYMVKcDQZUs+iGR+zigP5DMl6D6DyuV6Lh+PNoucNAFeeKjld UUxh9nAtjCySmIwJQQZm0OvHj+tZRovSVdGuTR16h8tf4/+4+zULPp9QOZ9xRa+BrtzF mwkZ1q0KJi0X9GhOQHAGR6TWtFpVyByx1juoTcUybm4UwuytRHZoxr4YmaU6J+GR+xyT NzRRqpCwlAZBZ5I6jijewsH8AUneDYT9/RgnvoCb+ymMwXeFgDRhQSjmTrxJ/Pt+p508 t+Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=V3NgWYU++SaBZeap6bjDNovK52/Fpcr7IcWK8RMntqg=; b=tfG00KYLNjMDrV+RNyMVgX5A5zzRELMYXUDc6Ryaetl1qARgU0X/qXYR+FqqxOluFk tJ0UEAiqmuTd1uIeMF3DcmDMfZWF0U2dx//AODnhFdUBpA1ppoKoaUmnPDaYJoaHeG7V Q07zijpxc0x9aQ0dyGYxgzBSEWkytCNIsuIcca8o5oZyyXaOf2W3XjJ/PkdO8olcfy+G yAMMYtdNiyDjhktQuwgCdbQ8ovUM0NOSyhAbSKQ48nId6pb/cUnkk65h7gWfRaUduaTL RQZ2YrLIxZ1Tq9Dyn221cedDJv5lh35W4O9aPEdkiCKVApCTC4lsmyE+yEi/m5eCE6re wTeQ== X-Gm-Message-State: AIVw11244M5Ceys9bgXzD9MDi+Jo1qScjxpVgjx+DMdQ1/wKMbu6iX0S ynd1rTJbV7rDnZq+vmQ= X-Received: by 10.28.180.70 with SMTP id d67mr2473357wmf.121.1500027042030; Fri, 14 Jul 2017 03:10:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 12:10:19 +0200 Message-Id: <1500027028-4127-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500027028-4127-1-git-send-email-pbonzini@redhat.com> References: <1500027028-4127-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 46/55] qdev: Add const qualifier to PropertyInfo definitions 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: Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng The remaining non-const ones are in e1000e which modifies description at runtime. They can be addressed separatedly. Signed-off-by: Fam Zheng Message-Id: <20170714021509.23681-6-famz@redhat.com> Signed-off-by: Paolo Bonzini --- hw/core/qdev-properties-system.c | 8 +++---- hw/core/qdev-properties.c | 44 +++++++++++++++++----------------- hw/s390x/css.c | 4 ++-- hw/s390x/s390-pci-bus.c | 2 +- include/hw/qdev-core.h | 4 ++-- include/hw/qdev-properties.h | 52 ++++++++++++++++++++----------------= ---- include/hw/s390x/css.h | 4 ++-- target/i386/cpu.c | 2 +- target/ppc/translate_init.c | 2 +- 9 files changed, 61 insertions(+), 61 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 3bef419..ec10da7 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -159,7 +159,7 @@ static void set_drive(Object *obj, Visitor *v, const ch= ar *name, void *opaque, set_pointer(obj, v, opaque, parse_drive, name, errp); } =20 -PropertyInfo qdev_prop_drive =3D { +const PropertyInfo qdev_prop_drive =3D { .name =3D "str", .description =3D "Node name or ID of a block device to use as a backen= d", .get =3D get_drive, @@ -228,7 +228,7 @@ static void release_chr(Object *obj, const char *name, = void *opaque) qemu_chr_fe_deinit(be, false); } =20 -PropertyInfo qdev_prop_chr =3D { +const PropertyInfo qdev_prop_chr =3D { .name =3D "str", .description =3D "ID of a chardev to use as a backend", .get =3D get_chr, @@ -313,7 +313,7 @@ out: g_free(str); } =20 -PropertyInfo qdev_prop_netdev =3D { +const PropertyInfo qdev_prop_netdev =3D { .name =3D "str", .description =3D "ID of a netdev to use as a backend", .get =3D get_netdev, @@ -393,7 +393,7 @@ static void set_vlan(Object *obj, Visitor *v, const cha= r *name, void *opaque, *ptr =3D hubport; } =20 -PropertyInfo qdev_prop_vlan =3D { +const PropertyInfo qdev_prop_vlan =3D { .name =3D "int32", .description =3D "Integer VLAN id to connect to", .print =3D print_vlan, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5429c63..f22bd71 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -132,7 +132,7 @@ static void set_default_value_bool(Object *obj, const P= roperty *prop) object_property_set_bool(obj, prop->defval.u, prop->name, &error_abort= ); } =20 -PropertyInfo qdev_prop_bit =3D { +const PropertyInfo qdev_prop_bit =3D { .name =3D "bool", .description =3D "on/off", .get =3D prop_get_bit, @@ -191,7 +191,7 @@ static void prop_set_bit64(Object *obj, Visitor *v, con= st char *name, bit64_prop_set(dev, prop, value); } =20 -PropertyInfo qdev_prop_bit64 =3D { +const PropertyInfo qdev_prop_bit64 =3D { .name =3D "bool", .description =3D "on/off", .get =3D prop_get_bit64, @@ -226,7 +226,7 @@ static void set_bool(Object *obj, Visitor *v, const cha= r *name, void *opaque, visit_type_bool(v, name, ptr, errp); } =20 -PropertyInfo qdev_prop_bool =3D { +const PropertyInfo qdev_prop_bool =3D { .name =3D "bool", .get =3D get_bool, .set =3D set_bool, @@ -270,7 +270,7 @@ static void set_default_value_uint(Object *obj, const P= roperty *prop) object_property_set_uint(obj, prop->defval.u, prop->name, &error_abort= ); } =20 -PropertyInfo qdev_prop_uint8 =3D { +const PropertyInfo qdev_prop_uint8 =3D { .name =3D "uint8", .get =3D get_uint8, .set =3D set_uint8, @@ -304,7 +304,7 @@ static void set_uint16(Object *obj, Visitor *v, const c= har *name, visit_type_uint16(v, name, ptr, errp); } =20 -PropertyInfo qdev_prop_uint16 =3D { +const PropertyInfo qdev_prop_uint16 =3D { .name =3D "uint16", .get =3D get_uint16, .set =3D set_uint16, @@ -363,14 +363,14 @@ static void set_int32(Object *obj, Visitor *v, const = char *name, void *opaque, visit_type_int32(v, name, ptr, errp); } =20 -PropertyInfo qdev_prop_uint32 =3D { +const PropertyInfo qdev_prop_uint32 =3D { .name =3D "uint32", .get =3D get_uint32, .set =3D set_uint32, .set_default_value =3D set_default_value_uint, }; =20 -PropertyInfo qdev_prop_int32 =3D { +const PropertyInfo qdev_prop_int32 =3D { .name =3D "int32", .get =3D get_int32, .set =3D set_int32, @@ -404,7 +404,7 @@ static void set_uint64(Object *obj, Visitor *v, const c= har *name, visit_type_uint64(v, name, ptr, errp); } =20 -PropertyInfo qdev_prop_uint64 =3D { +const PropertyInfo qdev_prop_uint64 =3D { .name =3D "uint64", .get =3D get_uint64, .set =3D set_uint64, @@ -457,7 +457,7 @@ static void set_string(Object *obj, Visitor *v, const c= har *name, *ptr =3D str; } =20 -PropertyInfo qdev_prop_string =3D { +const PropertyInfo qdev_prop_string =3D { .name =3D "str", .release =3D release_string, .get =3D get_string, @@ -467,7 +467,7 @@ PropertyInfo qdev_prop_string =3D { /* --- pointer --- */ =20 /* Not a proper property, just for dirty hacks. TODO Remove it! */ -PropertyInfo qdev_prop_ptr =3D { +const PropertyInfo qdev_prop_ptr =3D { .name =3D "ptr", }; =20 @@ -541,7 +541,7 @@ inval: g_free(str); } =20 -PropertyInfo qdev_prop_macaddr =3D { +const PropertyInfo qdev_prop_macaddr =3D { .name =3D "str", .description =3D "Ethernet 6-byte MAC Address, example: 52:54:00:12:34= :56", .get =3D get_mac, @@ -550,7 +550,7 @@ PropertyInfo qdev_prop_macaddr =3D { =20 /* --- on/off/auto --- */ =20 -PropertyInfo qdev_prop_on_off_auto =3D { +const PropertyInfo qdev_prop_on_off_auto =3D { .name =3D "OnOffAuto", .description =3D "on/off/auto", .enum_table =3D OnOffAuto_lookup, @@ -563,7 +563,7 @@ PropertyInfo qdev_prop_on_off_auto =3D { =20 QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) !=3D sizeof(int)); =20 -PropertyInfo qdev_prop_losttickpolicy =3D { +const PropertyInfo qdev_prop_losttickpolicy =3D { .name =3D "LostTickPolicy", .enum_table =3D LostTickPolicy_lookup, .get =3D get_enum, @@ -575,7 +575,7 @@ PropertyInfo qdev_prop_losttickpolicy =3D { =20 QEMU_BUILD_BUG_ON(sizeof(BlockdevOnError) !=3D sizeof(int)); =20 -PropertyInfo qdev_prop_blockdev_on_error =3D { +const PropertyInfo qdev_prop_blockdev_on_error =3D { .name =3D "BlockdevOnError", .description =3D "Error handling policy, " "report/ignore/enospc/stop/auto", @@ -589,7 +589,7 @@ PropertyInfo qdev_prop_blockdev_on_error =3D { =20 QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) !=3D sizeof(int)); =20 -PropertyInfo qdev_prop_bios_chs_trans =3D { +const PropertyInfo qdev_prop_bios_chs_trans =3D { .name =3D "BiosAtaTranslation", .description =3D "Logical CHS translation algorithm, " "auto/none/lba/large/rechs", @@ -601,7 +601,7 @@ PropertyInfo qdev_prop_bios_chs_trans =3D { =20 /* --- FDC default drive types */ =20 -PropertyInfo qdev_prop_fdc_drive_type =3D { +const PropertyInfo qdev_prop_fdc_drive_type =3D { .name =3D "FdcDriveType", .description =3D "FDC drive type, " "144/288/120/none/auto", @@ -677,7 +677,7 @@ static int print_pci_devfn(DeviceState *dev, Property *= prop, char *dest, } } =20 -PropertyInfo qdev_prop_pci_devfn =3D { +const PropertyInfo qdev_prop_pci_devfn =3D { .name =3D "int32", .description =3D "Slot and optional function number, example: 06.0 or = 06", .print =3D print_pci_devfn, @@ -726,7 +726,7 @@ static void set_blocksize(Object *obj, Visitor *v, cons= t char *name, *ptr =3D value; } =20 -PropertyInfo qdev_prop_blocksize =3D { +const PropertyInfo qdev_prop_blocksize =3D { .name =3D "uint16", .description =3D "A power of two between 512 and 32768", .get =3D get_uint16, @@ -841,7 +841,7 @@ inval: g_free(str); } =20 -PropertyInfo qdev_prop_pci_host_devaddr =3D { +const PropertyInfo qdev_prop_pci_host_devaddr =3D { .name =3D "str", .description =3D "Address (bus/device/function) of " "the host device, example: 04:10.0", @@ -950,7 +950,7 @@ static void set_prop_arraylen(Object *obj, Visitor *v, = const char *name, } } =20 -PropertyInfo qdev_prop_arraylen =3D { +const PropertyInfo qdev_prop_arraylen =3D { .name =3D "uint32", .get =3D get_uint32, .set =3D set_prop_arraylen, @@ -1208,7 +1208,7 @@ static void set_size(Object *obj, Visitor *v, const c= har *name, void *opaque, visit_type_size(v, name, ptr, errp); } =20 -PropertyInfo qdev_prop_size =3D { +const PropertyInfo qdev_prop_size =3D { .name =3D "size", .get =3D get_size, .set =3D set_size, @@ -1228,7 +1228,7 @@ static void create_link_property(Object *obj, Propert= y *prop, Error **errp) errp); } =20 -PropertyInfo qdev_prop_link =3D { +const PropertyInfo qdev_prop_link =3D { .name =3D "link", .create =3D create_link_property, }; diff --git a/hw/s390x/css.c b/hw/s390x/css.c index d67fffa..cd0b776 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -2095,7 +2095,7 @@ out: g_free(str); } =20 -PropertyInfo css_devid_propinfo =3D { +const PropertyInfo css_devid_propinfo =3D { .name =3D "str", .description =3D "Identifier of an I/O device in the channel " "subsystem, example: fe.1.23ab", @@ -2103,7 +2103,7 @@ PropertyInfo css_devid_propinfo =3D { .set =3D set_css_devid, }; =20 -PropertyInfo css_devid_ro_propinfo =3D { +const PropertyInfo css_devid_ro_propinfo =3D { .name =3D "str", .description =3D "Read-only identifier of an I/O device in the channel= " "subsystem, example: fe.1.23ab", diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 903b3ca..af702f8 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1015,7 +1015,7 @@ static void s390_pci_set_fid(Object *obj, Visitor *v,= const char *name, zpci->fid_defined =3D true; } =20 -static PropertyInfo s390_pci_fid_propinfo =3D { +static const PropertyInfo s390_pci_fid_propinfo =3D { .name =3D "zpci_fid", .get =3D s390_pci_get_fid, .set =3D s390_pci_set_fid, diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 08d1d2c..5348815 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -223,7 +223,7 @@ struct BusState { =20 struct Property { const char *name; - PropertyInfo *info; + const PropertyInfo *info; ptrdiff_t offset; uint8_t bitnr; union { @@ -231,7 +231,7 @@ struct Property { uint64_t u; } defval; int arrayoffset; - PropertyInfo *arrayinfo; + const PropertyInfo *arrayinfo; int arrayfieldsize; const char *link_type; }; diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 876ba2e..f6692d5 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -5,32 +5,32 @@ =20 /*** qdev-properties.c ***/ =20 -extern PropertyInfo qdev_prop_bit; -extern PropertyInfo qdev_prop_bit64; -extern PropertyInfo qdev_prop_bool; -extern PropertyInfo qdev_prop_uint8; -extern PropertyInfo qdev_prop_uint16; -extern PropertyInfo qdev_prop_uint32; -extern PropertyInfo qdev_prop_int32; -extern PropertyInfo qdev_prop_uint64; -extern PropertyInfo qdev_prop_size; -extern PropertyInfo qdev_prop_string; -extern PropertyInfo qdev_prop_chr; -extern PropertyInfo qdev_prop_ptr; -extern PropertyInfo qdev_prop_macaddr; -extern PropertyInfo qdev_prop_on_off_auto; -extern PropertyInfo qdev_prop_losttickpolicy; -extern PropertyInfo qdev_prop_blockdev_on_error; -extern PropertyInfo qdev_prop_bios_chs_trans; -extern PropertyInfo qdev_prop_fdc_drive_type; -extern PropertyInfo qdev_prop_drive; -extern PropertyInfo qdev_prop_netdev; -extern PropertyInfo qdev_prop_vlan; -extern PropertyInfo qdev_prop_pci_devfn; -extern PropertyInfo qdev_prop_blocksize; -extern PropertyInfo qdev_prop_pci_host_devaddr; -extern PropertyInfo qdev_prop_arraylen; -extern PropertyInfo qdev_prop_link; +extern const PropertyInfo qdev_prop_bit; +extern const PropertyInfo qdev_prop_bit64; +extern const PropertyInfo qdev_prop_bool; +extern const PropertyInfo qdev_prop_uint8; +extern const PropertyInfo qdev_prop_uint16; +extern const PropertyInfo qdev_prop_uint32; +extern const PropertyInfo qdev_prop_int32; +extern const PropertyInfo qdev_prop_uint64; +extern const PropertyInfo qdev_prop_size; +extern const PropertyInfo qdev_prop_string; +extern const PropertyInfo qdev_prop_chr; +extern const PropertyInfo qdev_prop_ptr; +extern const PropertyInfo qdev_prop_macaddr; +extern const PropertyInfo qdev_prop_on_off_auto; +extern const PropertyInfo qdev_prop_losttickpolicy; +extern const PropertyInfo qdev_prop_blockdev_on_error; +extern const PropertyInfo qdev_prop_bios_chs_trans; +extern const PropertyInfo qdev_prop_fdc_drive_type; +extern const PropertyInfo qdev_prop_drive; +extern const PropertyInfo qdev_prop_netdev; +extern const PropertyInfo qdev_prop_vlan; +extern const PropertyInfo qdev_prop_pci_devfn; +extern const PropertyInfo qdev_prop_blocksize; +extern const PropertyInfo qdev_prop_pci_host_devaddr; +extern const PropertyInfo qdev_prop_arraylen; +extern const PropertyInfo qdev_prop_link; =20 #define DEFINE_PROP(_name, _state, _field, _prop, _type) { \ .name =3D (_name), \ diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h index eb0e26f..dc1001b 100644 --- a/include/hw/s390x/css.h +++ b/include/hw/s390x/css.h @@ -112,7 +112,7 @@ typedef struct CssDevId { bool valid; } CssDevId; =20 -extern PropertyInfo css_devid_propinfo; +extern const PropertyInfo css_devid_propinfo; =20 #define DEFINE_PROP_CSS_DEV_ID(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, css_devid_propinfo, CssDevId) @@ -196,7 +196,7 @@ int css_do_rchp(uint8_t cssid, uint8_t chpid); bool css_present(uint8_t cssid); #endif =20 -extern PropertyInfo css_devid_ro_propinfo; +extern const PropertyInfo css_devid_ro_propinfo; =20 #define DEFINE_PROP_CSS_DEV_ID_RO(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, css_devid_ro_propinfo, CssDevId) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c571772..1b089c5 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1961,7 +1961,7 @@ static void x86_set_hv_spinlocks(Object *obj, Visitor= *v, const char *name, cpu->hyperv_spinlock_attempts =3D value; } =20 -static PropertyInfo qdev_prop_spinlocks =3D { +static const PropertyInfo qdev_prop_spinlocks =3D { .name =3D "int", .get =3D x86_get_hv_spinlocks, .set =3D x86_set_hv_spinlocks, diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 783bf98..ae25faf 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -8435,7 +8435,7 @@ static void getset_compat_deprecated(Object *obj, Vis= itor *v, const char *name, visit_type_null(v, name, NULL); } =20 -static PropertyInfo ppc_compat_deprecated_propinfo =3D { +static const PropertyInfo ppc_compat_deprecated_propinfo =3D { .name =3D "str", .description =3D "compatibility mode (deprecated)", .get =3D getset_compat_deprecated, --=20 1.8.3.1