From nobody Thu Apr 3 11:28:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740646626; cv=none; d=zohomail.com; s=zohoarc; b=BPaqh5xEItjgOFa/+qNil+Bm+oVMqvJADJmDh9RcmN1WMZGuCt03L5md27Swy07Y+usNKQabZ9U/3dQ50hl3eYEHs0Rhne+207OmgWYQUiLRq9VdChYugdUwcjmSPkXIFDXGtYZBNz4IpQVdSPeE/YUVEspcWdBJiIqS2fMjC4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740646626; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zcEpytVV0GCSykoFanyGhL3GqCWFL4pf24EXyuR20qw=; b=mhagLz4Nkvi/vpet51ZF0JUu4kqfDbLRPA6Kqw3zECcGjy/jA7cqogsBINBiNWFR5GWgGy1xFMcBVom8X+Ao8n6tAidHvzL8NGwkU89QEqq3zm6hW7FM+TiLxCDg36J0MhJ0Q9TFsHbU1QAUwRDKCoB6xT2VfLmJgRegNxCygw0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740646626203496.60070360224233; Thu, 27 Feb 2025 00:57:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnZgo-0003dh-AO; Thu, 27 Feb 2025 03:56:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgk-0003ch-FG for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgi-0001kb-UW for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:14 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279-HfMV6-jrMOiqvdaMUhRwcA-1; Thu, 27 Feb 2025 03:56:06 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3CB351954B1B; Thu, 27 Feb 2025 08:56:05 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.9]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ED39F1944D02; Thu, 27 Feb 2025 08:56:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 05F8321E65DD; Thu, 27 Feb 2025 09:56:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740646572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zcEpytVV0GCSykoFanyGhL3GqCWFL4pf24EXyuR20qw=; b=GsPrZ9T4pGtNCXjl9K3cJhrSIDmTCRSHnPVlYsgoElSfRtHe7h9xXIy5ldyVL1HWA8t4gk 6/UgBbh25H1NmldwjvZVSZcXcPEmsMlAru7pZATUu6jz3Y/GGQUQRvAA8CSBJ7iTY2Abr4 f6krMzW4qJCkdGZAYCPzakrw+qR/uno= X-MC-Unique: HfMV6-jrMOiqvdaMUhRwcA-1 X-Mimecast-MFC-AGG-ID: HfMV6-jrMOiqvdaMUhRwcA_1740646565 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH v2 1/6] qdev: Delete unused qdev_prop_enum Date: Thu, 27 Feb 2025 09:55:56 +0100 Message-ID: <20250227085601.4140852-2-armbru@redhat.com> In-Reply-To: <20250227085601.4140852-1-armbru@redhat.com> References: <20250227085601.4140852-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.44, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740646627081019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/qdev-properties.h | 1 - hw/core/qdev-properties.c | 7 ------- 2 files changed, 8 deletions(-) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index bf27375a3c..ae6ec2b990 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -49,7 +49,6 @@ struct PropertyInfo { extern const PropertyInfo qdev_prop_bit; extern const PropertyInfo qdev_prop_bit64; extern const PropertyInfo qdev_prop_bool; -extern const PropertyInfo qdev_prop_enum; extern const PropertyInfo qdev_prop_uint8; extern const PropertyInfo qdev_prop_uint16; extern const PropertyInfo qdev_prop_uint32; diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 0b52aad555..2540bd8880 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -122,13 +122,6 @@ void qdev_propinfo_set_default_value_enum(ObjectProper= ty *op, qapi_enum_lookup(prop->info->enum_table, prop->defval.i)); } =20 -const PropertyInfo qdev_prop_enum =3D { - .name =3D "enum", - .get =3D qdev_propinfo_get_enum, - .set =3D qdev_propinfo_set_enum, - .set_default_value =3D qdev_propinfo_set_default_value_enum, -}; - /* Bit */ =20 static uint32_t qdev_get_prop_mask(const Property *prop) --=20 2.48.1 From nobody Thu Apr 3 11:28:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740646650; cv=none; d=zohomail.com; s=zohoarc; b=ItLEBRgixUrIBUSNhfUkMoGglgsRejhH35yxLC/ZoSV6ejqz2wNHRqXKP7/4CSa/2RIq16Z0qG20Tr+GTuI0sWgwtomuw7t0qhF+rpDkGpqt1H1jwMIqzr+idRY2hlx2LOfA5yAQPJ0PoApN+nNSusvO+kPNN7V1ws2E9MBA+Xg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740646650; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QY2t2ZpvNmDMZpDDDM9bZtNQ2lCtu5RP4oPjc+MH6Ls=; b=RCgm8iiS+wklC3HGsS1WbPp5fuO8pPRzDmc2K43fq1lHDKqt90k3UG52qSP11/iQO/lnpgfnR9r7KDlin5CHM8I2u1zYY0MBJ4txqDxZLyzcnDMKWYs4BnyioyIUa2UUngQNtc4eymPF2A5g/FDIg31P4oQKF1LZBgfwgFEOZvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740646650799240.66769148007234; Thu, 27 Feb 2025 00:57:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnZho-0005jB-Pf; Thu, 27 Feb 2025 03:57:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZhn-0005bm-A0 for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:57:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZhl-0001vz-Em for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:57:18 -0500 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-30-mIYVbYwhPO6gtcehTh8REw-1; Thu, 27 Feb 2025 03:56:05 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F06DF1944CE7; Thu, 27 Feb 2025 08:56:04 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.9]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9189E180035E; Thu, 27 Feb 2025 08:56:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0A3CC21E65E0; Thu, 27 Feb 2025 09:56:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740646635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QY2t2ZpvNmDMZpDDDM9bZtNQ2lCtu5RP4oPjc+MH6Ls=; b=PIhvqg3y2aoDI5i+MlfGZgEJrFrUl8YI1vQquIGZ3fGFsuT1azE1hWrDw8TKA+iZIob8F7 bTNmwlVbzpyKGkhC/jaJij0mGnzQlffGQac13qdYVt4232oyt10I30yGtA8+ylivT43GhH APE48fId8fB5jGrNFZc0Slpx/jTv3D4= X-MC-Unique: mIYVbYwhPO6gtcehTh8REw-1 X-Mimecast-MFC-AGG-ID: mIYVbYwhPO6gtcehTh8REw_1740646565 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH v2 2/6] qdev: Change qdev_prop_pci_devfn member @name from "int32" to "str" Date: Thu, 27 Feb 2025 09:55:57 +0100 Message-ID: <20250227085601.4140852-3-armbru@redhat.com> In-Reply-To: <20250227085601.4140852-1-armbru@redhat.com> References: <20250227085601.4140852-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.44, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740646652441019100 Content-Type: text/plain; charset="utf-8" Properties using qdev_prop_pci_devfn initially accepted a string of the form "DEV.FN" or "DEV" where DEV and FN are in hexadecimal. Member @name was "pci-devfn" initially. Commit b403298adb5 (qdev: make the non-legacy pci address property accept an integer) changed them to additionally accept integers: bits 3..7 are DEV, and bits 0..2 are FN. This is inaccessible externally in device_add so far. The commit also changed @name to "int32", and set member @legacy-name to "pci-devfn". Together, this kept QMP command device-list-properties unaffected: it used @name only when @legacy_name was null. Commit 07d09c58dbb (qmp: Print descriptions of object properties) quietly dumbed that down to use @name always, and the next commit 18b91a3e082q (qdev: Drop legacy_name from qdev properties) dropped member @legacy_name. This changed the value of @type reported by QMP command device-list-properties from "pci-devfn" to "int32". But "int32" is misleading: device_add actually wants QAPI type "str". So change @name to that. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/qdev-properties-system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 89f954f569..52c880156e 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -882,7 +882,7 @@ static int print_pci_devfn(Object *obj, const Property = *prop, char *dest, } =20 const PropertyInfo qdev_prop_pci_devfn =3D { - .name =3D "int32", + .name =3D "str", .description =3D "Slot and optional function number, example: 06.0 or = 06", .print =3D print_pci_devfn, .get =3D qdev_propinfo_get_int32, --=20 2.48.1 From nobody Thu Apr 3 11:28:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740646638; cv=none; d=zohomail.com; s=zohoarc; b=mVHudkH97KDXFhnj7oukjrB0IjWtX9sPn1PNgDnsU5jonVzHcAs1zKUeCr0iwCS7zgqmsQB5CMJ2wmUhaa0P/8fEfUOr2DOKVz9HhCIA80ARYMvgcO8P/+SVe63GNjlM5gZUa+gqYMIBc8cQ7EeTJYm/hzcitUA6uAqt0V6vN6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740646638; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7vKIj1a82mhMFhdnc87T9/q8V8aBs8uWq18xog5uY0A=; b=Aocz5i7SG1SyWe/MeoyoemWhLRvhvj2H04CkzvqfQRy0waxySdM+Jcb2Iqr2lyc517eR75iSzJ8dntHXPSF1YHkfOjIQHC3TdsgMMOEQsVLgk1JzQh5mOmoFjgr1YsCKivVvJVC28qM5mSoJrx0k8pwos6ZXOqn1VLQ0doiL0OM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740646638315132.07834572532136; Thu, 27 Feb 2025 00:57:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnZgt-0003fD-Ki; Thu, 27 Feb 2025 03:56:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgm-0003dZ-PQ for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgj-0001km-EC for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:16 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-402-sSE2W5jjOv-KhHCieG62xQ-1; Thu, 27 Feb 2025 03:56:07 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 34479180034E; Thu, 27 Feb 2025 08:56:06 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.9]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BAFA6300018D; Thu, 27 Feb 2025 08:56:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0E90E21E65E7; Thu, 27 Feb 2025 09:56:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740646572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7vKIj1a82mhMFhdnc87T9/q8V8aBs8uWq18xog5uY0A=; b=A9LToiklTd+vGLHzlfX2e/HwYASyG4vgnp4Qttx8lWUfFbRtm7UI89qP5ly6MeE4k5wNnB qZnzUwQSPfrZD1Ulb89xjjioKS3Be+Jm8yv8aeeK155enZyNxbvdnjK8xRPIs43PaT9i8c BceriIoh0oMM5DDsV7nMKx4hqbf3844= X-MC-Unique: sSE2W5jjOv-KhHCieG62xQ-1 X-Mimecast-MFC-AGG-ID: sSE2W5jjOv-KhHCieG62xQ_1740646566 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH v2 3/6] qdev: Rename PropertyInfo member @name to @type Date: Thu, 27 Feb 2025 09:55:58 +0100 Message-ID: <20250227085601.4140852-4-armbru@redhat.com> In-Reply-To: <20250227085601.4140852-1-armbru@redhat.com> References: <20250227085601.4140852-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 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: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.44, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740646640550019100 Content-Type: text/plain; charset="utf-8" PropertyInfo member @name becomes ObjectProperty member @type, while Property member @name becomes ObjectProperty member @name. Rename the former. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- include/hw/qdev-properties.h | 2 +- backends/tpm/tpm_util.c | 2 +- hw/block/xen-block.c | 2 +- hw/core/qdev-properties-system.c | 50 ++++++++++++++++---------------- hw/core/qdev-properties.c | 36 +++++++++++------------ hw/misc/xlnx-versal-trng.c | 2 +- hw/nvme/nguid.c | 2 +- hw/nvram/xlnx-bbram.c | 2 +- hw/nvram/xlnx-efuse.c | 2 +- hw/pci/pci.c | 2 +- hw/s390x/ccw-device.c | 2 +- hw/s390x/css.c | 4 +-- hw/s390x/s390-pci-bus.c | 2 +- hw/vfio/pci-quirks.c | 2 +- target/riscv/cpu.c | 28 +++++++++--------- target/sparc/cpu.c | 2 +- hw/display/apple-gfx.m | 2 +- 17 files changed, 72 insertions(+), 72 deletions(-) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index ae6ec2b990..15fcec5260 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -30,7 +30,7 @@ struct Property { }; =20 struct PropertyInfo { - const char *name; + const char *type; const char *description; const QEnumLookup *enum_table; bool realized_set_allowed; /* allow setting property on realized devic= e */ diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c index 0a428eaf75..f07a2656ce 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -76,7 +76,7 @@ static void release_tpm(Object *obj, const char *name, vo= id *opaque) } =20 const PropertyInfo qdev_prop_tpm =3D { - .name =3D "str", + .type =3D "str", .description =3D "ID of a tpm to use as a backend", .get =3D get_tpm, .set =3D set_tpm, diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 6c26052561..7c9d1b658c 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -661,7 +661,7 @@ invalid: * https://xenbits.xen.org/docs/unstable/man/xen-vbd-interface.7.html */ static const PropertyInfo xen_block_prop_vdev =3D { - .name =3D "str", + .type =3D "str", .description =3D "Virtual Disk specifier: d*p*/xvd*/hd*/sd*", .get =3D xen_block_get_vdev, .set =3D xen_block_set_vdev, diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 52c880156e..720b177ba8 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -235,7 +235,7 @@ static void release_drive(Object *obj, const char *name= , void *opaque) } =20 const PropertyInfo qdev_prop_drive =3D { - .name =3D "str", + .type =3D "str", .description =3D "Node name or ID of a block device to use as a backen= d", .realized_set_allowed =3D true, .get =3D get_drive, @@ -244,7 +244,7 @@ const PropertyInfo qdev_prop_drive =3D { }; =20 const PropertyInfo qdev_prop_drive_iothread =3D { - .name =3D "str", + .type =3D "str", .description =3D "Node name or ID of a block device to use as a backen= d", .realized_set_allowed =3D true, .get =3D get_drive, @@ -312,7 +312,7 @@ static void release_chr(Object *obj, const char *name, = void *opaque) } =20 const PropertyInfo qdev_prop_chr =3D { - .name =3D "str", + .type =3D "str", .description =3D "ID of a chardev to use as a backend", .get =3D get_chr, .set =3D set_chr, @@ -386,7 +386,7 @@ inval: } =20 const PropertyInfo qdev_prop_macaddr =3D { - .name =3D "str", + .type =3D "str", .description =3D "Ethernet 6-byte MAC Address, example: 52:54:00:12:34= :56", .get =3D get_mac, .set =3D set_mac, @@ -474,7 +474,7 @@ out: } =20 const PropertyInfo qdev_prop_netdev =3D { - .name =3D "str", + .type =3D "str", .description =3D "ID of a netdev to use as a backend", .get =3D get_netdev, .set =3D set_netdev, @@ -512,7 +512,7 @@ static void set_audiodev(Object *obj, Visitor *v, const= char* name, } =20 const PropertyInfo qdev_prop_audiodev =3D { - .name =3D "str", + .type =3D "str", .description =3D "ID of an audiodev to use as a backend", /* release done on shutdown */ .get =3D get_audiodev, @@ -602,7 +602,7 @@ static void qdev_propinfo_set_losttickpolicy(Object *ob= j, Visitor *v, QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_losttickpolicy =3D { - .name =3D "LostTickPolicy", + .type =3D "LostTickPolicy", .enum_table =3D &LostTickPolicy_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_losttickpolicy, @@ -628,7 +628,7 @@ static void set_blocksize(Object *obj, Visitor *v, cons= t char *name, } =20 const PropertyInfo qdev_prop_blocksize =3D { - .name =3D "size", + .type =3D "size", .description =3D "A power of two between " MIN_BLOCK_SIZE_STR " and " MAX_BLOCK_SIZE_STR, .get =3D qdev_propinfo_get_size32, @@ -641,7 +641,7 @@ const PropertyInfo qdev_prop_blocksize =3D { QEMU_BUILD_BUG_ON(sizeof(BlockdevOnError) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_blockdev_on_error =3D { - .name =3D "BlockdevOnError", + .type =3D "BlockdevOnError", .description =3D "Error handling policy, " "report/ignore/enospc/stop/auto", .enum_table =3D &BlockdevOnError_lookup, @@ -655,7 +655,7 @@ const PropertyInfo qdev_prop_blockdev_on_error =3D { QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_bios_chs_trans =3D { - .name =3D "BiosAtaTranslation", + .type =3D "BiosAtaTranslation", .description =3D "Logical CHS translation algorithm, " "auto/none/lba/large/rechs", .enum_table =3D &BiosAtaTranslation_lookup, @@ -667,7 +667,7 @@ const PropertyInfo qdev_prop_bios_chs_trans =3D { /* --- FDC default drive types */ =20 const PropertyInfo qdev_prop_fdc_drive_type =3D { - .name =3D "FdcDriveType", + .type =3D "FdcDriveType", .description =3D "FDC drive type, " "144/288/120/none/auto", .enum_table =3D &FloppyDriveType_lookup, @@ -679,7 +679,7 @@ const PropertyInfo qdev_prop_fdc_drive_type =3D { /* --- MultiFDCompression --- */ =20 const PropertyInfo qdev_prop_multifd_compression =3D { - .name =3D "MultiFDCompression", + .type =3D "MultiFDCompression", .description =3D "multifd_compression values, " "none/zlib/zstd/qpl/uadk/qatzip", .enum_table =3D &MultiFDCompression_lookup, @@ -693,7 +693,7 @@ const PropertyInfo qdev_prop_multifd_compression =3D { QEMU_BUILD_BUG_ON(sizeof(MigMode) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_mig_mode =3D { - .name =3D "MigMode", + .type =3D "MigMode", .description =3D "mig_mode values, " "normal,cpr-reboot", .enum_table =3D &MigMode_lookup, @@ -707,7 +707,7 @@ const PropertyInfo qdev_prop_mig_mode =3D { QEMU_BUILD_BUG_ON(sizeof(GranuleMode) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_granule_mode =3D { - .name =3D "GranuleMode", + .type =3D "GranuleMode", .description =3D "granule_mode values, " "4k, 8k, 16k, 64k, host", .enum_table =3D &GranuleMode_lookup, @@ -717,7 +717,7 @@ const PropertyInfo qdev_prop_granule_mode =3D { }; =20 const PropertyInfo qdev_prop_zero_page_detection =3D { - .name =3D "ZeroPageDetection", + .type =3D "ZeroPageDetection", .description =3D "zero_page_detection values, " "none,legacy,multifd", .enum_table =3D &ZeroPageDetection_lookup, @@ -801,7 +801,7 @@ out: } =20 const PropertyInfo qdev_prop_reserved_region =3D { - .name =3D "reserved_region", + .type =3D "reserved_region", .description =3D "Reserved Region, example: 0xFEE00000:0xFEEFFFFF:0", .get =3D get_reserved_region, .set =3D set_reserved_region, @@ -882,7 +882,7 @@ static int print_pci_devfn(Object *obj, const Property = *prop, char *dest, } =20 const PropertyInfo qdev_prop_pci_devfn =3D { - .name =3D "str", + .type =3D "str", .description =3D "Slot and optional function number, example: 06.0 or = 06", .print =3D print_pci_devfn, .get =3D qdev_propinfo_get_int32, @@ -988,7 +988,7 @@ inval: } =20 const PropertyInfo qdev_prop_pci_host_devaddr =3D { - .name =3D "str", + .type =3D "str", .description =3D "Address (bus/device/function) of " "the host device, example: 04:10.0", .get =3D get_pci_host_devaddr, @@ -998,7 +998,7 @@ const PropertyInfo qdev_prop_pci_host_devaddr =3D { /* --- OffAutoPCIBAR off/auto/bar0/bar1/bar2/bar3/bar4/bar5 --- */ =20 const PropertyInfo qdev_prop_off_auto_pcibar =3D { - .name =3D "OffAutoPCIBAR", + .type =3D "OffAutoPCIBAR", .description =3D "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", .enum_table =3D &OffAutoPCIBAR_lookup, .get =3D qdev_propinfo_get_enum, @@ -1080,7 +1080,7 @@ static void set_prop_pcielinkspeed(Object *obj, Visit= or *v, const char *name, } =20 const PropertyInfo qdev_prop_pcie_link_speed =3D { - .name =3D "PCIELinkSpeed", + .type =3D "PCIELinkSpeed", .description =3D "2_5/5/8/16/32/64", .enum_table =3D &PCIELinkSpeed_lookup, .get =3D get_prop_pcielinkspeed, @@ -1168,7 +1168,7 @@ static void set_prop_pcielinkwidth(Object *obj, Visit= or *v, const char *name, } =20 const PropertyInfo qdev_prop_pcie_link_width =3D { - .name =3D "PCIELinkWidth", + .type =3D "PCIELinkWidth", .description =3D "1/2/4/8/12/16/32", .enum_table =3D &PCIELinkWidth_lookup, .get =3D get_prop_pcielinkwidth, @@ -1218,7 +1218,7 @@ static void set_default_uuid_auto(ObjectProperty *op,= const Property *prop) } =20 const PropertyInfo qdev_prop_uuid =3D { - .name =3D "str", + .type =3D "str", .description =3D "UUID (aka GUID) or \"" UUID_VALUE_AUTO "\" for random value (default)", .get =3D get_uuid, @@ -1231,7 +1231,7 @@ const PropertyInfo qdev_prop_uuid =3D { QEMU_BUILD_BUG_ON(sizeof(S390CpuEntitlement) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_cpus390entitlement =3D { - .name =3D "S390CpuEntitlement", + .type =3D "S390CpuEntitlement", .description =3D "low/medium (default)/high", .enum_table =3D &S390CpuEntitlement_lookup, .get =3D qdev_propinfo_get_enum, @@ -1276,7 +1276,7 @@ static void release_iothread_vq_mapping_list(Object *= obj, } =20 const PropertyInfo qdev_prop_iothread_vq_mapping_list =3D { - .name =3D "IOThreadVirtQueueMappingList", + .type =3D "IOThreadVirtQueueMappingList", .description =3D "IOThread virtqueue mapping list [{\"iothread\":\"\", " "\"vqs\":[1,2,3,...]},...]", .get =3D get_iothread_vq_mapping_list, @@ -1287,7 +1287,7 @@ const PropertyInfo qdev_prop_iothread_vq_mapping_list= =3D { /* --- Endian modes */ =20 const PropertyInfo qdev_prop_endian_mode =3D { - .name =3D "EndianMode", + .type =3D "EndianMode", .description =3D "Endian mode, big/little/unspecified", .enum_table =3D &EndianMode_lookup, .get =3D qdev_propinfo_get_enum, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 2540bd8880..5a801057db 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -169,7 +169,7 @@ static void set_default_value_bool(ObjectProperty *op, = const Property *prop) } =20 const PropertyInfo qdev_prop_bit =3D { - .name =3D "bool", + .type =3D "bool", .description =3D "on/off", .get =3D prop_get_bit, .set =3D prop_set_bit, @@ -218,7 +218,7 @@ static void prop_set_bit64(Object *obj, Visitor *v, con= st char *name, } =20 const PropertyInfo qdev_prop_bit64 =3D { - .name =3D "bool", + .type =3D "bool", .description =3D "on/off", .get =3D prop_get_bit64, .set =3D prop_set_bit64, @@ -246,7 +246,7 @@ static void set_bool(Object *obj, Visitor *v, const cha= r *name, void *opaque, } =20 const PropertyInfo qdev_prop_bool =3D { - .name =3D "bool", + .type =3D "bool", .get =3D get_bool, .set =3D set_bool, .set_default_value =3D set_default_value_bool, @@ -285,7 +285,7 @@ void qdev_propinfo_set_default_value_uint(ObjectPropert= y *op, } =20 const PropertyInfo qdev_prop_uint8 =3D { - .name =3D "uint8", + .type =3D "uint8", .get =3D get_uint8, .set =3D set_uint8, .set_default_value =3D qdev_propinfo_set_default_value_uint, @@ -312,7 +312,7 @@ static void set_uint16(Object *obj, Visitor *v, const c= har *name, } =20 const PropertyInfo qdev_prop_uint16 =3D { - .name =3D "uint16", + .type =3D "uint16", .get =3D get_uint16, .set =3D set_uint16, .set_default_value =3D qdev_propinfo_set_default_value_uint, @@ -357,14 +357,14 @@ static void set_int32(Object *obj, Visitor *v, const = char *name, void *opaque, } =20 const PropertyInfo qdev_prop_uint32 =3D { - .name =3D "uint32", + .type =3D "uint32", .get =3D get_uint32, .set =3D set_uint32, .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 const PropertyInfo qdev_prop_int32 =3D { - .name =3D "int32", + .type =3D "int32", .get =3D qdev_propinfo_get_int32, .set =3D set_int32, .set_default_value =3D qdev_propinfo_set_default_value_int, @@ -409,14 +409,14 @@ static void set_int64(Object *obj, Visitor *v, const = char *name, } =20 const PropertyInfo qdev_prop_uint64 =3D { - .name =3D "uint64", + .type =3D "uint64", .get =3D get_uint64, .set =3D set_uint64, .set_default_value =3D qdev_propinfo_set_default_value_uint, }; =20 const PropertyInfo qdev_prop_int64 =3D { - .name =3D "int64", + .type =3D "int64", .get =3D get_int64, .set =3D set_int64, .set_default_value =3D qdev_propinfo_set_default_value_int, @@ -436,7 +436,7 @@ static void set_uint64_checkmask(Object *obj, Visitor *= v, const char *name, } =20 const PropertyInfo qdev_prop_uint64_checkmask =3D { - .name =3D "uint64", + .type =3D "uint64", .get =3D get_uint64, .set =3D set_uint64_checkmask, }; @@ -478,7 +478,7 @@ static void set_string(Object *obj, Visitor *v, const c= har *name, } =20 const PropertyInfo qdev_prop_string =3D { - .name =3D "str", + .type =3D "str", .release =3D release_string, .get =3D get_string, .set =3D set_string, @@ -487,7 +487,7 @@ const PropertyInfo qdev_prop_string =3D { /* --- on/off/auto --- */ =20 const PropertyInfo qdev_prop_on_off_auto =3D { - .name =3D "OnOffAuto", + .type =3D "OnOffAuto", .description =3D "on/off/auto", .enum_table =3D &OnOffAuto_lookup, .get =3D qdev_propinfo_get_enum, @@ -530,7 +530,7 @@ static void set_size32(Object *obj, Visitor *v, const c= har *name, void *opaque, } =20 const PropertyInfo qdev_prop_size32 =3D { - .name =3D "size", + .type =3D "size", .get =3D qdev_propinfo_get_size32, .set =3D set_size32, .set_default_value =3D qdev_propinfo_set_default_value_uint, @@ -733,7 +733,7 @@ static void default_prop_array(ObjectProperty *op, cons= t Property *prop) } =20 const PropertyInfo qdev_prop_array =3D { - .name =3D "list", + .type =3D "list", .get =3D get_prop_array, .set =3D set_prop_array, .release =3D release_prop_array, @@ -937,7 +937,7 @@ static void set_size(Object *obj, Visitor *v, const cha= r *name, void *opaque, } =20 const PropertyInfo qdev_prop_size =3D { - .name =3D "size", + .type =3D "size", .get =3D get_size, .set =3D set_size, .set_default_value =3D qdev_propinfo_set_default_value_uint, @@ -955,7 +955,7 @@ static ObjectProperty *create_link_property(ObjectClass= *oc, const char *name, } =20 const PropertyInfo qdev_prop_link =3D { - .name =3D "link", + .type =3D "link", .create =3D create_link_property, }; =20 @@ -966,7 +966,7 @@ void qdev_property_add_static(DeviceState *dev, const P= roperty *prop) =20 assert(!prop->info->create); =20 - op =3D object_property_add(obj, prop->name, prop->info->name, + op =3D object_property_add(obj, prop->name, prop->info->type, field_prop_getter(prop->info), field_prop_setter(prop->info), prop->info->release, @@ -993,7 +993,7 @@ static void qdev_class_add_property(DeviceClass *klass,= const char *name, op =3D prop->info->create(oc, name, prop); } else { op =3D object_class_property_add(oc, - name, prop->info->name, + name, prop->info->type, field_prop_getter(prop->info), field_prop_setter(prop->info), prop->info->release, diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index dbd9b58a4e..9a44a90d1e 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -652,7 +652,7 @@ static void trng_prop_fault_event_set(Object *obj, Visi= tor *v, } =20 static const PropertyInfo trng_prop_fault_events =3D { - .name =3D "uint32:bits", + .type =3D "uint32:bits", .description =3D "Set to trigger TRNG fault events", .set =3D trng_prop_fault_event_set, .realized_set_allowed =3D true, diff --git a/hw/nvme/nguid.c b/hw/nvme/nguid.c index be63cb75e1..4cd6fad6ac 100644 --- a/hw/nvme/nguid.c +++ b/hw/nvme/nguid.c @@ -179,7 +179,7 @@ static void set_nguid(Object *obj, Visitor *v, const ch= ar *name, void *opaque, } =20 const PropertyInfo qdev_prop_nguid =3D { - .name =3D "str", + .type =3D "str", .description =3D "NGUID or \"" NGUID_VALUE_AUTO "\" for random value", .get =3D get_nguid, diff --git a/hw/nvram/xlnx-bbram.c b/hw/nvram/xlnx-bbram.c index 0e8552ce65..14cc9073c7 100644 --- a/hw/nvram/xlnx-bbram.c +++ b/hw/nvram/xlnx-bbram.c @@ -502,7 +502,7 @@ static void bbram_prop_release_drive(Object *obj, const= char *name, } =20 static const PropertyInfo bbram_prop_drive =3D { - .name =3D "str", + .type =3D "str", .description =3D "Node name or ID of a block device to use as BBRAM ba= ckend", .realized_set_allowed =3D true, .get =3D bbram_prop_get_drive, diff --git a/hw/nvram/xlnx-efuse.c b/hw/nvram/xlnx-efuse.c index e2e8311a48..29e7dd539e 100644 --- a/hw/nvram/xlnx-efuse.c +++ b/hw/nvram/xlnx-efuse.c @@ -257,7 +257,7 @@ static void efuse_prop_release_drive(Object *obj, const= char *name, } =20 static const PropertyInfo efuse_prop_drive =3D { - .name =3D "str", + .type =3D "str", .description =3D "Node name or ID of a block device to use as eFUSE ba= ckend", .realized_set_allowed =3D true, .get =3D efuse_prop_get_drive, diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1d42847ef0..e3c2866830 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -77,7 +77,7 @@ static void prop_pci_busnr_get(Object *obj, Visitor *v, c= onst char *name, } =20 static const PropertyInfo prop_pci_busnr =3D { - .name =3D "busnr", + .type =3D "busnr", .get =3D prop_pci_busnr_get, }; =20 diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 494faebb5a..5aa6ff8eac 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -74,7 +74,7 @@ static void ccw_device_set_loadparm(Object *obj, Visitor = *v, } =20 const PropertyInfo ccw_loadparm =3D { - .name =3D "ccw_loadparm", + .type =3D "ccw_loadparm", .description =3D "Up to 8 chars in set of [A-Za-z0-9. ] to pass" " to the guest loader/kernel", .get =3D ccw_device_get_loadparm, diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 4e27b2961b..738800c98d 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -2523,7 +2523,7 @@ out: } =20 const PropertyInfo css_devid_propinfo =3D { - .name =3D "str", + .type =3D "str", .description =3D "Identifier of an I/O device in the channel " "subsystem, example: fe.1.23ab", .get =3D get_css_devid, @@ -2531,7 +2531,7 @@ const PropertyInfo css_devid_propinfo =3D { }; =20 const PropertyInfo css_devid_ro_propinfo =3D { - .name =3D "str", + .type =3D "str", .description =3D "Read-only identifier of an I/O device in the channel= " "subsystem, example: fe.1.23ab", .get =3D get_css_devid, diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 913d72cc74..7f340965c0 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1495,7 +1495,7 @@ static void s390_pci_set_fid(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo s390_pci_fid_propinfo =3D { - .name =3D "zpci_fid", + .type =3D "zpci_fid", .get =3D s390_pci_get_fid, .set =3D s390_pci_set_fid, }; diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index fbe43b0a79..ba97d59791 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1480,7 +1480,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, V= isitor *v, } =20 const PropertyInfo qdev_prop_nv_gpudirect_clique =3D { - .name =3D "uint4", + .type =3D "uint4", .description =3D "NVIDIA GPUDirect Clique ID (0 - 15)", .get =3D get_nv_gpudirect_clique_id, .set =3D set_nv_gpudirect_clique_id, diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index cca24b9f1f..d2a950d593 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1817,7 +1817,7 @@ static void prop_pmu_num_get(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo prop_pmu_num =3D { - .name =3D "pmu-num", + .type =3D "pmu-num", .get =3D prop_pmu_num_get, .set =3D prop_pmu_num_set, }; @@ -1858,7 +1858,7 @@ static void prop_pmu_mask_get(Object *obj, Visitor *v= , const char *name, } =20 static const PropertyInfo prop_pmu_mask =3D { - .name =3D "pmu-mask", + .type =3D "pmu-mask", .get =3D prop_pmu_mask_get, .set =3D prop_pmu_mask_set, }; @@ -1889,7 +1889,7 @@ static void prop_mmu_get(Object *obj, Visitor *v, con= st char *name, } =20 static const PropertyInfo prop_mmu =3D { - .name =3D "mmu", + .type =3D "mmu", .get =3D prop_mmu_get, .set =3D prop_mmu_set, }; @@ -1920,7 +1920,7 @@ static void prop_pmp_get(Object *obj, Visitor *v, con= st char *name, } =20 static const PropertyInfo prop_pmp =3D { - .name =3D "pmp", + .type =3D "pmp", .get =3D prop_pmp_get, .set =3D prop_pmp_set, }; @@ -1994,7 +1994,7 @@ static void prop_priv_spec_get(Object *obj, Visitor *= v, const char *name, } =20 static const PropertyInfo prop_priv_spec =3D { - .name =3D "priv_spec", + .type =3D "priv_spec", .get =3D prop_priv_spec_get, .set =3D prop_priv_spec_set, }; @@ -2025,7 +2025,7 @@ static void prop_vext_spec_get(Object *obj, Visitor *= v, const char *name, } =20 static const PropertyInfo prop_vext_spec =3D { - .name =3D "vext_spec", + .type =3D "vext_spec", .get =3D prop_vext_spec_get, .set =3D prop_vext_spec_set, }; @@ -2065,7 +2065,7 @@ static void prop_vlen_get(Object *obj, Visitor *v, co= nst char *name, } =20 static const PropertyInfo prop_vlen =3D { - .name =3D "vlen", + .type =3D "vlen", .get =3D prop_vlen_get, .set =3D prop_vlen_set, }; @@ -2105,7 +2105,7 @@ static void prop_elen_get(Object *obj, Visitor *v, co= nst char *name, } =20 static const PropertyInfo prop_elen =3D { - .name =3D "elen", + .type =3D "elen", .get =3D prop_elen_get, .set =3D prop_elen_set, }; @@ -2140,7 +2140,7 @@ static void prop_cbom_blksize_get(Object *obj, Visito= r *v, const char *name, } =20 static const PropertyInfo prop_cbom_blksize =3D { - .name =3D "cbom_blocksize", + .type =3D "cbom_blocksize", .get =3D prop_cbom_blksize_get, .set =3D prop_cbom_blksize_set, }; @@ -2175,7 +2175,7 @@ static void prop_cbop_blksize_get(Object *obj, Visito= r *v, const char *name, } =20 static const PropertyInfo prop_cbop_blksize =3D { - .name =3D "cbop_blocksize", + .type =3D "cbop_blocksize", .get =3D prop_cbop_blksize_get, .set =3D prop_cbop_blksize_set, }; @@ -2210,7 +2210,7 @@ static void prop_cboz_blksize_get(Object *obj, Visito= r *v, const char *name, } =20 static const PropertyInfo prop_cboz_blksize =3D { - .name =3D "cboz_blocksize", + .type =3D "cboz_blocksize", .get =3D prop_cboz_blksize_get, .set =3D prop_cboz_blksize_set, }; @@ -2245,7 +2245,7 @@ static void prop_mvendorid_get(Object *obj, Visitor *= v, const char *name, } =20 static const PropertyInfo prop_mvendorid =3D { - .name =3D "mvendorid", + .type =3D "mvendorid", .get =3D prop_mvendorid_get, .set =3D prop_mvendorid_set, }; @@ -2280,7 +2280,7 @@ static void prop_mimpid_get(Object *obj, Visitor *v, = const char *name, } =20 static const PropertyInfo prop_mimpid =3D { - .name =3D "mimpid", + .type =3D "mimpid", .get =3D prop_mimpid_get, .set =3D prop_mimpid_set, }; @@ -2336,7 +2336,7 @@ static void prop_marchid_get(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo prop_marchid =3D { - .name =3D "marchid", + .type =3D "marchid", .get =3D prop_marchid_get, .set =3D prop_marchid_set, }; diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index fbd38ec334..c8ea35be76 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -938,7 +938,7 @@ static void sparc_set_nwindows(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo qdev_prop_nwindows =3D { - .name =3D "int", + .type =3D "int", .get =3D sparc_get_nwindows, .set =3D sparc_set_nwindows, }; diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m index 1554f3b801..c4323574e1 100644 --- a/hw/display/apple-gfx.m +++ b/hw/display/apple-gfx.m @@ -871,7 +871,7 @@ static void apple_gfx_set_display_mode(Object *obj, Vis= itor *v, } =20 const PropertyInfo qdev_prop_apple_gfx_display_mode =3D { - .name =3D "display_mode", + .type =3D "display_mode", .description =3D "Display mode in pixels and Hertz, as x@ " "Example: 3840x2160@60", --=20 2.48.1 From nobody Thu Apr 3 11:28:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740646621; cv=none; d=zohomail.com; s=zohoarc; b=mdTz4KiX51Epmq+2GMWm94UuXrytNHlbS/8Ks+lwvKslm7u/RzwAOuLRjLaVNRo7JOtJipOhqcle0IGkfpBZtesWQ+FNcJJjuHJgoKSieefwK1NdmJDrAUirU774Ht3L4w4WQ2CrVgz3nSky7/mL5KjPprHLbUXgx2Ot3Gl1ats= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740646621; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ksmJ5M0+T4ZP+uofWoi1T1S2GjFwTSs5HWYvi9JY6Dk=; b=BUhFzb5pcvyOZyo6fmg13sWQIsqa6DczM2cQPAfXyIelSTtUsW9cICpnVgkoheQ5izeP8QbPChNrdoyNHVKNUrjRaneyDlZeZaHhjGr9vBXe3LlVbcfYFZMpu7LXbrsT3Fp54gYz/s6vOy34HzAtC5897n8AKzTgKN9DabAG9yE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740646621057142.68942605282257; Thu, 27 Feb 2025 00:57:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnZgo-0003di-AJ; Thu, 27 Feb 2025 03:56:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgk-0003d0-T5 for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgh-0001kR-Rr for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:14 -0500 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-453-FVBW1VOqMDSkba9q1rBAVg-1; Thu, 27 Feb 2025 03:56:06 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8943519540EE; Thu, 27 Feb 2025 08:56:05 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.9]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D24C51944F12; Thu, 27 Feb 2025 08:56:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 128A121E65EA; Thu, 27 Feb 2025 09:56:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740646570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ksmJ5M0+T4ZP+uofWoi1T1S2GjFwTSs5HWYvi9JY6Dk=; b=busiW90PzF+WVUIzZzvy/c2ELhY9+8kZ8MlwPde8T5IcVtD6csYKoOpW+yUh3aXnOISK2x KmpNv/lLuh84FpuxxNAfI/LpnwLPVn15FmQLfwo6sIx7ihE/iyCSYB6++1a8N4dKrvHiB4 gNbzmf517iL8Vyfc31QRr5r9wLZpVWg= X-MC-Unique: FVBW1VOqMDSkba9q1rBAVg-1 X-Mimecast-MFC-AGG-ID: FVBW1VOqMDSkba9q1rBAVg_1740646565 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH v2 4/6] qdev: Change values of PropertyInfo member @type to be QAPI types Date: Thu, 27 Feb 2025 09:55:59 +0100 Message-ID: <20250227085601.4140852-5-armbru@redhat.com> In-Reply-To: <20250227085601.4140852-1-armbru@redhat.com> References: <20250227085601.4140852-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.44, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740646622547019100 Content-Type: text/plain; charset="utf-8" PropertyInfo member @type is externally visible via QMP device-list-properties and qom-list-properies. Its meaning is not documented at its definition. It gets passed to as @type argument to object_property_add() and object_class_property_add(). This argument's documentation isn't of much help, either: * @type: the type name of the property. This namespace is pretty loosely * defined. Sub namespaces are constructed by using a prefix and then * to angle brackets. For instance, the type 'virtio-net-pci' in the * 'link' namespace would be 'link'. The two QMP commands document it as # @type: the type of the property. This will typically come in one of # four forms: # # 1) A primitive type such as 'u8', 'u16', 'bool', 'str', or # 'double'. These types are mapped to the appropriate JSON # type. # # 2) A child type in the form 'child' where subtype is a # qdev device type name. Child properties create the # composition tree. # # 3) A link type in the form 'link' where subtype is a # qdev device type name. Link properties form the device model # graph. "Typically come in one of four forms" followed by three items inspires the level of trust that is appropriate here. Clean up a bunch of funnies: * qdev_prop_fdc_drive_type.type is "FdcDriveType". Its .enum_table refers to QAPI type "FloppyDriveType". So use that. * qdev_prop_reserved_region is "reserved_region". Its only user is an array property called "reserved-regions". Its .set() visits str. So change @type to "str". * trng_prop_fault_event_set.type is "uint32:bits". Its .set() visits uint32, so change @type to "uint32". If we believe mentioning it's actually bits is useful, the proper place would be .description. * ccw_loadparm.type is "ccw_loadparm". It's users are properties called "loadparm". Its .set() visits str. So change @type to "str". * qdev_prop_nv_gpudirect_clique.type is "uint4". Its set() visits uint8, so change @type to "uint8". If we believe mentioning the range is useful, the proper place would be .description. * s390_pci_fid_propinfo.type is "zpci_fid". Its .set() visits uint32. So change type to that, and move the "zpci_fid" to .description. This is admittedly a lousy description, but it's still an improvement; for instance, output of -device zpci,help changes from fid=3D to fid=3D - zpci_fid * Similarly for a raft of PropertyInfo in target/riscv/cpu.c. Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/qdev-properties-system.c | 4 +-- hw/misc/xlnx-versal-trng.c | 2 +- hw/s390x/ccw-device.c | 2 +- hw/s390x/s390-pci-bus.c | 3 ++- hw/vfio/pci-quirks.c | 2 +- target/riscv/cpu.c | 44 ++++++++++++++++++++++---------- 6 files changed, 37 insertions(+), 20 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 720b177ba8..21f67d42f8 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -667,7 +667,7 @@ const PropertyInfo qdev_prop_bios_chs_trans =3D { /* --- FDC default drive types */ =20 const PropertyInfo qdev_prop_fdc_drive_type =3D { - .type =3D "FdcDriveType", + .type =3D "FloppyDriveType", .description =3D "FDC drive type, " "144/288/120/none/auto", .enum_table =3D &FloppyDriveType_lookup, @@ -801,7 +801,7 @@ out: } =20 const PropertyInfo qdev_prop_reserved_region =3D { - .type =3D "reserved_region", + .type =3D "str", .description =3D "Reserved Region, example: 0xFEE00000:0xFEEFFFFF:0", .get =3D get_reserved_region, .set =3D set_reserved_region, diff --git a/hw/misc/xlnx-versal-trng.c b/hw/misc/xlnx-versal-trng.c index 9a44a90d1e..ba93f93cab 100644 --- a/hw/misc/xlnx-versal-trng.c +++ b/hw/misc/xlnx-versal-trng.c @@ -652,7 +652,7 @@ static void trng_prop_fault_event_set(Object *obj, Visi= tor *v, } =20 static const PropertyInfo trng_prop_fault_events =3D { - .type =3D "uint32:bits", + .type =3D "uint32", .description =3D "Set to trigger TRNG fault events", .set =3D trng_prop_fault_event_set, .realized_set_allowed =3D true, diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 5aa6ff8eac..1d4b8ea35c 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -74,7 +74,7 @@ static void ccw_device_set_loadparm(Object *obj, Visitor = *v, } =20 const PropertyInfo ccw_loadparm =3D { - .type =3D "ccw_loadparm", + .type =3D "str", .description =3D "Up to 8 chars in set of [A-Za-z0-9. ] to pass" " to the guest loader/kernel", .get =3D ccw_device_get_loadparm, diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 7f340965c0..04cdd4a11b 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1495,7 +1495,8 @@ static void s390_pci_set_fid(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo s390_pci_fid_propinfo =3D { - .type =3D "zpci_fid", + .type =3D "uint32", + .description =3D "zpci_fid", .get =3D s390_pci_get_fid, .set =3D s390_pci_set_fid, }; diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index ba97d59791..c53591fe2b 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1480,7 +1480,7 @@ static void set_nv_gpudirect_clique_id(Object *obj, V= isitor *v, } =20 const PropertyInfo qdev_prop_nv_gpudirect_clique =3D { - .type =3D "uint4", + .type =3D "uint8", .description =3D "NVIDIA GPUDirect Clique ID (0 - 15)", .get =3D get_nv_gpudirect_clique_id, .set =3D set_nv_gpudirect_clique_id, diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d2a950d593..f8da5fc314 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1817,7 +1817,8 @@ static void prop_pmu_num_get(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo prop_pmu_num =3D { - .type =3D "pmu-num", + .type =3D "int8", + .description =3D "pmu-num", .get =3D prop_pmu_num_get, .set =3D prop_pmu_num_set, }; @@ -1858,7 +1859,8 @@ static void prop_pmu_mask_get(Object *obj, Visitor *v= , const char *name, } =20 static const PropertyInfo prop_pmu_mask =3D { - .type =3D "pmu-mask", + .type =3D "int8", + .description =3D "pmu-mask", .get =3D prop_pmu_mask_get, .set =3D prop_pmu_mask_set, }; @@ -1889,7 +1891,8 @@ static void prop_mmu_get(Object *obj, Visitor *v, con= st char *name, } =20 static const PropertyInfo prop_mmu =3D { - .type =3D "mmu", + .type =3D "bool", + .description =3D "mmu", .get =3D prop_mmu_get, .set =3D prop_mmu_set, }; @@ -1920,7 +1923,8 @@ static void prop_pmp_get(Object *obj, Visitor *v, con= st char *name, } =20 static const PropertyInfo prop_pmp =3D { - .type =3D "pmp", + .type =3D "bool", + .description =3D "pmp", .get =3D prop_pmp_get, .set =3D prop_pmp_set, }; @@ -1994,7 +1998,9 @@ static void prop_priv_spec_get(Object *obj, Visitor *= v, const char *name, } =20 static const PropertyInfo prop_priv_spec =3D { - .type =3D "priv_spec", + .type =3D "str", + .description =3D "priv_spec", + /* FIXME enum? */ .get =3D prop_priv_spec_get, .set =3D prop_priv_spec_set, }; @@ -2025,7 +2031,9 @@ static void prop_vext_spec_get(Object *obj, Visitor *= v, const char *name, } =20 static const PropertyInfo prop_vext_spec =3D { - .type =3D "vext_spec", + .type =3D "str", + .description =3D "vext_spec", + /* FIXME enum? */ .get =3D prop_vext_spec_get, .set =3D prop_vext_spec_set, }; @@ -2065,7 +2073,8 @@ static void prop_vlen_get(Object *obj, Visitor *v, co= nst char *name, } =20 static const PropertyInfo prop_vlen =3D { - .type =3D "vlen", + .type =3D "uint16", + .description =3D "vlen", .get =3D prop_vlen_get, .set =3D prop_vlen_set, }; @@ -2105,7 +2114,8 @@ static void prop_elen_get(Object *obj, Visitor *v, co= nst char *name, } =20 static const PropertyInfo prop_elen =3D { - .type =3D "elen", + .type =3D "uint16", + .description =3D "elen", .get =3D prop_elen_get, .set =3D prop_elen_set, }; @@ -2140,7 +2150,8 @@ static void prop_cbom_blksize_get(Object *obj, Visito= r *v, const char *name, } =20 static const PropertyInfo prop_cbom_blksize =3D { - .type =3D "cbom_blocksize", + .type =3D "uint16", + .description =3D "cbom_blocksize", .get =3D prop_cbom_blksize_get, .set =3D prop_cbom_blksize_set, }; @@ -2175,7 +2186,8 @@ static void prop_cbop_blksize_get(Object *obj, Visito= r *v, const char *name, } =20 static const PropertyInfo prop_cbop_blksize =3D { - .type =3D "cbop_blocksize", + .type =3D "uint16", + .description =3D "cbop_blocksize", .get =3D prop_cbop_blksize_get, .set =3D prop_cbop_blksize_set, }; @@ -2210,7 +2222,8 @@ static void prop_cboz_blksize_get(Object *obj, Visito= r *v, const char *name, } =20 static const PropertyInfo prop_cboz_blksize =3D { - .type =3D "cboz_blocksize", + .type =3D "uint16", + .description =3D "cboz_blocksize", .get =3D prop_cboz_blksize_get, .set =3D prop_cboz_blksize_set, }; @@ -2245,7 +2258,8 @@ static void prop_mvendorid_get(Object *obj, Visitor *= v, const char *name, } =20 static const PropertyInfo prop_mvendorid =3D { - .type =3D "mvendorid", + .type =3D "uint32", + .description =3D "mvendorid", .get =3D prop_mvendorid_get, .set =3D prop_mvendorid_set, }; @@ -2280,7 +2294,8 @@ static void prop_mimpid_get(Object *obj, Visitor *v, = const char *name, } =20 static const PropertyInfo prop_mimpid =3D { - .type =3D "mimpid", + .type =3D "uint64", + .description =3D "mimpid", .get =3D prop_mimpid_get, .set =3D prop_mimpid_set, }; @@ -2336,7 +2351,8 @@ static void prop_marchid_get(Object *obj, Visitor *v,= const char *name, } =20 static const PropertyInfo prop_marchid =3D { - .type =3D "marchid", + .type =3D "uint64", + .description =3D "marchid", .get =3D prop_marchid_get, .set =3D prop_marchid_set, }; --=20 2.48.1 From nobody Thu Apr 3 11:28:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740646631; cv=none; d=zohomail.com; s=zohoarc; b=Ve0Rzzm+AXpfMz+Jrx4WQbH3XKtlHbvglatroeWSiAJfpNJrlRpC6xFoL5SiOq6r4+9k2ktxygMqSg6rKxSSxCPhMgs/TxE6Gi+gzkTv16jtMhwgKQcxTk51hROS3bumRwiq47lFHmIG0nJIDEAWdW43Ny8udMagz853E9vU1xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740646631; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=APifhp3j6n4W5oWPDH4oxmGTRnbnrNQc5kXxVnbO/RQ=; b=dPQHCj8eBRhz8Vm3HaNZS0Ntj5DwA5kUB4he5Urt79QhocNZ+qmjtS8vjZblF+vI+l6rMuiZBi8k5YGqRjDy/yxY9Cg2M+fyF+g5E9gPgHNUpzWLJRtj7OC3v+5lHjuaGiu8jTqHT/1M8UIGzYevPAJrKhUJF468yaImxhaxeW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740646631042107.95759542301653; Thu, 27 Feb 2025 00:57:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnZgs-0003en-VL; Thu, 27 Feb 2025 03:56:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgl-0003dM-Pk for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgj-0001kz-MA for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:15 -0500 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-132-a07nHNgjPTaTyetwIrA6Hg-1; Thu, 27 Feb 2025 03:56:08 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC3D219560BC; Thu, 27 Feb 2025 08:56:07 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.9]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 822DC180094B; Thu, 27 Feb 2025 08:56:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1680121E65FD; Thu, 27 Feb 2025 09:56:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740646573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=APifhp3j6n4W5oWPDH4oxmGTRnbnrNQc5kXxVnbO/RQ=; b=WO9gs28OHWTtbEVy3aqp0LcAWqJVIO4ogLPKFIon8Pqlx8O/2zm/vWo0lfx53fWGlHh8CL unQbyYyFdwTPr3QuV4Dyu1123hBVI3MPDULZ+w/njhXLMRDbDFcUprVitsEP193QTzC/3v CcuiXtPbdSNsl0RA7F04qijpdUwHtE0= X-MC-Unique: a07nHNgjPTaTyetwIrA6Hg-1 X-Mimecast-MFC-AGG-ID: a07nHNgjPTaTyetwIrA6Hg_1740646568 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH v2 5/6] qdev: Improve PropertyInfo member @description for enum properties Date: Thu, 27 Feb 2025 09:56:00 +0100 Message-ID: <20250227085601.4140852-6-armbru@redhat.com> In-Reply-To: <20250227085601.4140852-1-armbru@redhat.com> References: <20250227085601.4140852-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.44, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740646634313019100 Content-Type: text/plain; charset="utf-8" Consistently use format "DESCRIPTION (VALUE/VALUE...)". Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/core/qdev-properties-system.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index 21f67d42f8..aa7600bce6 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -603,6 +603,7 @@ QEMU_BUILD_BUG_ON(sizeof(LostTickPolicy) !=3D sizeof(in= t)); =20 const PropertyInfo qdev_prop_losttickpolicy =3D { .type =3D "LostTickPolicy", + .description =3D "Policy for handling lost ticks (discard/delay/slew)", .enum_table =3D &LostTickPolicy_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_losttickpolicy, @@ -642,8 +643,7 @@ QEMU_BUILD_BUG_ON(sizeof(BlockdevOnError) !=3D sizeof(i= nt)); =20 const PropertyInfo qdev_prop_blockdev_on_error =3D { .type =3D "BlockdevOnError", - .description =3D "Error handling policy, " - "report/ignore/enospc/stop/auto", + .description =3D "Error handling policy (report/ignore/enospc/stop/aut= o)", .enum_table =3D &BlockdevOnError_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -656,8 +656,8 @@ QEMU_BUILD_BUG_ON(sizeof(BiosAtaTranslation) !=3D sizeo= f(int)); =20 const PropertyInfo qdev_prop_bios_chs_trans =3D { .type =3D "BiosAtaTranslation", - .description =3D "Logical CHS translation algorithm, " - "auto/none/lba/large/rechs", + .description =3D "Logical CHS translation algorithm " + " (auto/none/lba/large/rechs)", .enum_table =3D &BiosAtaTranslation_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -668,8 +668,7 @@ const PropertyInfo qdev_prop_bios_chs_trans =3D { =20 const PropertyInfo qdev_prop_fdc_drive_type =3D { .type =3D "FloppyDriveType", - .description =3D "FDC drive type, " - "144/288/120/none/auto", + .description =3D "Floppy drive type (144/288/120/none/auto)", .enum_table =3D &FloppyDriveType_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -680,8 +679,8 @@ const PropertyInfo qdev_prop_fdc_drive_type =3D { =20 const PropertyInfo qdev_prop_multifd_compression =3D { .type =3D "MultiFDCompression", - .description =3D "multifd_compression values, " - "none/zlib/zstd/qpl/uadk/qatzip", + .description =3D "multifd_compression values" + " (none/zlib/zstd/qpl/uadk/qatzip)", .enum_table =3D &MultiFDCompression_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -694,8 +693,7 @@ QEMU_BUILD_BUG_ON(sizeof(MigMode) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_mig_mode =3D { .type =3D "MigMode", - .description =3D "mig_mode values, " - "normal,cpr-reboot", + .description =3D "Migration mode (normal/cpr-reboot)", .enum_table =3D &MigMode_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -708,8 +706,7 @@ QEMU_BUILD_BUG_ON(sizeof(GranuleMode) !=3D sizeof(int)); =20 const PropertyInfo qdev_prop_granule_mode =3D { .type =3D "GranuleMode", - .description =3D "granule_mode values, " - "4k, 8k, 16k, 64k, host", + .description =3D "Granule page size (4k/8k/16k/64k/host)", .enum_table =3D &GranuleMode_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -718,8 +715,7 @@ const PropertyInfo qdev_prop_granule_mode =3D { =20 const PropertyInfo qdev_prop_zero_page_detection =3D { .type =3D "ZeroPageDetection", - .description =3D "zero_page_detection values, " - "none,legacy,multifd", + .description =3D "Zero page detection (none/legacy/multifd)", .enum_table =3D &ZeroPageDetection_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, @@ -1232,7 +1228,7 @@ QEMU_BUILD_BUG_ON(sizeof(S390CpuEntitlement) !=3D siz= eof(int)); =20 const PropertyInfo qdev_prop_cpus390entitlement =3D { .type =3D "S390CpuEntitlement", - .description =3D "low/medium (default)/high", + .description =3D "auto/low/medium/high (default medium)", .enum_table =3D &S390CpuEntitlement_lookup, .get =3D qdev_propinfo_get_enum, .set =3D qdev_propinfo_set_enum, --=20 2.48.1 From nobody Thu Apr 3 11:28:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740646622; cv=none; d=zohomail.com; s=zohoarc; b=nnvqujBMUNrOyi4EpzEtNbHBC803x61Nh8qzYRa6ZAS4UoIZiFUYXWgmiThxu+dzMp5FtDdFhp4DRfFd+Usww40W2N2/rpPazq0rUVrCaw7xEzrLXdx+FYxSpzNxfkfBrNfxmNDoD8xhOYwhrDoTFeE6FpEZZG2d5NTJ6Pjl+a4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740646622; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZAqUbCDnvWBy3/Czvf3EyM7BKzjbQa1Io3/kPYioLn4=; b=izlKRnTUgw2BI6o6lS/Ormd+sT4fxmV5EV+mRcl4inz/6CWP/32xk+vL5e6zavko8Xa97V3vf5iOTrQfXnbtC9fitqF7vf7B2YZ2/+lZ4INpG5ug4gZmFrvmfVyS4tSlZngKR/rxv99ZKq4BOIds6jL8d1RnKTcYOA6kzTz2gy0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740646622917371.16463799976054; Thu, 27 Feb 2025 00:57:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnZgu-0003fG-AR; Thu, 27 Feb 2025 03:56:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgs-0003eo-U8 for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnZgm-0001lP-13 for qemu-devel@nongnu.org; Thu, 27 Feb 2025 03:56:17 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-6gGadRUQNNecCyBS_RyoJA-1; Thu, 27 Feb 2025 03:56:09 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CF87B180034A; Thu, 27 Feb 2025 08:56:08 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.9]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9DF8F180035E; Thu, 27 Feb 2025 08:56:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1A62721E65FF; Thu, 27 Feb 2025 09:56:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740646574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZAqUbCDnvWBy3/Czvf3EyM7BKzjbQa1Io3/kPYioLn4=; b=AtRsSFWH1D1KW6ryWebm6uS2Tf27d1YX3fd0lUI4Tlr9UJVUlNiTYFxAA9CRKwqYC3xtAh 2efy55oOSAD4+Fdjy6PaCmeOqJba1wcawLQke1iOpdEToELneZcz1vsGP6CWtukTyAfTkd UtmZ5bk1nJKyPJEw/TMGyzvLjEHFU6c= X-MC-Unique: 6gGadRUQNNecCyBS_RyoJA-1 X-Mimecast-MFC-AGG-ID: 6gGadRUQNNecCyBS_RyoJA_1740646568 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH v2 6/6] qdev: Improve a few more PropertyInfo @description members Date: Thu, 27 Feb 2025 09:56:01 +0100 Message-ID: <20250227085601.4140852-7-armbru@redhat.com> In-Reply-To: <20250227085601.4140852-1-armbru@redhat.com> References: <20250227085601.4140852-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.44, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740646624352019100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrang=C3=A9 --- hw/block/xen-block.c | 2 +- hw/core/qdev-properties-system.c | 2 +- hw/core/qdev-properties.c | 1 + hw/s390x/ccw-device.c | 4 ++-- target/sparc/cpu.c | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index 7c9d1b658c..2098286b5f 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -662,7 +662,7 @@ invalid: */ static const PropertyInfo xen_block_prop_vdev =3D { .type =3D "str", - .description =3D "Virtual Disk specifier: d*p*/xvd*/hd*/sd*", + .description =3D "Virtual Disk specifier (d*p*/xvd*/hd*/sd*)", .get =3D xen_block_get_vdev, .set =3D xen_block_set_vdev, }; diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys= tem.c index aa7600bce6..1f01eb3e59 100644 --- a/hw/core/qdev-properties-system.c +++ b/hw/core/qdev-properties-system.c @@ -985,7 +985,7 @@ inval: =20 const PropertyInfo qdev_prop_pci_host_devaddr =3D { .type =3D "str", - .description =3D "Address (bus/device/function) of " + .description =3D "Address (bus:device.function) of " "the host device, example: 04:10.0", .get =3D get_pci_host_devaddr, .set =3D set_pci_host_devaddr, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 5a801057db..c04df3b337 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -247,6 +247,7 @@ static void set_bool(Object *obj, Visitor *v, const cha= r *name, void *opaque, =20 const PropertyInfo qdev_prop_bool =3D { .type =3D "bool", + .description =3D "on/off", .get =3D get_bool, .set =3D set_bool, .set_default_value =3D set_default_value_bool, diff --git a/hw/s390x/ccw-device.c b/hw/s390x/ccw-device.c index 1d4b8ea35c..1ea9934f6c 100644 --- a/hw/s390x/ccw-device.c +++ b/hw/s390x/ccw-device.c @@ -75,8 +75,8 @@ static void ccw_device_set_loadparm(Object *obj, Visitor = *v, =20 const PropertyInfo ccw_loadparm =3D { .type =3D "str", - .description =3D "Up to 8 chars in set of [A-Za-z0-9. ] to pass" - " to the guest loader/kernel", + .description =3D "Up to 8 chars in set of [A-Za-z0-9. ] to select" + " a guest kernel", .get =3D ccw_device_get_loadparm, .set =3D ccw_device_set_loadparm, }; diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index c8ea35be76..f0613f8a8e 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -939,6 +939,7 @@ static void sparc_set_nwindows(Object *obj, Visitor *v,= const char *name, =20 static const PropertyInfo qdev_prop_nwindows =3D { .type =3D "int", + .description =3D "Number of register windows", .get =3D sparc_get_nwindows, .set =3D sparc_set_nwindows, }; --=20 2.48.1