From nobody Wed Apr 9 01:13:39 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=1734445851; cv=none; d=zohomail.com; s=zohoarc; b=NgwqzQiVuf2OuJ9z+o/9MqSenBECZWfvRItCiTuIdGflUPZiaHO2x/ErmQywVkA0JM4uAkGwV/vq9jgBBzm2G2kAZUPY4T6E5mhmoY2HFqp3QaibYmTOh9TxklWEp9OwmP47mo1vrvuQnQtNZW20ENahrla6MuPGfU0b/5hFauw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734445851; 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=rGnPqYnVB92EV7EXj5JzVc7YMdWCsFD7SGGXuGweevk=; b=Ida6jLhhOHJ28bHURTkW6Sbi3fZZrvTtMb96fMNbHukqfawj1ThMoMn0iSu3ws/v6R0LdUCDsFVAdKtNIwNHHGwLWD00BefMGuGgqqyi2J6KS+nS2cuT1JYbOus7KykUv1myirUxs5HXjieFwTDHAru6atv+6PCVxpgisHVsmSY= 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 173444585181297.47162992064193; Tue, 17 Dec 2024 06:30:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYac-0002HM-4I; Tue, 17 Dec 2024 09:30: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 1tNYZN-0000xd-Fq for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:10 -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 1tNYZJ-0004w9-W7 for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:04 -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-582-lzrYoSneN96v5zjZOyb5jg-1; Tue, 17 Dec 2024 09:28:58 -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 8A1781955E9D; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.27]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 487EF1955F41; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0A25B21E6698; Tue, 17 Dec 2024 15:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734445740; 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=rGnPqYnVB92EV7EXj5JzVc7YMdWCsFD7SGGXuGweevk=; b=cf0qorDg/bk2ryDXAX6ejaU+wVG+WitemxrIaxeUhOLsdBvtjSEI0Ku8zef7a3zW2voUNT 8xjTkTtJ3z3JmLNGGQDsnT5/F99oqRqq4zAmH9Wup6bDdRVLRHC3NIkUexvaGEx/6gxzPt zNDsP8amsPsIXFyfky3OdRgrUqdwiTI= X-MC-Unique: lzrYoSneN96v5zjZOyb5jg-1 X-Mimecast-MFC-AGG-ID: lzrYoSneN96v5zjZOyb5jg From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH 1/6] qdev: Delete unused qdev_prop_enum Date: Tue, 17 Dec 2024 15:28:49 +0100 Message-ID: <20241217142855.3805068-2-armbru@redhat.com> In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com> References: <20241217142855.3805068-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.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1.116, 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: 1734445853236116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- 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 26ebd23068..1e7ae2e01a 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 315196bd85..cfd8abb2f9 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(Property *prop) --=20 2.47.0 From nobody Wed Apr 9 01:13:39 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=1734445818; cv=none; d=zohomail.com; s=zohoarc; b=k9x6P1WbgxzIJ3ARSyNUa7zcpo/OntsjHvIabzcSlL50ka7r96Mz0jkbYFVLEaAO/LraVk4K3zB5kif6Ald9TjD6VRf6I25UUlGWXHFw0QfOa1TeIe8Oqj8Y7F5GJA0tiqcJILmXF5VVk8F/7IEkJrCRZOfdRFe+3VhUHrJdUZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734445818; 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=FPzOHjVETNGAqdsG7EQpmY5dkKRFCfWVL5M7/yQ1yDY=; b=Vdfe3876XhfVc0OohCwJONo0bbNYIkESnSN9yTYJ396kzZaApxhw6qUiwUJL42ktYPc1qVI36iGwuKkIQS9TJUW1sTwQhpSrenMT6aezEnialpFgO2rEHO5T8RBxVupzPGJXyiANXKLlx0qK37oFWOXqD2zcwHujcYBiBPNU6FM= 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 1734445818101408.52395722460733; Tue, 17 Dec 2024 06:30:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYaD-0001oz-Pe; Tue, 17 Dec 2024 09:30:00 -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 1tNYZO-0000xg-6b for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:10 -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 1tNYZM-0004wR-4w for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:05 -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-589-WpNrUqLVOnmqvNvAdPjfNQ-1; Tue, 17 Dec 2024 09:28:58 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 9FE7919560A2; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.27]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 60C1D1955F54; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0D2D921E6605; Tue, 17 Dec 2024 15:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734445742; 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=FPzOHjVETNGAqdsG7EQpmY5dkKRFCfWVL5M7/yQ1yDY=; b=cuNz9yVuRO175sODtCi2LMfvyL4Nw4HIhAK5MeOZNhT7fnd1tgNYFDWkEah2Ge3vCRopn9 0YCmzBYa4+b2Bbo3qfHcxgJmXpOIw6/LQss+Hnl64Tv7BSWwKMIq20wa7kwFOtS0LZ3zLl DVfzFyZNxxFycCqVx2+UWSGNyrnkVHA= X-MC-Unique: WpNrUqLVOnmqvNvAdPjfNQ-1 X-Mimecast-MFC-AGG-ID: WpNrUqLVOnmqvNvAdPjfNQ From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH 2/6] qdev: Change qdev_prop_pci_devfn member @name from "int32" to "str" Date: Tue, 17 Dec 2024 15:28:50 +0100 Message-ID: <20241217142855.3805068-3-armbru@redhat.com> In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com> References: <20241217142855.3805068-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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1.116, 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: 1734445819078116600 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 --- 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 22ea1ed358..3177678861 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, 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.47.0 From nobody Wed Apr 9 01:13:39 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=1734445770; cv=none; d=zohomail.com; s=zohoarc; b=XY39CbASiD9FqMwtHTdmgSAC1Th4FaytL/tAjAolZoKerI+w+uMPzmhRzz9gUtSYumUfCWMD4yHYLDgn/foCuoATLbxI/zCewMlggMIPJD8HmfBGr06nGEfRNRI39h4BFAzASPL5UB6Q/pBEXB6OYkjOQnh3+Xv0MEw0qUZUfwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734445770; 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=dvzZP7QmtJuluCF9JaneWnfZ4YDe/Y5SkuUa8w/tnME=; b=duavod7KdlDv4+JslYM+2X8ggy2j1B6S+nJUDyUe3nPZlBHLraVBU4yPNpnOXSTb7hEvtYtQ9vsyy4fiRi7CgflglHQZmu1l2oGyuPnEkPiJqyUTqQXMImDboLz+tn3AyXDyLMfB/6pqZoSBNHkTHjIAcNWclbdWdVs7BRP3HYI= 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 1734445770442224.92945571460803; Tue, 17 Dec 2024 06:29:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYZg-00017V-N0; Tue, 17 Dec 2024 09:29:25 -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 1tNYZM-0000vj-M1 for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:07 -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 1tNYZJ-0004w2-Ka for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:04 -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-480-_zaxj_DqOSawzgr3-0zgrw-1; Tue, 17 Dec 2024 09:28:58 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D851719560BE; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.27]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5D8121955F57; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1074321E6609; Tue, 17 Dec 2024 15:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734445740; 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=dvzZP7QmtJuluCF9JaneWnfZ4YDe/Y5SkuUa8w/tnME=; b=HW7Bt8ssnaiCushdg30QMvO0BXEe6pHIPy/o1wC+FMAn+VRTlYwJihBsfKUtgA2gpRd+th 6aXEJJOg31Zr6ZBbq9Gzk5/2+f1DUHR6FK0SvHAk1cvxLPpYj+TBpvzacTklkyarHYzJS/ YAjvywsN1fB28aY98HFgvyRRC64JI/g= X-MC-Unique: _zaxj_DqOSawzgr3-0zgrw-1 X-Mimecast-MFC-AGG-ID: _zaxj_DqOSawzgr3-0zgrw From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH 3/6] qdev: Rename PropertyInfo member @name to @type Date: Tue, 17 Dec 2024 15:28:51 +0100 Message-ID: <20241217142855.3805068-4-armbru@redhat.com> In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com> References: <20241217142855.3805068-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.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1.116, 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: 1734445771060116600 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 --- include/hw/qdev-properties.h | 2 +- backends/tpm/tpm_util.c | 2 +- hw/block/xen-block.c | 2 +- hw/core/qdev-properties-system.c | 48 ++++++++++++++++---------------- 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 +- 16 files changed, 70 insertions(+), 70 deletions(-) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 1e7ae2e01a..1a2d34691a 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 cf138551df..07db518f77 100644 --- a/backends/tpm/tpm_util.c +++ b/backends/tpm/tpm_util.c @@ -75,7 +75,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 aed1d5c330..1303c9dcc9 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -660,7 +660,7 @@ invalid: * https://xenbits.xen.org/docs/unstable/man/xen-vbd-interface.7.html */ 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 3177678861..b66e6f5c96 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, 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, diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index cfd8abb2f9..67b17848b8 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, @@ -940,7 +940,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, @@ -958,7 +958,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 @@ -969,7 +969,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, @@ -996,7 +996,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 86905479b8..f989afd325 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 829832bd9f..6097a8b297 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 1bc58e90ad..89013ae05f 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 f7b849f7de..47be998d59 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 1416ae202c..d436376f00 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -76,7 +76,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 30f2fb486f..5e789e6637 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 b2d5327dbf..7c6fc4e56f 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 40b2567aa7..0bf01140b3 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1473,7 +1473,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 d37f722cce..675184648a 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1525,7 +1525,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 f219f0c3b5..b325fe9ca8 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1680,7 +1680,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, }; @@ -1721,7 +1721,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, }; @@ -1752,7 +1752,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, }; @@ -1783,7 +1783,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, }; @@ -1857,7 +1857,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, }; @@ -1888,7 +1888,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, }; @@ -1928,7 +1928,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, }; @@ -1968,7 +1968,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, }; @@ -2003,7 +2003,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, }; @@ -2038,7 +2038,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, }; @@ -2073,7 +2073,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, }; @@ -2108,7 +2108,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, }; @@ -2143,7 +2143,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, }; @@ -2199,7 +2199,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 dd7af86de7..c3572b8a57 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -869,7 +869,7 @@ static void sparc_set_nwindows(Object *obj, Visitor *v,= const char *name, } =20 static PropertyInfo qdev_prop_nwindows =3D { - .name =3D "int", + .type =3D "int", .get =3D sparc_get_nwindows, .set =3D sparc_set_nwindows, }; --=20 2.47.0 From nobody Wed Apr 9 01:13:39 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=1734445790; cv=none; d=zohomail.com; s=zohoarc; b=AyWBYs6GaEVU5Wwp4We5ATcFoVNoa8RBDLpFLWB7l5LsNjVVX70RSTAuI5VN+ztV9v0RJxOMxLvZz+pVHC2JwPlAzSrdWRBYVdhQ9a6pw25Me4MZUru1gWb8z4B6l47kRBlqAbJTCbeBWAdJcAs5BmnACNnzQ7G17B95EPcGDsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734445790; 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=wk+5YCsyi76ZWWkuqCL0C8b0IiSrAQYKN9gEOhNTkLU=; b=M6dKBEsBaq3Emh0HM4gu1q9/oa4s5x61ctqt0E/phcBjAf5FiOarSpqKhcotI/j3C3Q2N2SBpWKLjBGCqm3fAja4RbzCOcgUp5TAqUXQ2BAaiIYPlAAuEaw4YmVcI6iNCA7hHFcC+HfO2gQRF8SOBxqkzIg+VMfvjqwELx/VxoE= 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 1734445790891531.8149180165547; Tue, 17 Dec 2024 06:29:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYZs-0001PB-El; Tue, 17 Dec 2024 09:29:38 -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 1tNYZM-0000vi-0T for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:07 -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 1tNYZJ-0004w4-Ld for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:03 -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-586-OGtRjC-qObC_cTACaBSm4A-1; Tue, 17 Dec 2024 09:28:58 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D329219560A3; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.27]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5B9081956053; Tue, 17 Dec 2024 14:28:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1383421E660A; Tue, 17 Dec 2024 15:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734445740; 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=wk+5YCsyi76ZWWkuqCL0C8b0IiSrAQYKN9gEOhNTkLU=; b=B6nloJjkuW9+ffaVTKD9IHdiKWDi4WDJQ9qjnDtpgZvHxryrqzT3uAseO20kYsmyFvGhGU minCzVrME5w2Elvxeb0aqPSe0x5VSFYvTcsDq2CjT4WqiIUD7BzZ76QAI1fYVLeGiEbpTl TFGLzFAWyQN/RS2IJZ9k3S9tC1LwAtc= X-MC-Unique: OGtRjC-qObC_cTACaBSm4A-1 X-Mimecast-MFC-AGG-ID: OGtRjC-qObC_cTACaBSm4A From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH 4/6] qdev: Change values of PropertyInfo member @type to be QAPI types Date: Tue, 17 Dec 2024 15:28:52 +0100 Message-ID: <20241217142855.3805068-5-armbru@redhat.com> In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com> References: <20241217142855.3805068-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.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1.116, 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: 1734445793108116600 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 --- 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 b66e6f5c96..bd6ea9673d 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 f989afd325..f3c09fedbd 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 5e789e6637..ecf735e9fe 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 0bf01140b3..28534436bb 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -1473,7 +1473,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 675184648a..0d2e59828b 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1525,7 +1525,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 b325fe9ca8..5a1f5b3f3d 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1680,7 +1680,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, }; @@ -1721,7 +1722,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, }; @@ -1752,7 +1754,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, }; @@ -1783,7 +1786,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, }; @@ -1857,7 +1861,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, }; @@ -1888,7 +1894,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, }; @@ -1928,7 +1936,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, }; @@ -1968,7 +1977,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, }; @@ -2003,7 +2013,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, }; @@ -2038,7 +2049,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, }; @@ -2073,7 +2085,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, }; @@ -2108,7 +2121,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, }; @@ -2143,7 +2157,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, }; @@ -2199,7 +2214,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.47.0 From nobody Wed Apr 9 01:13:39 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=1734445853; cv=none; d=zohomail.com; s=zohoarc; b=kwKPS6KCMO0iMwSSw7uVzn0h8mn90hdsUC7pKJSqDKfdRtkHzoU8AbqiCbhWqqELGy8wi1JAWcMsq2p48Cdu4EPrOvbku4WnwDxx103oJhBjDp1gU2pZL8s8i2tEtfyRNsDpXwzlDTs/j5u9TBA6Qs8WUBYcmjdF0+yn95qTSiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734445853; 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=6SqltVUWNc6UgRkUvEyjQbL5CA7fkjtW7Wbr++SLBQk=; b=WiNQg6Nsjv7rhWeYxkKQW9nCIw0vmVv4/HhsE4ilHQ9zZIw1sms7p41rZxdddzA0wsui8BNZt/O8FIVMSkMn4klBOZ0wn4vS+rCTdHNxbzasPSl4v/O5NsvPpKLGBFwvaz74rHC4iDbZf89c1WjqkALPAUjnuQEgegysK24qsGE= 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 1734445853325472.97136483990494; Tue, 17 Dec 2024 06:30:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYag-0002gV-VD; Tue, 17 Dec 2024 09:30:27 -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 1tNYZU-00011S-KW for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:15 -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 1tNYZM-0004wq-P1 for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:10 -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-637-mnlxul7lP9GIfrE2gJfNTw-1; Tue, 17 Dec 2024 09:29:01 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 3FF591955EA3; Tue, 17 Dec 2024 14:29:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.27]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F41DE19560AD; Tue, 17 Dec 2024 14:28:59 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 1688F21E6613; Tue, 17 Dec 2024 15:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734445744; 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=6SqltVUWNc6UgRkUvEyjQbL5CA7fkjtW7Wbr++SLBQk=; b=aZwWInuK9TZu+AHd4/9xTN7GkuPpPfsNI1scNz8A19NXMCVuqcg8jMMVY7qpGswaK4lRXp PJUHjV2JDgWUvyjV53q/Q7oe8Z0KT6N48Hm4VOGJIv1FXcnmqA3BAJkrK7jowRXuZVDPli M1wqCNVhCkHv4BwGIsLN2wHcPi5w6RY= X-MC-Unique: mnlxul7lP9GIfrE2gJfNTw-1 X-Mimecast-MFC-AGG-ID: mnlxul7lP9GIfrE2gJfNTw From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH 5/6] qdev: Improve PropertyInfo member @description for enum properties Date: Tue, 17 Dec 2024 15:28:53 +0100 Message-ID: <20241217142855.3805068-6-armbru@redhat.com> In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com> References: <20241217142855.3805068-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1.116, 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: 1734445855207116600 Content-Type: text/plain; charset="utf-8" Consistently use format "DESCRIPTION (VALUE/VALUE...)". Signed-off-by: Markus Armbruster --- 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 bd6ea9673d..9d1f358263 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.47.0 From nobody Wed Apr 9 01:13:39 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=1734445826; cv=none; d=zohomail.com; s=zohoarc; b=UZv/UDcr0IVaJRd1k8KKOGPP52P/6IRPFzGUNBA+AjCwRWe0L9w5AG+38a7cxq1WqqTU2/Z2ijW3zTp/CEik9sbAXguBm0jcwYZi0IWikmphLjtoIb6Gyfcj0oJ/J7c3Tb9CdoeBVZxNPzHbexEUEwxq/9a/7pmrzT4HvTq2b68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734445826; 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=r4wK3v+/PfbFX1aitYHsoHtsQk/8x2gQh7RTaACX+R0=; b=i5vjc6459UlrFq3N4r8fNtUsgh42t2nOc+WXe+yGWH7aYqetOeExezV7Or39dj5peaA1hLRxaZ12K5uNLCcXvKrYdItyWhZq0MzobWTEZ7o/fphtvHnJaNyHM2fxi5gW+3R6QfBx13CMOUMG0v1Li/RuVL2bNpAf7KIMWQFhw04= 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 1734445826756522.7102120985081; Tue, 17 Dec 2024 06:30:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNYZo-0001Gy-9x; Tue, 17 Dec 2024 09:29:33 -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 1tNYZN-0000xc-Fo for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:07 -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 1tNYZL-0004wY-8G for qemu-devel@nongnu.org; Tue, 17 Dec 2024 09:29:05 -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-661-gcwfWr0wPiqrNlsqhCpcOQ-1; Tue, 17 Dec 2024 09:29:01 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 41FEC195605A; Tue, 17 Dec 2024 14:29:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.27]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 023FF19560B0; Tue, 17 Dec 2024 14:28:59 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 197B321EC340; Tue, 17 Dec 2024 15:28:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734445742; 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=r4wK3v+/PfbFX1aitYHsoHtsQk/8x2gQh7RTaACX+R0=; b=MQu+IKpLoD348uepTeoPULsZskUBkczFXBelz7l1oItbZllOUy9e9vSsSV1A6H0h4un4Sx qoH2L07sTNaqmU5mSXiUqFQKp/ubtk77FAyeBTlPWE/MspkWdgoiXQ7CWpxaKeTA8JPN0+ TlpV1VB5thfyd9zrc+fj0mKbmXXzlF8= X-MC-Unique: gcwfWr0wPiqrNlsqhCpcOQ-1 X-Mimecast-MFC-AGG-ID: gcwfWr0wPiqrNlsqhCpcOQ From: Markus Armbruster To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, berrange@redhat.com, eduardo@habkost.net Subject: [PATCH 6/6] qdev: Improve a few more PropertyInfo @description members Date: Tue, 17 Dec 2024 15:28:54 +0100 Message-ID: <20241217142855.3805068-7-armbru@redhat.com> In-Reply-To: <20241217142855.3805068-1-armbru@redhat.com> References: <20241217142855.3805068-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-1.116, 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: 1734445827129116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster --- 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 1303c9dcc9..722e8723f5 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -661,7 +661,7 @@ invalid: */ 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 9d1f358263..986123d188 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 67b17848b8..02f9b0850a 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 ecf735e9fe..ae66d846b3 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 c3572b8a57..7d2833b2b2 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -870,6 +870,7 @@ static void sparc_set_nwindows(Object *obj, Visitor *v,= const char *name, =20 static 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.47.0