From nobody Tue Feb 10 17:34:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1634291628474878.8185732955696; Fri, 15 Oct 2021 02:53:48 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-360-KvBHH3aRPFewB527wqHCTw-1; Fri, 15 Oct 2021 05:53:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3FAE80292B; Fri, 15 Oct 2021 09:53:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1E1668D7D; Fri, 15 Oct 2021 09:53:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8AF0D4EA30; Fri, 15 Oct 2021 09:53:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19F9nonO000650 for ; Fri, 15 Oct 2021 05:49:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 11279C77F8; Fri, 15 Oct 2021 09:49:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08AAFC77F5 for ; Fri, 15 Oct 2021 09:49:48 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E5B20811E78 for ; Fri, 15 Oct 2021 09:49:47 +0000 (UTC) Received: from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp [183.79.94.94]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275-7JGdIY8lOhuzBw2imiorug-1; Fri, 15 Oct 2021 05:49:45 -0400 Received: from JPN01-OS2-obe.outbound.protection.outlook.com (mail-os2jpn01lp2055.outbound.protection.outlook.com [104.47.92.55]) by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 24A3E19FB188 for ; Fri, 15 Oct 2021 18:49:42 +0900 (JST) Received: from TYCPR01MB7919.jpnprd01.prod.outlook.com (2603:1096:400:186::10) by TYCPR01MB8176.jpnprd01.prod.outlook.com (2603:1096:400:105::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.14; Fri, 15 Oct 2021 09:49:41 +0000 Received: from TYCPR01MB7919.jpnprd01.prod.outlook.com ([fe80::e075:693b:905:bb22]) by TYCPR01MB7919.jpnprd01.prod.outlook.com ([fe80::e075:693b:905:bb22%9]) with mapi id 15.20.4608.017; Fri, 15 Oct 2021 09:49:41 +0000 Received: from R-SUR-LBA-2603.yahoo.co.jp (211.14.8.148) by TY2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:404:56::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Fri, 15 Oct 2021 09:49:41 +0000 X-MC-Unique: KvBHH3aRPFewB527wqHCTw-1 X-MC-Unique: 7JGdIY8lOhuzBw2imiorug-1 From: Hiroki Narukawa To: libvir-list@redhat.com Subject: [PATCH 2/4] qemu_driver: add required capabilities to qemuDomainGetStatsWorkers Date: Fri, 15 Oct 2021 18:49:18 +0900 Message-Id: <20211015094920.3658-3-hnarukaw@yahoo-corp.jp> In-Reply-To: <20211015094920.3658-1-hnarukaw@yahoo-corp.jp> References: <20211015094920.3658-1-hnarukaw@yahoo-corp.jp> X-ClientProxiedBy: TY2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:404:56::30) To TYCPR01MB7919.jpnprd01.prod.outlook.com (2603:1096:400:186::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3371fe8c-1a42-44f1-2d49-08d98fc11c35 X-MS-TrafficTypeDiagnostic: TYCPR01MB8176: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: k3/lmK8vJ+W/LaJbp7t8VUubgqjh44wpETVRUmxHX8uFAgjt+sgv/4Rt9vlhYTaN9xIwPUqt8g2jWDCki/+lJek60FLavtCCLb/z33Uzwde66lAVNDSpAkhW/D0l/UZnokIN822jTcLBj11iKUd/SIBMOFJWWpeULNfbW/13g948/ACxrAWAr9kEe7YhIjyF9haxfIg0D8ZH3YgCPK/utbnO+VJFiux2yfTp8WVlmnMBOOOXD/ZsYmHdKVtLWuwdRi1e8OwcgAGGC/Tb732V4awjnMwczi35jHwUoCZGu7tt0QXAwji+stksJknBkuIL+xngNCqcmGHQseJFMwkMqpNQrebR/gPa9EUhVvvC6PfnYem/5O7OvLFCJZo/R2tnDOso+oVk6mDcpxOcc9hFCVj/F1RDPfZ2ClnoXaTvu84s8yVevX7yVVfkXXpWC3zs8iO1Zsu01CNeOq09qQYb/FjTs7kpbiSEXQIdY5qy6BVwkjPyaygalcrwG2DcG4slDglubbPMCdx8xMQKcJy20kVEXMVcmQ5rHTBVRQ3KGj/mW8aoeeGlOKxDu1yk4oyUXn2cC7LmudcMs50LJFAeUwDdkCNlGVVasyfWLj0LQHXLAogQsq8nRO45CsP9C8omd6kF4K6rkYj9wur2r/NcCT2x/qPDN5gVqWoVVI/JoCtJhnZKUSDMooynqqF1fY/dstBIPb9ahNhmcq98eYb/ZW6nY1QBXB4BkWV2FWKfcDT6LHXe8EYplte6Gi8/Zbfe60k3o2MdnDbALaOJVOJadA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB7919.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(26005)(83380400001)(6506007)(6486002)(6512007)(107886003)(52116002)(86362001)(8936002)(36756003)(5660300002)(186003)(4326008)(1076003)(508600001)(956004)(6666004)(38350700002)(66556008)(38100700002)(66476007)(8676002)(2906002)(66946007)(82960400001)(316002)(6916009)(2616005)(145543001)(145603002); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Uq3Dc/loCuXN0vCMwPqVUswTyurF9BpUc5theMGGTjr8MTcKpyN3RqUepX+g?= =?us-ascii?Q?CNbHJmyDD1AUuxNnrifpeho9e0iHK6yDPkYNJq9iLqZY8UnAkLa3cOO5MVcQ?= =?us-ascii?Q?AjqxCvaj+lqzx3TviTp/CK8isKkCBvaqoCmW/iBSO9DzKbDEJInwFyqwUitn?= =?us-ascii?Q?/+1dvINTwqg5plGH6M9FWuezxS6yDwdsaVKItSIAbbInmZ4NA2fv4S6FTdC9?= =?us-ascii?Q?Xd/sNpCfKOt2mnN3pnHCZUe4BeKNT1KbV1GCAAtS0RR7XYzxW1G3xq6pzqy/?= =?us-ascii?Q?76WRQouCKO9XUhtDg9SqkoFdHyuxWAAGyuWWRXaNyCON6bLpNvBIgFK1fLgn?= =?us-ascii?Q?nQbiQHCc4joEt4TF4IUT9M9VibMa3eG3O+K67KXVym4IiTScp9AVmv2sNRSZ?= =?us-ascii?Q?aQQwgzPv9lShseCLk3JbpqZhrSRUy+MwcmXzOq9/ZTR489BXYdEWMQUGQDOk?= =?us-ascii?Q?teFCieYzjtSCeaNOW8e3sdZRRfC15qiu6J5DR5WG2AfvpSwSiUPT+IwVdw2U?= =?us-ascii?Q?rcKbIS4tdj+6XaUpbPWJYU1YoX2r2qIgtHNY3acqvM2+bMoDmGeo9LqfioVJ?= =?us-ascii?Q?r2REXNK7vhUXjwY7KXZ+sYMUJblG+gEJrQPfQbdoRIQI6x9A09672AiWCdMX?= =?us-ascii?Q?JnE6YZWzosSbLJzOpSU+XO19E3L67KVq7nZvkE+v3Mb71UNN7QnFcSnWP6EI?= =?us-ascii?Q?yM3pqinsWDGiouuamhLYP67Bb+a3faYj3d3UDVhIA1CsdQHURJfxwxTdsmWs?= =?us-ascii?Q?if2/xZrZTzdD467Xv7MgjMXdUP2/e/bDfU1p/oXDtqVyKolkF+c3W1Y3D6D7?= =?us-ascii?Q?m8lVSeUwhqPzWIMUnrggdg5z1K0Ph1fqN+bYOwjyKPPdZf3CFQcsTr3sb4pg?= =?us-ascii?Q?5aEHtu+X5DqfTJxqWWuLPODyzMnMG/hNWetzT/nm+zhQEViCsiAoVayr7uah?= =?us-ascii?Q?f4tIszCNiqJXdDa4VBuIwBKLUJEVgOzmt6+slFTKhupP3NvOGH3ygOrRpCo6?= =?us-ascii?Q?NF1PINwzTSJvQL8NIlWnmVIPfANPUNNwJP2Bf06cAkJ5PIIrAKX1MOFyIiZc?= =?us-ascii?Q?TR95eg6PGxhdI86Wdh+XPOubC5zNJjEXRn/jxgVkPp7U7hpSIdVGH9wDNVpu?= =?us-ascii?Q?3JzLRbjjbAsdrWNR0SnSJkj8wVRrztocizqlaR1ZAdx1eydsF58L4ujkUaya?= =?us-ascii?Q?B7cRuScl68LwdzZSXih+SaVZ8p81CrBxkXEIUiL0IXep3dok/teOdOE3Muwd?= =?us-ascii?Q?yeUqS8+pJ4aIiHTaDAQRGkvEYHo2n6IbKm6b+XC0kIhehGUk0gEiOTLXlT6c?= =?us-ascii?Q?LLiE7iFNOpMoy7vmS7FRcvft?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 3371fe8c-1a42-44f1-2d49-08d98fc11c35 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB7919.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2021 09:49:41.5657 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ACe2mxD5tkpOcXyNohhaNHFSUqplpxjCm5GIPXLJVMO7c8uD/6Vv11yQRNRzkZ5KScuAYQB/lfyjqS2jFi2ZkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8176 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: aoiwa@yahoo-corp.jp, Hiroki Narukawa X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-ZM-MESSAGEID: 1634291628856100001 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" One of qemuDomainGetStatsWorkers requires capabilities to run. This commit adds capability information to qemuDomainGetStatsWorkers. Signed-off-by: Hiroki Narukawa --- src/qemu/qemu_driver.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2b759f5719..ac5eaf139e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18685,20 +18685,30 @@ struct qemuDomainGetStatsWorker { qemuDomainGetStatsFunc func; unsigned int stats; bool monitor; + virQEMUCapsFlags* requiredCaps; +}; + +static virQEMUCapsFlags noCapsRequired[] =3D { + QEMU_CAPS_LAST, +}; + +static virQEMUCapsFlags queryDirtyRateRequired[] =3D { + QEMU_CAPS_QUERY_DIRTY_RATE, + QEMU_CAPS_LAST, }; =20 static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] =3D { - { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false }, - { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false }, - { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true }, - { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true }, - { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false }, - { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true }, - { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false }, - { qemuDomainGetStatsIOThread, VIR_DOMAIN_STATS_IOTHREAD, true }, - { qemuDomainGetStatsMemory, VIR_DOMAIN_STATS_MEMORY, false }, - { qemuDomainGetStatsDirtyRate, VIR_DOMAIN_STATS_DIRTYRATE, true }, - { NULL, 0, false } + { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false, noCapsRequir= ed }, + { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false, noCapsRequ= ired }, + { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true, noCapsReq= uired }, + { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true, noCapsRequired = }, + { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false, noCa= psRequired }, + { qemuDomainGetStatsBlock, VIR_DOMAIN_STATS_BLOCK, true, noCapsRequire= d }, + { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false, noCapsRequired= }, + { qemuDomainGetStatsIOThread, VIR_DOMAIN_STATS_IOTHREAD, true, noCapsR= equired }, + { qemuDomainGetStatsMemory, VIR_DOMAIN_STATS_MEMORY, false, noCapsRequ= ired }, + { qemuDomainGetStatsDirtyRate, VIR_DOMAIN_STATS_DIRTYRATE, true, query= DirtyRateRequired }, + { NULL, 0, false, NULL } }; =20 =20 --=20 2.17.1