From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896207; cv=none; d=zohomail.com; s=zohoarc; b=Tm/Msx/9KxVZvsZLuZk2ntKi4Uhr+VdZkUdCe+L0OP81ZRJB9sx+CHhWpNFK1tv/d5UjKz4MPSVeSxJA42ic/OJoFoccXb+62mQhEfdbplWVyMmSiU5a5OFEevzhVecCF8w/0vLOPnYKYtekQVKJd0eZJwqFlUwwf2A8KpnCqXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896207; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9bvxGgZQZOg+LPaREJD3OBslylDyfBa6jW22AeFKPxw=; b=J34Liu5ivauY2ReZFwb9fMcOnvLfXp5bP5BJ5+n6E/TVlaBTrrJ6XXAj3lw4/Z1l8s5MLqGtJTZx3d934w9whXkx+e8veEO+sZneqJOtm8kzTe8Gi35yCzkoOaEinJcBKb8gD3pf67JfALTAbNjI4X91DdeAmIo3txYmkq/AQy0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 16678962074884.467080607470848; Tue, 8 Nov 2022 00:30:07 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-270-IPTbWZ6TN3W9ynt-v8htQg-1; Tue, 08 Nov 2022 03:29:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0B7271C07832; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA58140C94CF; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7968E1946588; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 603C01946587 for ; Tue, 8 Nov 2022 08:29:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 52EA210197; Tue, 8 Nov 2022 08:29:53 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBD5A4EA48 for ; Tue, 8 Nov 2022 08:29:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896206; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9bvxGgZQZOg+LPaREJD3OBslylDyfBa6jW22AeFKPxw=; b=dHT39OngfqTMe1kJJf6njMqHYAoTWEOvZfSdTALGD9k4SBo5pz/tUPiUwcxOoDRb0XIaHo xb8ZB2vwfqxqyiPxrEEIVJNFoZhCYqgGwfhlRwv/WgRGtsFR06MK71X88bdhtVM6DsQLC/ HdyvXXI4ERig0UHNZX7Z3YZhLZZ8tYA= X-MC-Unique: IPTbWZ6TN3W9ynt-v8htQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 01/48] qemu: Drop misleading comment for qemuDomainQueryWakeupSuspendSupport() Date: Tue, 8 Nov 2022 09:29:03 +0100 Message-Id: <59d1d147492ea6f6cc8e9c2dd11baa50cd8328f7.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896208917100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The was an attempt to document the retvals for qemuDomainQueryWakeupSuspendSupport(). However, it's misleading because in reality, the function can return nothing but 0 or -1, but the comment implies retval of 1 too. Since the set of possible return values complies with our unwritten rule (0 for success, -1 for error), there's no real value in having the comment and as such can be dropped. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 59a3b37b98..7c8fc8949c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16313,7 +16313,6 @@ qemuDomainProbeQMPCurrentMachine(virDomainObj *vm, } =20 =20 -/* returns -1 on error, or if query is not supported, 0 if query was succe= ssful */ static int qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, bool *wakeupSupported) --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896202; cv=none; d=zohomail.com; s=zohoarc; b=mGZPXLHLMaMHbzQxZBQqVGhF2jnKU/dXVWVth3Lsts6U/8McPJbetHo8BbIJ2tdxFeaKNY92P+0Xb2xiU1tJxN1+nZ/3aJK8Urs8q1Ub3djtXP/F23N5hKC+hSKvWEIP7iZaYxgGbLdwr1/mmG8qQFhzBiaCl6EBJ+SPAnn/EfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896202; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f29AjpH67l+blYw74Ypsir4EBx0RxWzfVC6Zulpv4CM=; b=WHwST66sjd8kf+Yf2Gru1FssqymOZtNPm25Aev8ae3fQ8X3koKQKPkF67CO4J98PD2d0nj4MzlQAexQ6GhO3pJseJpuClDATqDsgEYaj/CZx7F/UWrA8Ryf5eeYiaxQQq5U7qOtGPtMSEAgFIsVEinzMi81WY95tnSpFu44upNU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896202217413.12948943264655; Tue, 8 Nov 2022 00:30:02 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-592-D2FEiwynN5SGna_ZPhO8oA-1; Tue, 08 Nov 2022 03:29:58 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EEB7857F92; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BBCD40C83BA; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DFBE319465B1; Tue, 8 Nov 2022 08:29:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D78E1946587 for ; Tue, 8 Nov 2022 08:29:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E6AF335429; Tue, 8 Nov 2022 08:29:53 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BB5A10197 for ; Tue, 8 Nov 2022 08:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896201; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=f29AjpH67l+blYw74Ypsir4EBx0RxWzfVC6Zulpv4CM=; b=czTK2d6QA29U4LyL2HfCWpX17R4cZxtC51yATm0PgMs7GIUG2HWCJwGwd8MLmf9B5vpN62 kFjS6poNwSKN+t7Q5aIQDTHNZOC5HE7atGWqKBYOVFcylhYv38HcWSOXBqfbFSMzWSwR5o YxtLEEcLOsXS4zYvzf+F8CiLhPcm5S8= X-MC-Unique: D2FEiwynN5SGna_ZPhO8oA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 02/48] qemu: Acquire QUERY job in qemuDomainQueryWakeupSuspendSupport() Date: Tue, 8 Nov 2022 09:29:04 +0100 Message-Id: <9a6a7d9d9ba9c12dc9cd4ac32de660d3c19fd6ae.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896202888100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The qemuDomainQueryWakeupSuspendSupport() does not change state of the domain as it just runs 'query-current-machine' QMP command. Therefore, there's no need for it to acquire MODIFY job, QUERY job is perfectly okay. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7c8fc8949c..56b809617a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16323,7 +16323,7 @@ qemuDomainQueryWakeupSuspendSupport(virDomainObj *v= m, if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_CURRENT_MACHINE)) return -1; =20 - if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) return -1; =20 if ((ret =3D virDomainObjCheckActive(vm)) < 0) --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896203; cv=none; d=zohomail.com; s=zohoarc; b=V5tcgw1xj/vXeOxgSivZnYd6wMoO/mEPEb0KpcDn0SGmcLIttsmS8gXdPVfL5wo5N3SAyyZKN697cHr4ddfOwJXllmwKEdTIbURVZChZFVnUETh/1KrgQ8Vuu0YUQvYI8nRwFM/+ZJxq8h/eRvholpP/laggmJQQuK7OQjTDpLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896203; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G8tGMa5xmXysgwVbQX2qt0mi0ZkRk36RdQUYglrTgHU=; b=BSzD8WY5vR8je3hcLwdNUf2TXq8+ojcKodhoImjy0TDhBZ/Zc0CKSWG9+XukoDs9mqh95lA3SWlidzyifTQy76aMC7h7zkJTqXs4iaKBqvC67QjXz7rXmDnUOfV2i0y6g/eFttpSVZzpPG/i71lphu5AMimZfiODkm9taGp0Wqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896203461485.462904777311; Tue, 8 Nov 2022 00:30:03 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-jJe1NsRGOZK8tFbOEKzg7g-1; Tue, 08 Nov 2022 03:30:00 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91FE6833A19; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C46320290A6; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 298BB1946A42; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 946B71946587 for ; Tue, 8 Nov 2022 08:29:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 882D735429; Tue, 8 Nov 2022 08:29:54 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2BAD410197 for ; Tue, 8 Nov 2022 08:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896202; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=G8tGMa5xmXysgwVbQX2qt0mi0ZkRk36RdQUYglrTgHU=; b=eijOTMJfPnXrVac7lDnsDKL7fhjNRv/MUg2uogubOX9Pr7UlaJuxOs5rpzIUtKnSzV9d4C T3BoIIkHDQwLzJ2NLWW/dvt2MpgJLfXVrjyPOR3eYzQ/i/h6HrrSI4W4BzprTBpKdClpp1 G3wcB6Gh4QMLj+/hx/6iqalfSKq98Wk= X-MC-Unique: jJe1NsRGOZK8tFbOEKzg7g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 03/48] tests: Make qemuAgent single sync Date: Tue, 8 Nov 2022 09:29:05 +0100 Message-Id: <27f4f4882107d60cb44b57f67ac8d3bbb5ff8d73.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896204689100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The qemuAgent has option to issue guest-sync command before each intended command or issue the sync commend just once, right after the socked is opened and before the first intended command is issued. The latter is referred to as single sync agent and is enabled by VSERPORT_CHANGED event which allows us to detect when the agent (dis-)connects in the guest. Now, every QEMU that we support (4.2.0 or newer) has the event and thus will use single sync agent. Therefore, adjust qemuagenttest to make it test what's used in the real world, rather than old approach. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- tests/qemuagenttest.c | 50 +++--------------------------------- tests/qemumonitortestutils.c | 2 +- 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index dd2d4984e2..7724df2742 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -56,16 +56,10 @@ testQemuAgentSSHKeys(const void *data) "}}") < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-ssh-add-authorized-keys", "{ \"return\" : {} }") < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-ssh-remove-authorized-keys", "{ \"return\" : {} }") < 0) return -1; @@ -121,9 +115,6 @@ testQemuAgentFSFreeze(const void *data) "{ \"return\" : 5 }") < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-fsfreeze-freeze", "{ \"return\" : 7 }") < 0) return -1; @@ -168,9 +159,6 @@ testQemuAgentFSThaw(const void *data) "{ \"return\" : 5 }") < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-fsfreeze-thaw", "{ \"return\" : 7 }") < 0) return -1; @@ -358,9 +346,6 @@ testQemuAgentGetFSInfo(const void *data) goto cleanup; } =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-get-fsinfo", "{\"error\":" " {\"class\":\"CommandDisabled\"," @@ -404,16 +389,10 @@ testQemuAgentSuspend(const void *data) "{ \"return\" : {} }") < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-suspend-disk", "{ \"return\" : {} }") < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-suspend-hybrid", "{ \"return\" : {} }") < 0) return -1; @@ -505,9 +484,6 @@ testQemuAgentShutdown(const void *data) QEMU_AGENT_SHUTDOWN_HALT) < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - priv.event =3D QEMU_AGENT_EVENT_SHUTDOWN; priv.mode =3D "powerdown"; =20 @@ -520,9 +496,6 @@ testQemuAgentShutdown(const void *data) QEMU_AGENT_SHUTDOWN_POWERDOWN) < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - priv.event =3D QEMU_AGENT_EVENT_RESET; priv.mode =3D "reboot"; =20 @@ -539,9 +512,6 @@ testQemuAgentShutdown(const void *data) /* check negative response, so that we can verify that the agent breaks * out from sleep */ =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-shutdown", "{\"error\":" " {\"class\":\"CommandDisabled\"," @@ -628,9 +598,6 @@ testQemuAgentCPU(const void *data) if (qemuAgentUpdateCPUInfo(2, cpuinfo, nvcpus) < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", "{ \"return\" : 1 }", "vcpus", testQemuAgentCPUArguments1, @@ -641,18 +608,12 @@ testQemuAgentCPU(const void *data) return -1; =20 /* try to hotplug two, second one will fail */ - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", "{ \"return\" : 1 }", "vcpus", testQemuAgentCPUArguments2, NULL) < 0) return -1; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", "{ \"error\" : \"random error\" }", "vcpus", testQemuAgentCPUArguments3, @@ -1171,9 +1132,6 @@ testQemuAgentUsers(const void *data) checkUserInfo(params, nparams, 1, "test2", NULL, 1561739229190) < = 0) goto cleanup; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-get-users", testQemuAgentUsersResponse2) < 0) goto cleanup; @@ -1290,9 +1248,6 @@ testQemuAgentOSInfo(const void *data) nparams =3D 0; maxparams =3D 0; =20 - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-get-osinfo", testQemuAgentOSInfoResponse2) < 0) goto cleanup; @@ -1347,13 +1302,14 @@ testQemuAgentTimezone(const void *data) if (!test) return -1; =20 + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + #define VALIDATE_TIMEZONE(response_, expected_name_, expected_offset_) \ do { \ int maxparams_ =3D 0; \ const char *name_ =3D NULL; \ int offset_; \ - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) \ - goto cleanup; \ if (qemuMonitorTestAddItem(test, "guest-get-timezone", \ response_) < 0) \ goto cleanup; \ diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index db0f450e40..310c19dfde 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1418,7 +1418,7 @@ qemuMonitorTestNewAgent(virDomainXMLOption *xmlopt) &src, virEventThreadGetContext(test->event= Thread), &qemuMonitorTestAgentCallbacks, - false))) + true))) goto error; =20 virObjectLock(test->agent); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896209; cv=none; d=zohomail.com; s=zohoarc; b=BBtye2j2T1EFcLrjd3ZYGWC12pK3srMPHRtOaAeEW9Fa5acs7aUM/r7VUHlpbkTj7Ug4KnT9FPKCyl1T6tZflA7B5Siw1zX7ItW3r+dZWaEicjqTcxnT0+iFPM9TqJJvoGP5GZhBoe5oi7PZN82oWRtBnZU3s/qM/4Ntld2kg2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896209; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+BFC9bxhpnWYke0+4cWx3DajBlXRn+FwhadOJsCIniM=; b=FUyvsWHRXzwAzIzZb7KKfNd9ioxlpzvqaReHrrvmYrjnHxKRrnPkvbC04mVO5ybkPaCUAfyVxlzXXvg9QmXVPey5CusW9iIcvNfzDX4JYKQJhfajTeumLxeG3VYjlhQyQvF9ZhQFYOpvA5h6oCXjc6xEUe0FnI5NmfkVP9hOWdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896209059844.007533438248; Tue, 8 Nov 2022 00:30:09 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-322-re06_sqON065WQzek5j7Hg-1; Tue, 08 Nov 2022 03:30:01 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39A753C0F363; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F988140EBF3; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C8C5F19465B3; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4A84D1946A48 for ; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 27C8235429; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id C02CF10197 for ; Tue, 8 Nov 2022 08:29:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896207; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+BFC9bxhpnWYke0+4cWx3DajBlXRn+FwhadOJsCIniM=; b=KDQIXi/kbb3kPO6507xsGMszNiLFYsgRw3TobMGMh6vLYXbxPXunPsRDZ1D8s7aWggvI8J MwfEpmhe7gZy7KC3iHXG7SkwqDcJ+iRWZiAVDoYtF9f2a9DhBObaaPySfSMq64sgqmN24/ /gXXGGwV5JuVS+8ErpS+mRuOCW1Af+4= X-MC-Unique: re06_sqON065WQzek5j7Hg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 04/48] qemu: Assume QEMU_CAPS_NUMA Date: Tue, 8 Nov 2022 09:29:06 +0100 Message-Id: <69b3010818c68833093db6e539b2b0a1b7d2e601.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896210702100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v3.0.0-rc0~124^2~1 the set-numa-node command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 10 +++------ src/qemu/qemu_validate.c | 21 ------------------- tests/qemuxml2argvdata/cpu-numa-disjoint.err | 1 - .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/numatune-memnode.err | 1 - tests/qemuxml2argvtest.c | 21 +++++++------------ tests/qemuxml2xmltest.c | 12 +++++------ 10 files changed, 21 insertions(+), 53 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.err delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.err diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 09e213e48d..c9a622e75a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4531,16 +4531,12 @@ qemuDomainDefTsegPostParse(virDomainDef *def, * Returns: 0 on success, -1 on error */ int -qemuDomainDefNumaCPUsRectify(virDomainDef *def, virQEMUCaps *qemuCaps) +qemuDomainDefNumaCPUsRectify(virDomainDef *def, + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { unsigned int vcpusMax, numacpus; =20 - /* QEMU_CAPS_NUMA tells us if QEMU is able to handle disjointed - * NUMA CPU ranges. The filling process will create a disjointed - * setup in node0 most of the time. Do not proceed if QEMU - * can't handle it.*/ - if (virDomainNumaGetNodeCount(def->numa) =3D=3D 0 || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) + if (virDomainNumaGetNodeCount(def->numa) =3D=3D 0) return 0; =20 vcpusMax =3D virDomainDefGetVcpusMax(def); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 1192bf1804..78c68a99d0 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -983,27 +983,6 @@ static int qemuValidateDomainDefNuma(const virDomainDef *def, virQEMUCaps *qemuCaps) { - size_t ncells =3D virDomainNumaGetNodeCount(def->numa); - size_t i; - - for (i =3D 0; i < ncells; i++) { - virBitmap *cpumask =3D virDomainNumaGetNodeCpumask(def->numa, i); - - if (cpumask) { - g_autofree char * cpumaskStr =3D NULL; - if (!(cpumaskStr =3D virBitmapFormat(cpumask))) - return -1; - - if (strchr(cpumaskStr, ',') && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disjoint NUMA cpu ranges are not support= ed " - "with this QEMU")); - return -1; - } - } - } - if (virDomainNumaHasHMAT(def->numa)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_HMAT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.err b/tests/qemuxml2a= rgvdata/cpu-numa-disjoint.err deleted file mode 100644 index ff4b1cce2e..0000000000 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: disjoint NUMA cpu ranges are not supported with= this QEMU diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology2.args index 9d8866d914..10952872bf 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -overcommit mem-lock=3Doff \ -smp 20,sockets=3D1,cores=3D8,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node0,share=3Doff,prealloc=3Don,size=3D15032= 385536 \ --numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ +-numa node,nodeid=3D0,cpus=3D0-7,cpus=3D16-19,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node1,share=3Don,prealloc=3Don,size=3D150323= 85536 \ -numa node,nodeid=3D1,cpus=3D8-15,memdev=3Dram-node1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qe= muxml2argvdata/fd-memory-numa-topology2.xml index f6af88a2a8..5b84a49796 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -16,7 +16,7 @@ - + diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/q= emuxml2argvdata/fd-memory-numa-topology3.args index 39ab4e0f2d..e9cb1f0fa5 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -overcommit mem-lock=3Doff \ -smp 32,sockets=3D1,cores=3D24,threads=3D1 \ -object memory-backend-file,id=3Dram-node0,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node0,share=3Don,prealloc=3Don,size=3D150323= 85536 \ --numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-numa node,nodeid=3D0,cpus=3D0-1,cpus=3D6-31,memdev=3Dram-node0 \ -object memory-backend-file,id=3Dram-node1,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node1,share=3Don,prealloc=3Don,size=3D150323= 85536 \ -numa node,nodeid=3D1,cpus=3D2-3,memdev=3Dram-node1 \ -object memory-backend-file,id=3Dram-node2,mem-path=3D/var/lib/libvirt/qem= u/ram/-1-instance-00000092/ram-node2,share=3Doff,prealloc=3Don,size=3D15032= 385536 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qe= muxml2argvdata/fd-memory-numa-topology3.xml index 1bf006c21c..1b8fd7dfee 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -16,7 +16,7 @@ - + diff --git a/tests/qemuxml2argvdata/numatune-memnode.err b/tests/qemuxml2ar= gvdata/numatune-memnode.err deleted file mode 100644 index ff4b1cce2e..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: disjoint NUMA cpu ranges are not supported with= this QEMU diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bf3465ee15..dd2460bc0b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1866,7 +1866,6 @@ mymain(void) ARG_MIGRATE_FROM, "stdio", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, - QEMU_CAPS_NUMA, QEMU_CAPS_LAST, ARG_END); =20 @@ -1904,8 +1903,7 @@ mymain(void) DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3"); - DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa-disjoint"); - DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("cpu-numa-disjoint"); DO_TEST_NOCAPS("cpu-numa-memshared"); DO_TEST("cpu-host-model", QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -1971,19 +1969,16 @@ mymain(void) =20 DO_TEST_NOCAPS("numatune-memory"); DO_TEST_PARSE_ERROR_NOCAPS("numatune-memory-invalid-nodeset"); - DO_TEST("numatune-memnode", - QEMU_CAPS_NUMA); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode"); + DO_TEST_NOCAPS("numatune-memnode"); DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); DO_TEST_CAPS_LATEST("numatune-memnode"); DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); DO_TEST_CAPS_LATEST("numatune-system-memory"); =20 - DO_TEST("numatune-memnode-no-memory", - QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-memnode-no-memory"); =20 - DO_TEST("numatune-distances", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-distances"); DO_TEST_NOCAPS("numatune-no-vcpu"); DO_TEST_CAPS_LATEST("numatune-hmat"); =20 @@ -2632,16 +2627,16 @@ mymain(void) DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode"); DO_TEST_NOCAPS("memory-hotplug"); - DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); - DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUM= A); + DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM); + DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); - DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE= _PC_DIMM, QEMU_CAPS_NUMA, + DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE= _PC_DIMM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_LAST, ARG_END); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm"); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 40763607ba..45e16ce02d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -924,14 +924,14 @@ mymain(void) DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); DO_TEST_NOCAPS("cpu-numa-disordered"); - DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("cpu-numa-disjoint"); DO_TEST_NOCAPS("cpu-numa-memshared"); =20 DO_TEST_NOCAPS("numatune-auto-prefer"); - DO_TEST("numatune-memnode", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-memnode"); DO_TEST_NOCAPS("numatune-memnode-no-memory"); - DO_TEST("numatune-distances", QEMU_CAPS_NUMA); - DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-distances"); + DO_TEST_NOCAPS("numatune-no-vcpu"); DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); =20 @@ -1023,13 +1023,13 @@ mymain(void) /* SVE aarch64 CPU features work on modern QEMU */ DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64"); =20 - DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE= _PC_DIMM, QEMU_CAPS_NUMA, + DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE= _PC_DIMM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", WHEN_BOTH, ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_LAST, ARG_END); DO_TEST_NOCAPS("memory-hotplug"); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896277; cv=none; d=zohomail.com; s=zohoarc; b=edtjhu77SlfB7N2Q9/rPLDvlMJyVJ+sWj+gdZT9apR6Ndyj+jeu5rLM/O7RefOb9DleSlzbNcnwTDDkAE3kNQ6FMwXjzSsUY28DNyRLR0vxj4WOM31lHjTNuGqFdy4rniApKFj5D6/dpJRcpANiOlkNwh/FW/o+1P48O73GDsEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896277; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qVbeVbCYhFwi3X61cpVfV10R0loNWdWMO5EPYZI11g4=; b=RUFHNhMqpNYhjIeY7ke+ZrgbeDw4mggEVo3sgV5pjawoKUq9YFQrS7TXI+wmnRC+ow7lW9CXfkZzs9WGolWFNm+EpP1cAWQLZxZIxMOdVg+SbqH6BkVSC2/HEE4YH5+8Qf5F6NnWyL4C3M4K702QqBb7Sj1ZTLPAaREo42Ib8Xw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896277124339.10326686929534; Tue, 8 Nov 2022 00:31:17 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-226-bgeiU5N8NUeCdh0xBFJpiw-1; Tue, 08 Nov 2022 03:30:15 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DC5B857FAC; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6571210197; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2F91619465B1; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EAF821946597 for ; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DC2914C816; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63EEB35429 for ; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896275; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qVbeVbCYhFwi3X61cpVfV10R0loNWdWMO5EPYZI11g4=; b=GiQQbjTaJBA7CjmweTG3A2jnXPjvw5qhWa44Nah54Gx1Vl1L69pSAHaaruxvvgbP/sXIX8 GeV7duDn5ACEkzSNjE3SSsoZ0LOo7Ryvvz5Ql/euNjJkcp6gzDOfXo1Ik+TQLkY0CBDD2p 013dMffkf/G6sUuJivW0AEhgMHrRtH8= X-MC-Unique: bgeiU5N8NUeCdh0xBFJpiw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 05/48] qemu_capabilities: Stop detecting QEMU_CAPS_NUMA Date: Tue, 8 Nov 2022 09:29:07 +0100 Message-Id: <24d1f114cc030bb652adfee3ae2159f2dbfc5d8c.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896279081100003 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 39c2d38969..db918952ac 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1219,7 +1219,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS }, { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN }, - { "set-numa-node", QEMU_CAPS_NUMA }, { "set-action", QEMU_CAPS_SET_ACTION }, { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE }, { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index a89a77fbde..5db14f0afc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 47529e9c6e..3d12939f0c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -43,7 +43,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 7456516422..72381c8065 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 53b1dda4da..3e4453dfa7 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -57,7 +57,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 9002c29711..64a7ae39c6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -46,7 +46,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 3b0828efd3..6bbf25fc6c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 2db333b322..7d8b64bdae 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -47,7 +47,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 5fbc028142..93b19c9754 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -57,7 +57,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 2ba3ca88a5..01a13aecfc 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -15,7 +15,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 6b2faaf51b..0c04999a94 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -57,7 +57,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index b0b9fff8b8..55e0bf1580 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -45,7 +45,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index d537801191..47fc5d0c13 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -43,7 +43,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index c775410ced..ea05bb23dc 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -46,7 +46,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index a89bf23f48..1f75f00a2e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index b22a8f4efe..22bdb2152a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -56,7 +56,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index cef489646a..acc30efaee 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 3c20758fe0..81f64ce654 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 2a1ede597a..031f7c1e4e 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -55,7 +55,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index c36e457708..781dd9bb6b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -55,7 +55,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index da509b777d..7a4883814f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 88e6957240..7bdd685940 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -43,7 +43,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 16fe1026b5..69ca8b058b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -55,7 +55,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index f6b0c084e4..ff18e057f3 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 0f5b887bcd..04e0a675b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 9eef4f0820..7eb171f433 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -55,7 +55,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 6e3b7e00f3..0c06ed1e16 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 7b92a0b8c8..c8a66bd84a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -55,7 +55,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 01dbf72185..c5f3236c18 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -55,7 +55,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896268; cv=none; d=zohomail.com; s=zohoarc; b=kckxinIqNhUHqDWnMElna32BGdJLwMvO6aJ6Dq2IJeJ8sDgKDVl9dsZX7WG8LrhFfA/Hvi0Qr4VHtlOfLepwoZ9bY6iIXnq5x+b9egwjFE9eof6UgWx6n+11U/EtHm4gFJMgvtGrM69mreZaOFj4r/QrqNGA/lTqQVe+Rn2MrXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896268; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xisnT1597N1cKnyITQ0VWIWC/XudHChASytG+XRpEwc=; b=GIkDf4hDwUvy7TKZMtKsGw2wHAOKtK2OCMSgcdSL9mgCp8giMlBoiVLDLRDZDuO9sqG3Hwy11zkuCr5QM2Rc+NzIrfDsEfhAUbmTto6CtaJxlI+EY0Fy8E5YhgCSXjBLNFnfECCBjCPwRWP8fH2Hl+qSj1papXlAGprVz2szd4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896268731479.50799374781286; Tue, 8 Nov 2022 00:31:08 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-395-cezwrMPFOcSncmOGYnEsgw-1; Tue, 08 Nov 2022 03:30:03 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B8B021871DA1; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A46614B3FC8; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8739219465A3; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87F741946594 for ; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7D2FC4C816; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 209D210197 for ; Tue, 8 Nov 2022 08:29:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896267; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xisnT1597N1cKnyITQ0VWIWC/XudHChASytG+XRpEwc=; b=DBXHWQKuSz5qRe70cYQS5aCKBhDAS2Vqcb7opli8FMTSlVpfoUJCPtMFVwPfIj87Kr9LKH QcYPqxsZKrDhzKwwK7yMTi8pN1OPoZzyI9oedxZN6IbMPOnv7RBUJUxKWQ63wbXaomAn2Q cEKceWucWgfGVoX6EOyQxtpoSwttolQ= X-MC-Unique: cezwrMPFOcSncmOGYnEsgw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 06/48] qemu: Retire QEMU_CAPS_NUMA Date: Tue, 8 Nov 2022 09:29:08 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896269060100010 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index db918952ac..aa771564e3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -301,7 +301,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "active-commit", /* X_QEMU_CAPS_ACTIVE_COMMIT */ "change-backing-file", /* X_QEMU_CAPS_CHANGE_BACKING_FILE */ "memory-backend-ram", /* X_QEMU_CAPS_OBJECT_MEMORY_RAM */ - "numa", /* QEMU_CAPS_NUMA */ + "numa", /* X_QEMU_CAPS_NUMA */ =20 /* 170 */ "memory-backend-file", /* X_QEMU_CAPS_OBJECT_MEMORY_FILE */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0e0034663c..dbfa5cc1d8 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -279,7 +279,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */ X_QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in met= adata */ X_QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */ - QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ + X_QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ =20 /* 170 */ X_QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896266; cv=none; d=zohomail.com; s=zohoarc; b=UhNrFc2I/3Mq0egg2iVOPpi5UEKxPm4Vj/M1inPXLVtY1SKitQfoEbVhrxw2BJgqdXTbL7+ZvmFcJuRp1YI6aAAVwyIpbX3wLkBjohnknPcuy2pZklO1IFsVM7/wYgr1maWN/qY67S/H3gCvCdCoNsRqyYFfOdJYIovqkBGyYBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896266; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fWua9EeqZu5I4aPA6dAvhe8HSvlF2+ic903wwkHHXCw=; b=TGHGoRoqS0P1KF+1DU1JyVDnKJrK8fEIQyMDIK2a4+Ob4/3I7bpuZujoufYlVFSz10S5bDX4B0iqXwEpWE0WYpjwlDBg9//ixpz1cb6OS2E2WT0ty/LTA4xQXkdEku9hGLQmpNaGVGpm93NpXG1CNNnsyZxjqaadF0JvSJTKQro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896266305361.86671251175767; Tue, 8 Nov 2022 00:31:06 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-107-bB3Cwrz0OeSmRkVa9TsyiQ-1; Tue, 08 Nov 2022 03:30:08 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3DEFD3C0F68A; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C4264B3FC6; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F18F91946594; Tue, 8 Nov 2022 08:29:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3A6D819465B3 for ; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2005A4EA47; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B772D4EA4B for ; Tue, 8 Nov 2022 08:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896265; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fWua9EeqZu5I4aPA6dAvhe8HSvlF2+ic903wwkHHXCw=; b=Mvc+qvATbyJ78soor57EhzIvEyP5WuuAYvatdvTS43H79qoTmplE9bBkiVAVH9eZCh4ttD kg+3ixV1r11oB6LAAAuG/1z6RX7zgVXSjrwOyyn0x6twa3dOeFVCtVn03h06v2+uA3lHBS UBceY/PY6BJFCaJr2fAj3l/hrOIhGto= X-MC-Unique: bB3Cwrz0OeSmRkVa9TsyiQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 07/48] qemu: Assume QEMU_CAPS_VSERPORT_CHANGE Date: Tue, 8 Nov 2022 09:29:09 +0100 Message-Id: <31ea2b4b7c018075f162b6e31c8a89e78611e09c.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896267059100006 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.1.0-rc0~18^2~2 the VSERPORT_CHANGE event is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e7f92228f5..7d112f5bae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -214,8 +214,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *v= m) if (priv->agent) return 0; =20 - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE) && - config->state !=3D VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED) { + if (config->state !=3D VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED) { VIR_DEBUG("Deferring connecting to guest agent"); return 0; } @@ -230,7 +229,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *v= m) config->source, virEventThreadGetContext(priv->eventThread), &agentCallbacks, - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPOR= T_CHANGE)); + true); =20 if (!virDomainObjIsActive(vm)) { qemuAgentClose(agent); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896631; cv=none; d=zohomail.com; s=zohoarc; b=OcsQgDfLjAmQEjzp79lbPzr4lAfdswLfzP0Dv3w+tkoyA1Go8vmaZOfIqE7Aotgtq4m3mB/Ir16JCZVHySJz6Z00yhNAvHDo9imlVSy41tCvw+R1DqWJLEHaPLplHzV8FMPmlNZmDidGqbWw4ZB/ag9TlzqenQhPkgOrftUEYFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896631; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lweM/eJVTQKyME/6QTHHB8dD245jN4zQ3By7VovQtG0=; b=EbL1NSUUSv7T5zTrBZ+EFef1ZGXipTq9ggQQpMcyDcDBiGvARoiQOgJjvGZTCxUbxv62CHnZcXC6w6RzQUS4mhY/iptZ5PnfWPIZAS3tNPmn4LGhz4lO0e6UxavPeqv/k8btRLEnWmxWiWZZG75+Nj9aa6jEw59U9P35KlFpPtg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896631160693.8871065415009; Tue, 8 Nov 2022 00:37:11 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-62-gNlnleJtMoqF965tod75qg-1; Tue, 08 Nov 2022 03:30:07 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84594803D48; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70C70C2C8C7; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 417A019465B1; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C00DF1946588 for ; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B48F310197; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58B084EA4A for ; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896630; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=lweM/eJVTQKyME/6QTHHB8dD245jN4zQ3By7VovQtG0=; b=M3cOrZcCYKQQMKJ2lxi06jQWg9zvsL6vyFESEZxqgY7sxiogUr5pE9ogxY/+z+E6cUtZUc +8+7ddrgy72YKp0tdHfWjvh399VNsIn11u0blI6BM0sCd+rpwKV6c1Mu87YcwsUsMTZ/+h yNKL7GoT3ZWvMy1NUfjSp6qk/u0NWLs= X-MC-Unique: gNlnleJtMoqF965tod75qg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 08/48] qemu_agent: Drop @singleSync from _qemuAgent Date: Tue, 8 Nov 2022 09:29:10 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896631835100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Historically, before sending any guest agent command we would send 'guest-sync' command to make guest agent reset its internal state and flush any partially read command (json). This was because there was no event emitted when the agent (dis-)connected. But now that we have the event we can execute the sync command just once - the first time after we've connected. Should agent disconnect in the middle of reading a command, and then connect back again we would get the event and disconnect and connect back again, resulting in the sync command being executed again. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_agent.c | 7 ++----- src/qemu/qemu_agent.h | 3 +-- src/qemu/qemu_process.c | 3 +-- tests/qemumonitortestutils.c | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 94782f2bc9..d420b2b901 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -90,7 +90,6 @@ struct _qemuAgent { GSource *watch; =20 bool running; - bool singleSync; bool inSync; =20 virDomainObj *vm; @@ -587,8 +586,7 @@ qemuAgent * qemuAgentOpen(virDomainObj *vm, const virDomainChrSourceDef *config, GMainContext *context, - qemuAgentCallbacks *cb, - bool singleSync) + qemuAgentCallbacks *cb) { qemuAgent *agent; g_autoptr(GError) gerr =3D NULL; @@ -615,7 +613,6 @@ qemuAgentOpen(virDomainObj *vm, } agent->vm =3D virObjectRef(vm); agent->cb =3D cb; - agent->singleSync =3D singleSync; =20 if (config->type !=3D VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -857,7 +854,7 @@ qemuAgentGuestSync(qemuAgent *agent) int timeout =3D VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; int rc; =20 - if (agent->singleSync && agent->inSync) + if (agent->inSync) return 0; =20 /* if user specified a custom agent timeout that is lower than the diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index c07d8507ba..f98586e8f8 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -38,8 +38,7 @@ struct _qemuAgentCallbacks { qemuAgent *qemuAgentOpen(virDomainObj *vm, const virDomainChrSourceDef *config, GMainContext *context, - qemuAgentCallbacks *cb, - bool singleSync); + qemuAgentCallbacks *cb); =20 void qemuAgentClose(qemuAgent *mon); =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7d112f5bae..48864a92a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -228,8 +228,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *v= m) agent =3D qemuAgentOpen(vm, config->source, virEventThreadGetContext(priv->eventThread), - &agentCallbacks, - true); + &agentCallbacks); =20 if (!virDomainObjIsActive(vm)) { qemuAgentClose(agent); diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 310c19dfde..46791931b0 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1417,8 +1417,7 @@ qemuMonitorTestNewAgent(virDomainXMLOption *xmlopt) if (!(test->agent =3D qemuAgentOpen(test->vm, &src, virEventThreadGetContext(test->event= Thread), - &qemuMonitorTestAgentCallbacks, - true))) + &qemuMonitorTestAgentCallbacks))) goto error; =20 virObjectLock(test->agent); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896389; cv=none; d=zohomail.com; s=zohoarc; b=dGQn9jX1HRqOnGseUcyPwyyK4+cXxcZzPciLnQMeOpSsQjdDOXFFWorUiJqfyemey7lMeDgKtjOvCK8nY2ikn5caTY9eskCxfXvN9hl7FbWJbh5OeTuLc/jrXX3lZ0oRhwdtNqjdQy6LKsVgjAlrnLLGrTKrrEZWVfoGrpBqgho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896389; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5yZb0S3hsnagg8aEc1qEXPfhKAqU6CTSiT3cfC+e7UQ=; b=i/6qu+kWZV/zyVsIC1phTuVHedsey2kwI3x/04LS6C5Lq5GTvPQds5f9YtctHNrBQBAJtkJAlG7sE6ZSUKG/2XvI66K4wFXRm6qoH6VzJUe3/rmeO6l3Y2Tj3Hd8xVwPUZ75txkYCW5N29rU5B71YUUUNo2l1ofvZ07kn2EH80I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896389473592.384465295191; Tue, 8 Nov 2022 00:33:09 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-220-r8hITstHPRmOf0s3Hn4Rhg-1; Tue, 08 Nov 2022 03:30:16 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A167D862FFD; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 867522023A1D; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 56C2B19465B8; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7ECFE1946587 for ; Tue, 8 Nov 2022 08:29:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 553AF35429; Tue, 8 Nov 2022 08:29:58 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDB9C10197 for ; Tue, 8 Nov 2022 08:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896388; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=5yZb0S3hsnagg8aEc1qEXPfhKAqU6CTSiT3cfC+e7UQ=; b=NpSJJSYE0Pb5V92MGRrFr3ap/wyBceIQ4DZB+km2asd0Yf32pjN0LvRUIaJFwH8MItWO6+ Iki1fojBEEjz/m0Oq8AGpeFNZLICRu2oXYoEdgbb47vRYPG2APyaiFN6Nkl07da8olQWg/ tH64eMDlQ8n9QgDm7RGzf1DnZEgT0JA= X-MC-Unique: r8hITstHPRmOf0s3Hn4Rhg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 09/48] qemu_capabilities: Stop detecting QEMU_CAPS_VSERPORT_CHANGE Date: Tue, 8 Nov 2022 09:29:11 +0100 Message-Id: <71ee57e7f0cb074d635fd5058bb4cb8ab7e65329.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896391598100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index aa771564e3..6d5d994594 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1233,7 +1233,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = =3D { =20 /* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */ struct virQEMUCapsStringFlags virQEMUCapsEvents[] =3D { - { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED }, }; =20 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 5db14f0afc..5dae49b184 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -65,7 +65,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 3d12939f0c..5f2f420acc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -61,7 +61,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 72381c8065..ee638dd994 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -34,7 +34,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 3e4453dfa7..d8a44a3cf5 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 64a7ae39c6..8ac3bdb5a4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -67,7 +67,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 6bbf25fc6c..a50ffc27f4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -62,7 +62,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 7d8b64bdae..c0f4c1e872 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -66,7 +66,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 93b19c9754..340e773acc 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 01a13aecfc..9400ea543a 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -17,7 +17,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 0c04999a94..e07e9bfdd3 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 55e0bf1580..e7776bb370 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -66,7 +66,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 47fc5d0c13..821180ea17 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -61,7 +61,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index ea05bb23dc..5543f34b41 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -65,7 +65,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 1f75f00a2e..6a4449a70c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -33,7 +33,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 22bdb2152a..40ab95425b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index acc30efaee..74ff39d36a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -65,7 +65,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 81f64ce654..c56c47e1a2 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -33,7 +33,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 031f7c1e4e..b01ffe84d6 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 781dd9bb6b..6a706201c7 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 7a4883814f..f9667a6d3c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 7bdd685940..c632b7daa4 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -61,7 +61,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 69ca8b058b..4b538787cb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index ff18e057f3..6117b4d840 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 04e0a675b1..dedac9c0df 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -67,7 +67,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 7eb171f433..2f060a1a51 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 0c06ed1e16..b7e8cf44df 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -66,7 +66,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index c8a66bd84a..3cf16a58b0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index c5f3236c18..3a8b677f76 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -79,7 +79,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896683; cv=none; d=zohomail.com; s=zohoarc; b=VTZmbIuqB9VCNb3IEgcpu0K0m8KFWU3TI7WekjGuEpRjArzOGL6q8rteMAjIK0lfYpzAVyoG9Qz/JGVce+FNCJmg4HQPuHPHvosM8M4qdWzi0h1m4Rdg7XlH8q7SeM4ljSuzaukRLK6iVyf44tQ9paWgpKWqqOrVgdBthecI52Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896683; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k7G1gdM8O0hOSWiQGl702wmDIcR88ZR9t2LgbFIvJHE=; b=TG74779i7yFA3toQjMe0T94p1cAMh2T00BDdn+KhuOP3WveFfXcfbwhCcJUoVdG1AmOYryvzBNR2nuxs9GOzA48tVIfttc6aWGYrijAAIwU2+2XosXoGXVYMDv+w8Ki4OyRAow2PvKf+JRhw0uCV5NZYu7eTI86hQ8DJffUiaeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896683603852.350721178952; Tue, 8 Nov 2022 00:38:03 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-605-P538mhf9OgKQsBnKtBUoUg-1; Tue, 08 Nov 2022 03:30:07 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B8CCD185A794; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6A5D4B3FC6; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A3521946588; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 004BB1946595 for ; Tue, 8 Nov 2022 08:29:58 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EA52B35429; Tue, 8 Nov 2022 08:29:58 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E80210197 for ; Tue, 8 Nov 2022 08:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896682; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=k7G1gdM8O0hOSWiQGl702wmDIcR88ZR9t2LgbFIvJHE=; b=AI/BuQDt45fwB/GxsNgmp6NIe6aMN7+HVVo/uCpehNX/2e5E1LBP3/DxkJd0uE6l13XRA2 kd9QhLeASUvnfHifn+XWuuxwTp4U7omemQAoDUz3MJ1FdH1CHCZfH4KFDPXJTt9T+3TQef h1Tpe0w4/VDsPYcoNP5e3lf/+0HZmLE= X-MC-Unique: P538mhf9OgKQsBnKtBUoUg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 10/48] qemu: Retire QEMU_CAPS_VSERPORT_CHANGE Date: Tue, 8 Nov 2022 09:29:12 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896683967100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6d5d994594..17c1e7fefc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -356,7 +356,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */ "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */ "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */ - "vserport-change-event", /* QEMU_CAPS_VSERPORT_CHANGE */ + "vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */ "virtio-balloon-pci.deflate-on-oom", /* QEMU_CAPS_VIRTIO_BAL= LOON_AUTODEFLATE */ =20 /* 210 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index dbfa5cc1d8..884c512265 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -334,7 +334,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=3Don|off */ QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ - QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ + X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,cc= w}. * deflate-on-oom */ =20 --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896218; cv=none; d=zohomail.com; s=zohoarc; b=fZjT5BUiJCTXZkhJeZm+r4txI+bcP6kYCY83Ay9HUcdCmho/YZejH2qBxzk8YSidEEY2xPzsG+/fKR0Ta7lU+a+n5CB35VGQM30lUR+UOypVRj6V47v8qqEYnjdNh9y18tc8iSUV1Ll2uGxWE9Aewl2K2FS9/pUCY/irs0gFPh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896218; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O0l84ABGteLpmeFPQJtuBTJSxFc86WWgl2GswjA7b2g=; b=cwal4f9JUN8oufLNEgK4nvlvkd9mcD9JAasTonABsOVdp5+HYHUqjnSv28uRwsPz7O5GA5v7rd1iJyMTxy7cQ4X4pQ9F3KcCCXx7OFiGtifkI4LnljVunWaFf0m1nNYk6BSIhwfSO1AjD+qkjOohjE1dONTm7O9RmeXOzsWrAnY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896218894261.3192420769868; Tue, 8 Nov 2022 00:30:18 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-523-Bu4C_5svM8egcRGFV1hskQ-1; Tue, 08 Nov 2022 03:30:10 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DA46B2A59562; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C34FE2166B29; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A5CE1946588; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A12319465B7 for ; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8A86810197; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2EA8635429 for ; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896217; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=O0l84ABGteLpmeFPQJtuBTJSxFc86WWgl2GswjA7b2g=; b=WMtL/5Yoj/idi3AU6n86bRm97cWky+oDFMrj5HvUyaU/ES4jsLl7OwvvUGU+vN/F1Oh9Mb ls1lUMb4DxNAI51EmXib1iE6hIpmq1AISR1l8BySy70NLwToRTQFgoAOXpX2RdyDUKM1hs fKj9FdUck7FqKlnQISBBd/EJ9VAKazI= X-MC-Unique: Bu4C_5svM8egcRGFV1hskQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 11/48] qemu: Assume QEMU_CAPS_DUMP_COMPLETED Date: Tue, 8 Nov 2022 09:29:13 +0100 Message-Id: <3804ae8fab914f7273c11821a0ceeb477ccd34fb.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896220870100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.6.0-rc0~74^2~6 the DUMP_COMPLETED event is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 56b809617a..bcdd55b089 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3033,28 +3033,21 @@ qemuDumpToFd(virQEMUDriver *driver, const char *dumpformat) { qemuDomainObjPrivate *priv =3D vm->privateData; - bool detach =3D false; - int ret =3D -1; - - detach =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DUMP_COMPLETED); + int rc =3D -1; =20 if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) = < 0) return -1; =20 - if (detach) { - qemuDomainJobSetStatsType(vm->job->current, - QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP); - } else { - g_clear_pointer(&vm->job->current, virDomainJobDataFree); - } + qemuDomainJobSetStatsType(vm->job->current, + QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP); =20 if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) return -1; =20 if (dumpformat) { - ret =3D qemuMonitorGetDumpGuestMemoryCapability(priv->mon, dumpfor= mat); + rc =3D qemuMonitorGetDumpGuestMemoryCapability(priv->mon, dumpform= at); =20 - if (ret <=3D 0) { + if (rc <=3D 0) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported dumpformat '%s' " "for this QEMU binary"), @@ -3064,16 +3057,13 @@ qemuDumpToFd(virQEMUDriver *driver, } } =20 - ret =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); + rc =3D qemuMonitorDumpToFd(priv->mon, fd, dumpformat, true); =20 qemuDomainObjExitMonitor(vm); - if (ret < 0) + if (rc < 0) return -1; =20 - if (detach) - ret =3D qemuDumpWaitForCompletion(vm); - - return ret; + return qemuDumpWaitForCompletion(vm); } =20 =20 --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896217; cv=none; d=zohomail.com; s=zohoarc; b=HlxdKih+yehGeLWSAxQ4LGv6CrC9qVrEjPIGOxc5kWJMA1wNhi2qiud+tkpECoDUA2KqlAuMeVQI0XINTgidGBVekdUZwYy47VqLg8Halo4hKoHdHAIpIPsdUrP65Fqe675Oy0uzxthOzNNYLjyH6KXElPfZYx/54PNQXJf3Qpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896217; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tGmZ/ez4j/PNl75c8bwzCRJAHardevMLiLy02i1JfB0=; b=Vtj5hpILO83OGg8yiVifyzhOq93Qa6dTADSerCDQJq0WuKMbrtfmgo6g3QPbbONfk1gGjDex4zGdKlCzjW+6PywyireL4WE/xPCzStUMDRpiJfQZGxvIr/23PGz4jBPyfi0++SO/aF6G8KR2swMMI6AEB6NmrejZMWzMnCjGd2I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896217937613.422687182054; Tue, 8 Nov 2022 00:30:17 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-Vc4F4MbbP8u0f7GyTt1nAg-1; Tue, 08 Nov 2022 03:30:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2BF7B86EB60; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15AC240C94D3; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D30A61946595; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 374071946587 for ; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2B46110197; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id C37CB4C819 for ; Tue, 8 Nov 2022 08:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896216; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tGmZ/ez4j/PNl75c8bwzCRJAHardevMLiLy02i1JfB0=; b=Rtj4y+eiiih1q7GGW7W0ryVgLgfEFLUQE+6ijg5AK9gIJtzMkt//cxMQdNZ0ucWiYH9vBH bBmM5cKnLenk/c9QKEcwI+URNOmE8pQM2BwmICLakbd7Izf4TFbC0VIMX1gw/ArwdKZnva xVT9zIZHXe9/whuweFWhMmEO74JVNFQ= X-MC-Unique: Vc4F4MbbP8u0f7GyTt1nAg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 12/48] qemu_capabilities: Stop detecting QEMU_CAPS_DUMP_COMPLETED Date: Tue, 8 Nov 2022 09:29:14 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896218837100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 13 ------------- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 17c1e7fefc..c9e4839829 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1231,11 +1231,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[]= =3D { { "rdma-pin-all", QEMU_CAPS_MIGRATE_RDMA }, }; =20 -/* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */ -struct virQEMUCapsStringFlags virQEMUCapsEvents[] =3D { - { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED }, -}; - struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] =3D { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, @@ -5291,14 +5286,6 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *q= emuCaps, virQEMUCapsSet(qemuCaps, entry->flag); } =20 - /* probe also for basic event support */ - for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsEvents); i++) { - entry =3D virQEMUCapsEvents + i; - - if (virQEMUQAPISchemaPathExists(entry->value, schema)) - virQEMUCapsSet(qemuCaps, entry->flag); - } - return 0; } =20 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 5dae49b184..119d259bb9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 5f2f420acc..ee09c8eacc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -82,7 +82,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index ee638dd994..d46ab3ae73 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index d8a44a3cf5..0e16046efc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -113,7 +113,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 8ac3bdb5a4..e2cd3367ad 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index a50ffc27f4..c58cff3f51 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -84,7 +84,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index c0f4c1e872..4f10008ffe 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -83,7 +83,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 340e773acc..d53b63ad6c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -113,7 +113,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 9400ea543a..15b87106c6 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index e07e9bfdd3..3a758c008f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -112,7 +112,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index e7776bb370..f197f42e6b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 821180ea17..b23662fe31 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -82,7 +82,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 5543f34b41..0b00653aa4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 6a4449a70c..cb4bca34a7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -46,7 +46,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 40ab95425b..7647cc842f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -112,7 +112,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 74ff39d36a..4974ac67b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index c56c47e1a2..8295b69d50 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -46,7 +46,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index b01ffe84d6..a2a77735ba 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -111,7 +111,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 6a706201c7..caca79d93b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index f9667a6d3c..7d71c820b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -93,7 +93,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index c632b7daa4..86f262d727 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -82,7 +82,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 4b538787cb..04a0617883 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 6117b4d840..1d70e827ba 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -93,7 +93,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index dedac9c0df..a2810cb3a8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -88,7 +88,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 2f060a1a51..eef749e7a2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index b7e8cf44df..7dd04c5c90 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 3cf16a58b0..8f45f61f3a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 3a8b677f76..d8c00b3496 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -110,7 +110,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896214; cv=none; d=zohomail.com; s=zohoarc; b=WEMLEOkKVkr1x1LE2bOVp0xRDlHhjpRdyb11lnYNlzBKucwYeU5mOYnhhjwHr5DalD8i8C5iAaCIQdJWmDhlnKafcWcM0UDUhwXMNqNuzxbsB7VytKJXmysQBDD/ZoLmFHJOKK/sSNmwl1vsyDUn10cBOffwhbnkkIttNVbzYL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896214; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uO1exuOwnsn2sfVHXmjMLfR8cirHCGXm6b4VfRWYQ/A=; b=Pusi5j69sMgOTq9H7MUYNIMVnSuhIbpLgB10k8rvrraMQEAFBQXBuVpuvnQXNDzEy0A4+r3GccX5DMXqJw6RPBBvAUAfn9T8h9e3MqgkNzPTbWsd4Pi+tdxYORxpVhxyW4lrnFSNIAl6ZvBagp+yXhU7BHMI8bagT+KlXYUegzY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896214571422.00078827419554; Tue, 8 Nov 2022 00:30:14 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-517-BW0_k4txN6GOyRmggjiiIA-1; Tue, 08 Nov 2022 03:30:09 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 85EF13C0F7E4; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 698AC2166B35; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2780B1946597; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D96D0194658C for ; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BF73E35429; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63E4810197 for ; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896213; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=uO1exuOwnsn2sfVHXmjMLfR8cirHCGXm6b4VfRWYQ/A=; b=gfffMR3c2hfMJd9U832FpSSVuBWS/ZykenHt7q7RH/NFB8xg6DLKffnZEB0bSF7AGAJfa6 aF6Xbp4GJe+yZXmyfi66HRwBeMl6JI6eGnJVgjSVXWlhipsfBTAPuhY7NE4rVHk4kbUkx7 z3jsEiZPIkoKlI8E0o0p5OvWqGh4630= X-MC-Unique: BW0_k4txN6GOyRmggjiiIA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 13/48] qemu: Retire QEMU_CAPS_DUMP_COMPLETED Date: Tue, 8 Nov 2022 09:29:15 +0100 Message-Id: <0aeb26d4fadf7b98628341a50551396c1b82c300.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896214749100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9e4839829..abb7bb09fd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -458,7 +458,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.max-cpu-compat", /* X_QEMU_CAPS_MACHINE_PSE= RIES_MAX_CPU_COMPAT */ =20 /* 280 */ - "dump-completed", /* QEMU_CAPS_DUMP_COMPLETED */ + "dump-completed", /* X_QEMU_CAPS_DUMP_COMPLETED */ "virtio-gpu-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW */ "virtio-keyboard-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_C= CW */ "virtio-mouse-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 884c512265..c993eaab67 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -437,7 +437,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cp= u-compat=3D */ =20 /* 280 */ - QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */ + X_QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */ QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */ QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, /* -device virtio-keyboard-ccw */ QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896266; cv=none; d=zohomail.com; s=zohoarc; b=DKWhFzDIrM5MqjIMDHACB7MzBJVVpyadxOxsDVJ/bdraWsw++paAeEZP8cG3+DD4fNKit6hZN4DEwBAbFqnS4TkeMK8yuvLANaC3TrQi773Fj4jrRpwPEMpsuYtdKJGIQvfHfvoMCOLls0yfhzniTpNoJreKEk7WGnHJVkDEBDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896266; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l5tt0izIrtKm1sMcCFXXOm3S/IbWvzWENQEdMf+6LKc=; b=FJHSXwWBtNFgNqQ/3DK7ltTMw/JZzdnLLWwW0kMqcwWtfIvRp7M6KELrOFOdPhpcWTb8PDyIO2Cs47vhKa0BNN7yVXZiLCI+7oRM7L40JrSB3gzjbw2XGYCERgzF27++crR2qpptGUxZGEqJcd30hFXxBPQyYsRslxGtM9eccnY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896266540848.6414304834967; Tue, 8 Nov 2022 00:31:06 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-377-Q6FVfbBnPDibgjY_1yxvhw-1; Tue, 08 Nov 2022 03:30:11 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AF1A4868A55; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9A8A2492B05; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7B949194658F; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6CE891946587 for ; Tue, 8 Nov 2022 08:30:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6048635429; Tue, 8 Nov 2022 08:30:01 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0487B4EA4A for ; Tue, 8 Nov 2022 08:30:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896265; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=l5tt0izIrtKm1sMcCFXXOm3S/IbWvzWENQEdMf+6LKc=; b=OeJ1ltsS5DSrwWTcgUvae/43rM1ETIDsVHxW8wSRmLm+OKbQqFoCU1++It8ohot8rZoXnz K4gtKqt/82bWzVXfBGs0BLMY+oKvkg1ozIYJ8UStlmEJUult9bsnoduQVNUC+sndE9QH9R pKLLrF6pQbAXy3ajLqDxvs/s9AuuxQE= X-MC-Unique: Q6FVfbBnPDibgjY_1yxvhw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 14/48] qemu: Assume QEMU_CAPS_QOM_LIST_PROPERTIES Date: Tue, 8 Nov 2022 09:29:16 +0100 Message-Id: <92435e7a3d4f2a4b1275304d46bec35b8d8c7fa0.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896267040100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.12.0-rc0~48^2~25 the qom-list-properties command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index abb7bb09fd..cfde657394 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2634,9 +2634,6 @@ virQEMUCapsProbeQMPObjectProperties(virQEMUCaps *qemu= Caps, { size_t i; =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) - return 0; - for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsObjectProps); i++) { virQEMUCapsObjectTypeProps *props =3D virQEMUCapsObjectProps + i; g_auto(GStrv) values =3D NULL; @@ -2859,9 +2856,6 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCaps *qemuCaps, { size_t i; =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) - return 0; - for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props =3D virQEMUCapsMachineProps[i]; const char *canon =3D virQEMUCapsGetCanonicalMachine(qemuCaps, vir= tType, props.type); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896214; cv=none; d=zohomail.com; s=zohoarc; b=E4v8iw+MpShyYVClJ7k4viElreB3agC58E5zt0Mq3a0e2U1PJd5IXFCT552hHXsyMJlFL6MIbq7/gMx1sNs+gShXPhJKSEfeXg1LEJ1VkB0fuACcjygt4GFu/MvJ8l6uCHKhG7XXIPOetQAJCWMOLFzhePodXxQO+tdYrqk+zJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896214; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vpi7/YrUAuTnAhucm2xHXSJLdKDhR4m6kMdrw4zbxAE=; b=UhYRZNb0U7tFc8UYJ88uo0p7KFkMjEbHMEK3migGPff9jNUKBGLXlKfeWN/g6MRYvWJNSZwunlzO6+9RqwGDN54/V07km/fT4kuz+HMSYgpKtTZgiTPcHLCgZfAAqREVFW7oefcQEzlU94aFchoPU1UGP/tqDf1D3LrTcKVSvk8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896214117666.2876371818966; Tue, 8 Nov 2022 00:30:14 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-583-kwOor3u7M-CvHUT5BuUcOg-1; Tue, 08 Nov 2022 03:30:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C68E98688A5; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A761D40C94AD; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 89B8C1946588; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2562B1946588 for ; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0079C10197; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98D574EA4A for ; Tue, 8 Nov 2022 08:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896212; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vpi7/YrUAuTnAhucm2xHXSJLdKDhR4m6kMdrw4zbxAE=; b=So40QLgJp5kiibVajdbpeTZTgZncDLZuFPCDlsvISKpMvOGRHJtz57vxw1pEr2ODKQtXf2 a3JKQjNJEEbYFvIAJCdos0+sKsn53oDOPSWILiN5K5t1Q4Jq28/Ss5nn4PeLITAJVAF+xa e1CttD05uR+CueRhB6+6oue05lEJdSg= X-MC-Unique: kwOor3u7M-CvHUT5BuUcOg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 15/48] qemu_capabilities: Stop detecting QEMU_CAPS_QOM_LIST_PROPERTIES Date: Tue, 8 Nov 2022 09:29:17 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896214762100002 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cfde657394..ec1077eac5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, - { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES }, { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE }, { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 119d259bb9..4981fd2f2b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -88,7 +88,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index ee09c8eacc..eb6d221822 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index d46ab3ae73..5999e3b610 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -55,7 +55,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 0e16046efc..246d2ca3d4 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -118,7 +118,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index e2cd3367ad..21f7e48fd3 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -90,7 +90,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index c58cff3f51..ccd3cab037 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -88,7 +88,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 4f10008ffe..adf9837944 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index d53b63ad6c..a8835e3f96 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -118,7 +118,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 15b87106c6..cb5d5e7887 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 3a758c008f..7e0f6f1c83 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -117,7 +117,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index f197f42e6b..978fbd5a31 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -89,7 +89,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index b23662fe31..da014a388a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 0b00653aa4..8d21e35c0c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index cb4bca34a7..90c7cf67c3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -53,7 +53,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 7647cc842f..4da05d14f8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -117,7 +117,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 4974ac67b3..64beda4672 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -90,7 +90,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 8295b69d50..92dd5ec668 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -53,7 +53,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index a2a77735ba..e6e7d3c484 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -116,7 +116,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index caca79d93b..7c8492fb7d 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -115,7 +115,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 7d71c820b3..fd5f7286c5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -97,7 +97,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 86f262d727..20e2df81ac 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 04a0617883..907ed522ac 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -115,7 +115,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 1d70e827ba..c229e33bb6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -97,7 +97,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index a2810cb3a8..e839d2b3f8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index eef749e7a2..6ee9bf5930 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -115,7 +115,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 7dd04c5c90..03841b54ab 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -91,7 +91,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 8f45f61f3a..13ca5a0027 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -115,7 +115,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index d8c00b3496..e8c175f247 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -115,7 +115,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896275; cv=none; d=zohomail.com; s=zohoarc; b=aMDc2OwbIBZA1AR0/gvKmukMuQ0rybThY5P7UTRrUB5tqfoTP8nisjHf8aANYlMMCmfCmYbI1x5R0W5VFX6weHf8A/agODMwYXlGxGvM+Vge0vCJJCQFtNUQUABuTdsNHnjhgttIhdPaqsMw4UCdFIMQckKmtGvH4r044FvB14E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896275; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Jo/E3ZDAuMpPVvMDoCAgHhnCFpu7wd5iAF9Hb91o+78=; b=eTjDNEvqijIOCUkGc2rc66c17m9ikCHiNi9jptkt41JRGg3K7OXlnSzqMoQflv4o4vsZV/l14IHgB2btA7vb0lGiegd2qx6lsbfvArykeESAKDR3m7P5LMPCupluKL/G/MSEG2fj0gResZDU67RZbmhd88tkxMQ3B4mLiKmN+hA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896275245944.8947751014252; Tue, 8 Nov 2022 00:31:15 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-3kgMmkYtMT2FOKrUzwK2Bw-1; Tue, 08 Nov 2022 03:30:11 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 133AE832D39; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2D464C819; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DBC3219465B5; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AA2751946595 for ; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 95D674C816; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39EAC10197 for ; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896273; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Jo/E3ZDAuMpPVvMDoCAgHhnCFpu7wd5iAF9Hb91o+78=; b=TLu7MeMKjcgTlQdajY64vQyElIOCDp6W2UK5zC8222nGSUXN/a5RZG08HD9oCHzdWVjAMP 50qvn5UHzr/7Y8ABIs7kS58NZbykK01G4jdtilDEj0W308OeYTSwMbkQvsit1cu1RLXG/z Qlv7J+ba+1HLmfJ8l6RKX2EIQnZ/oUc= X-MC-Unique: 3kgMmkYtMT2FOKrUzwK2Bw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 16/48] qemu: Retire QEMU_CAPS_QOM_LIST_PROPERTIES Date: Tue, 8 Nov 2022 09:29:18 +0100 Message-Id: <897ee45861113fd91f2576a7f2f55e19d4814c42.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896277054100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ec1077eac5..4223d0e1fe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -475,7 +475,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "nbd-tls", /* QEMU_CAPS_NBD_TLS */ "tpm-crb", /* QEMU_CAPS_DEVICE_TPM_CRB */ "pr-manager-helper", /* QEMU_CAPS_PR_MANAGER_HELPER */ - "qom-list-properties", /* QEMU_CAPS_QOM_LIST_PROPERTIES */ + "qom-list-properties", /* X_QEMU_CAPS_QOM_LIST_PROPERTIES */ "memory-backend-file.discard-data", /* X_QEMU_CAPS_OBJECT_ME= MORY_FILE_DISCARD */ =20 /* 295 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c993eaab67..83994be86b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -454,7 +454,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */ QEMU_CAPS_DEVICE_TPM_CRB, /* -device tpm-crb */ QEMU_CAPS_PR_MANAGER_HELPER, /* -object pr-manager-helper */ - QEMU_CAPS_QOM_LIST_PROPERTIES, /* qom-list-properties monitor command = */ + X_QEMU_CAPS_QOM_LIST_PROPERTIES, /* qom-list-properties monitor comman= d */ X_QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file= ,discard-data */ =20 /* 295 */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896222; cv=none; d=zohomail.com; s=zohoarc; b=OyM4jWNVq0DDOF79vDqGn5uItt+hdCIeTYYb5AN9V/4KZc/Xa/RqX/K7R/kC5iA/7dJmlCiZMHcn3g2tF1wvXU0X5Y1PPIoL0UxaXS8PfmMu5XbCRfShHb1k0mT8mRuDAsx4nRdzYw9NXatP5I7bxj1bopswq3SBUAgTGfif2/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896222; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dBf2jDgYl/mirf5gUzXVGQgOurV28MDNzxdizsoUUoA=; b=jOLEenLItNGFFwv+TL9G6aL8WRAiYfsedtazVzJB0kayA7pxfQ4F8ZW4sxBXRzrdiqk1fuSjyMKZR3xVMFkBJtylvvdyWxxVsjAMEIYhxujlSmJudSZdrw0U/hKMX0v9P2PwnF5x4DltVnqBCsWHNzTfnB+W59g1jkrAl49PRtc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896222177552.0698122575799; Tue, 8 Nov 2022 00:30:22 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-39-tQb8RF2dMKqTTFrVqzPKqg-1; Tue, 08 Nov 2022 03:30:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CC55F101E156; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B88BB40C94EF; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 852411946597; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 587821946597 for ; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 36F874C816; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF1E110197 for ; Tue, 8 Nov 2022 08:30:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896220; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dBf2jDgYl/mirf5gUzXVGQgOurV28MDNzxdizsoUUoA=; b=FjqrLfMckz1RFVEW74qqejtUChjPjAWhG/77G3gLJnD5do1Fx7VatKsVrfAnJ5Qh0tQzXF Wdj9e8o3A2KMfYVMLNo4z53anTd2mf2bn6GsTMShBuT5Ohc6dpZJA+vbzSI8p/nIFawB2n zHUssdabRiaq3GqQUM8MXgyYN0SAFyk= X-MC-Unique: tQb8RF2dMKqTTFrVqzPKqg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 17/48] qemu: Assume QEMU_CAPS_QUERY_CURRENT_MACHINE Date: Tue, 8 Nov 2022 09:29:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896222974100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v4.0.0-rc0~202^2~3 the query-current-machine command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bcdd55b089..d793c0f52d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16307,12 +16307,8 @@ static int qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, bool *wakeupSupported) { - qemuDomainObjPrivate *priv =3D vm->privateData; int ret =3D -1; =20 - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_CURRENT_MACHINE)) - return -1; - if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) return -1; =20 @@ -16389,13 +16385,6 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto cleanup; =20 - /* - * The case we want to handle here is when QEMU has the API (i.e. - * QEMU_CAPS_QUERY_CURRENT_MACHINE is set). Otherwise, do not interfere - * with the suspend process. This means that existing running domains, - * that don't know about this cap, will keep their old behavior of - * suspending 'in the dark'. - */ if (qemuDomainQueryWakeupSuspendSupport(vm, &wakeupSupported) =3D=3D 0= ) { if (!wakeupSupported) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896384; cv=none; d=zohomail.com; s=zohoarc; b=m/wc09ssBYTbXGlUte5hpgfMzyVKUnPHYyUmQBv3SIWQVl4LqLcRt4wZBXcDNPUsl+KIwRv4pJv7LISgbtyhFaVdnya00fwtaDpCuTd2bzr4Z0FyBG1sNCe9RGZz9TFDT95R7t3R4oC0uJhyIm2xrFpmApGjyoiBzJHn9lzFh5E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896384; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S5YXjjf+wepkbUSrI1Y/pu3Cjj2v8NYAV1XbO+G0AuI=; b=jSW2ABxMNlY/etsArXNsC2eyaOyqHtLHg7G6QI3RZUyAtabV4qajJLumjHIeYg0LcFagh9HBlTZiEsLuA3+32ithFRD+0MBkIv2QlQONFVUQtQjb0LOgLXgEJ5aL/RXMGrGQo9CholHv/PILigaLxylVz/yxsgiF1zH7tgtps38= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896384820162.66660619278662; Tue, 8 Nov 2022 00:33:04 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-391-NxQmBxblNLq1i6sN888j9g-1; Tue, 08 Nov 2022 03:30:17 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7527586C053; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F749111F3D7; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4C788194658D; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DA6B619465B3 for ; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CCC5610197; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70B174C819 for ; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896383; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=S5YXjjf+wepkbUSrI1Y/pu3Cjj2v8NYAV1XbO+G0AuI=; b=B94Ln+O55yhG4lgWFYPKuyqlyidjHQk7++0m6gYttvsPlu7v88/0XuQpJzPI1VEFhsWnWl v3temKGgH4KwJGcLQZsVEgIiiXPGqC392yguvSARt5U+VHAlONrEnl12E4rG0EVkzWakNk XY+8bLJQZiNXTayBeudOcIzSJ6VaHRQ= X-MC-Unique: NxQmBxblNLq1i6sN888j9g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 18/48] qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_CURRENT_MACHINE Date: Tue, 8 Nov 2022 09:29:20 +0100 Message-Id: <1672fdaa81827a384c30c0adb3fa92908753ba9f.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896385568100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4223d0e1fe..42f2c77061 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, - { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE }, { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 4981fd2f2b..ccb2c48947 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index eb6d221822..f9e6fa70d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -100,7 +100,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 5999e3b610..5f813be761 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -68,7 +68,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 246d2ca3d4..48dc757437 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 21f7e48fd3..1b5efa794b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index ccd3cab037..1048ca36f6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index adf9837944..18f2f64b6f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -98,7 +98,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index a8835e3f96..2685aef4a1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index cb5d5e7887..87ec61c159 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -33,7 +33,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 7e0f6f1c83..6df3bcbb63 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -133,7 +133,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 978fbd5a31..f9bd66200e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index da014a388a..5b4e360388 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 8d21e35c0c..e5e50743a0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -96,7 +96,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 90c7cf67c3..b2d7a90f15 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -66,7 +66,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 4da05d14f8..4ad736a7f2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -133,7 +133,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 64beda4672..ba08da19ae 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 92dd5ec668..f5d231c2e0 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -65,7 +65,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index e6e7d3c484..9b781fd3fe 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -133,7 +133,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 7c8492fb7d..ed8b12c3af 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index fd5f7286c5..b333eb402d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -109,7 +109,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 20e2df81ac..5127408d73 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 907ed522ac..0347f5f812 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index c229e33bb6..75e77af3f0 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -109,7 +109,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index e839d2b3f8..d8f4404e5a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 6ee9bf5930..7d7478e520 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 03841b54ab..f9f7e59ee9 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 13ca5a0027..efa91653d4 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index e8c175f247..50ae2b15c1 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -131,7 +131,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896278; cv=none; d=zohomail.com; s=zohoarc; b=Cev3b8sHAxVZmejF9eLS1PsoTRQi4dRi7inYMXHvshc0U+/0UwuM0SrymSY39+DaAcDzHJRXdoeH8zJOX5lvlOat2rsmiA4VIEDXAlSfV05ZBTtYANa+m6ZtTG+uUenXugc4uRIngCTi0aAGTP9uUpD7mew6LO0ZQZ18FHSQL9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896278; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U6fLTtybn55xRapUhRZxs5IDKGBjIU34pKwM/iXMg1Y=; b=l/yuoX44gd7Ph5dxbrPXbH29pb/ruOq1Jlisg6zmf2vnC6Xsj6XXNvcBBabkZkBFXj4xuTD+2u0c7RoCNFp/0fa9GySKd0YYcSVeGH+8W5D0L5/hw0gPzXcAEOmeooSJFGAuETdI3u8a6i56XyIyQ7CC/zYgE8jBRBkiCiqJcCI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896278275598.7473333880178; Tue, 8 Nov 2022 00:31:18 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-Vg_JNheXNTaKHC8z1D8SDA-1; Tue, 08 Nov 2022 03:30:11 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12E24857D0F; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5BE140C9561; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D8C801946595; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7AB29194658C for ; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6E4884EA4E; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 112B110197 for ; Tue, 8 Nov 2022 08:30:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896277; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=U6fLTtybn55xRapUhRZxs5IDKGBjIU34pKwM/iXMg1Y=; b=ij8Z5xu3WyDlvpARDhC31vOQIhbGideNA+sXxD/epwtA8VxgECUO1ASBvJyhgvIhKQSK39 fkum2JY+HmBu8K5dguPyz0ewy+csujh6YYz+SIfMSn1TVv3avYUFeNK7rHH39Me+5f2zhK 41DWZSELAuFQRXwnmEMaZBjE1veHvfo= X-MC-Unique: Vg_JNheXNTaKHC8z1D8SDA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 19/48] qemu: Retire QEMU_CAPS_QUERY_CURRENT_MACHINE Date: Tue, 8 Nov 2022 09:29:21 +0100 Message-Id: <332a869495a46540286fef4e514078159ec52785.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896279081100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 42f2c77061..93a9275196 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -524,7 +524,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "scsi-disk.device_id", /* X_QEMU_CAPS_SCSI_DISK_DEVICE_ID */ "virtio-pci-non-transitional", /* QEMU_CAPS_VIRTIO_PCI_TRANS= ITIONAL */ "overcommit", /* X_QEMU_CAPS_OVERCOMMIT */ - "query-current-machine", /* QEMU_CAPS_QUERY_CURRENT_MACHINE = */ + "query-current-machine", /* X_QEMU_CAPS_QUERY_CURRENT_MACHIN= E */ "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */ =20 /* 330 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 83994be86b..cccb6bad83 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -503,7 +503,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk = */ QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, /* virtio *-pci-{non-}transitional = devices */ X_QEMU_CAPS_OVERCOMMIT, /* -overcommit */ - QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */ + X_QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */ QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */ =20 /* 330 */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896335; cv=none; d=zohomail.com; s=zohoarc; b=k2se+IycunKssbISdhy0zGXYImn4bNgwXl+aXBHOgR0MBUJ8WLS9w9bgsztpnm02zRYR0plQ/RnOkqco3DfoBQKBMxinWEJrmeBgk2UVh+XpamCQAaH+EVKWD7NrIJCyCEKzmrFZ7zmkRRDTVcVPr9ri4bgsetzuu3BkU4Xv1Ao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896335; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WvazQcz3FccJ0usB+TAN5mHhAVA+Ix8U/K1tsVmMgUU=; b=lFwlQG0L7tCKebe37ZZwvlMNalhqaYUMqIJZHvZbOHxm5WRFo05K1x3vQfryMPPG0IcZZ76jY/Zu9VBWEdtGFc2Hl4mq7uCX1k2F04nzpSyEheLLSbECim/Q3uyTy8Y7BBwW+xlYUCm/R+QElLww8yPBMRraJT1pbe37AoR6LSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896335224401.3451094269809; Tue, 8 Nov 2022 00:32:15 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-UU0qAo65McCO7sxnYw_WLA-1; Tue, 08 Nov 2022 03:30:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2764A86C046; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10A7D40C947B; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E27E1194658C; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1AE6219465A4 for ; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0F43310197; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6EF54C816 for ; Tue, 8 Nov 2022 08:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896334; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=WvazQcz3FccJ0usB+TAN5mHhAVA+Ix8U/K1tsVmMgUU=; b=jUZyFRxzhweevMoegroUTTlL8lewEkkGbixvv7iH2bS8BKTfuKx984bVnF8aYIb+DY7zB3 UP674AvnDJvk2EPiO0JiNCGvl3Megr9PorGV4yoCx7TPo0pkMlFnsFCnNcSEHVMdL2IwuH DmcbMTXmpwojTx2HZO8QTL/XK9pRJbg= X-MC-Unique: UU0qAo65McCO7sxnYw_WLA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 20/48] qemu_capabilities: Stop detecting QEMU_CAPS_BITMAP_MERGE Date: Tue, 8 Nov 2022 09:29:22 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896337395100006 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 93a9275196..a16abbd02a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, - { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index ccb2c48947..d00ebaa0aa 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -100,7 +100,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index f9e6fa70d2..3d4b99246e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -100,7 +100,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 5f813be761..05539c5822 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -68,7 +68,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 48dc757437..6a16855793 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 1b5efa794b..2f19631357 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 1048ca36f6..3bde244867 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 18f2f64b6f..a7b2645933 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -98,7 +98,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 2685aef4a1..28a67ce62f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -134,7 +134,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 87ec61c159..7bd777592f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -33,7 +33,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 6df3bcbb63..bd38a09580 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -133,7 +133,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index f9bd66200e..02d5cbf811 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 5b4e360388..7a8e1bfaf5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index e5e50743a0..543f8cccdb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -96,7 +96,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index b2d7a90f15..2ff49c542f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -66,7 +66,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 4ad736a7f2..b712ba2f79 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -133,7 +133,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index ba08da19ae..7ad223562e 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index f5d231c2e0..ca14707e00 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -65,7 +65,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 9b781fd3fe..1744f632e7 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -133,7 +133,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index ed8b12c3af..2cd81bf751 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index b333eb402d..2b8ea4b605 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 5127408d73..387ff140c7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 0347f5f812..e374621a44 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 75e77af3f0..08aa68581e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index d8f4404e5a..84f38f5df2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 7d7478e520..c2465fad4e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index f9f7e59ee9..a847b2ca19 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index efa91653d4..2192d1cef1 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 50ae2b15c1..259769bd8a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -131,7 +131,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896563; cv=none; d=zohomail.com; s=zohoarc; b=Tww+6VSHox3i1T8rY3KU2+2FzcJjpVXoue68oMY99qrwZM/HX4WL9HGT0c17CgGz/9yhcXPXjG9TfHrWgW/iHTN+CmbeEZrP+HoPyqVXucng8wG34IjF1MNi/e61My/15zzEJWUoMRhsiuxENUskk0Kcw4Wcz25fhf52gzsY08o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896563; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TskhfwNoSiODcwmcyM7twAbH6U9+oElj+dBuxsrL26M=; b=Ww916MdQUcPj6/N5OEqyPnrDlYKBlB5oYq9JjzMjbI23OJiRmRky3ACZNgTcD+dFdcwf2eb1QJas93QCmaBv0n2RoquQG5IWEzlqdxLKQMf3/3K30W+CxZYm/mMJ3ovFQi641cvoSE4+wihDARXHJEzXDFxKNJZFwbLp/HTH7bY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 166789656370176.00422851602013; Tue, 8 Nov 2022 00:36:03 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-131-PeUomgs2Oye-wOArGRw4DQ-1; Tue, 08 Nov 2022 03:30:16 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 52C2887B2A4; Tue, 8 Nov 2022 08:30:07 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FAEC2028E96; Tue, 8 Nov 2022 08:30:07 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 277CF1946589; Tue, 8 Nov 2022 08:30:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AE5D6194658F for ; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A2E454C816; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4750010197 for ; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896561; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=TskhfwNoSiODcwmcyM7twAbH6U9+oElj+dBuxsrL26M=; b=cdq3NFJ6su1myK0dpaIWVTB2Oko6VcABbLQxUko5+xeYxkR0Dq69/iD7z7vfcAzlHnhqjp dmB/eiA80PiT5GSMYMlMZioyd69Wprwq+pjTRCxM6IxCUavhrT030JuZollRMcPzLOtLJu vDtDZnnklHAhiKKNPUXYK6LkV1A9LUY= X-MC-Unique: PeUomgs2Oye-wOArGRw4DQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 21/48] qemu: Retire QEMU_CAPS_BITMAP_MERGE Date: Tue, 8 Nov 2022 09:29:23 +0100 Message-Id: <5937f897e8404413fa8abef807b5bc4a05053485.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896565179100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a16abbd02a..5393764844 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -528,7 +528,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */ =20 /* 330 */ - "bitmap-merge", /* QEMU_CAPS_BITMAP_MERGE */ + "bitmap-merge", /* X_QEMU_CAPS_BITMAP_MERGE */ "nbd-bitmap", /* QEMU_CAPS_NBD_BITMAP */ "x86-max-cpu", /* QEMU_CAPS_X86_MAX_CPU */ "cpu-unavailable-features", /* QEMU_CAPS_CPU_UNAVAILABLE_FEA= TURES */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cccb6bad83..813b300838 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -507,7 +507,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */ =20 /* 330 */ - QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */ + X_QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */ QEMU_CAPS_NBD_BITMAP, /* nbd-server-add supports bitmap */ QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */ QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU prop= erty */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896264; cv=none; d=zohomail.com; s=zohoarc; b=HOj7u9EG9tOVv4uV4GiJLo7j3uXcA5/PXBbwoSQYKlXwzj+ALDph94z9RbWPgkghmcmL0zlcqx49h6sZolOcQc3uWXNdHuvrW8tF5Jj8HcwJ/yQlKdA/uF9jUBLZGtRUkCozhEYEUWZ0BO3K+Aqs2pml3GuxYW+a9V1Ca4V7l5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896264; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XbnnhxVj6e4FLZxZZw0qvw+NWUE+Xr9+ZCMFK7/ebDQ=; b=gA7CS0ISr6SAy7a9gZTz0fgC9tz3SJ7CC8GoG94RExXLpvEScYLnqsWhHeidf1UjdToBaaztxUxPOVIFHQU39XrBcFyNb+zfV0kixRGGLUpfSTwknrm8/i7WYlgrLkCnRdS28E23X9+zzwj582TGk/treZbw8d3cG3sOlWAdefY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 166789626443681.21716988829894; Tue, 8 Nov 2022 00:31:04 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-331-SgFAeR0SO3eraSlaEDltOw-1; Tue, 08 Nov 2022 03:30:18 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46A57381495F; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31515140EBF3; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 13E0E194658D; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 57EC0194658C for ; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4428B4C816; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCC3235429 for ; Tue, 8 Nov 2022 08:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896263; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XbnnhxVj6e4FLZxZZw0qvw+NWUE+Xr9+ZCMFK7/ebDQ=; b=ieo5l4zJoOLttAh0+4QZUzDASq0RRPKggGX3zsk8UBZnBQqZF3mtH6Z1xSIlMCOra3U5ix b/QhnNehyoGruAQdOorQ9+pjSXD2o0/nU8M0YaVeGcF/MkBk129dbdF450jWQUUZmnhl+K NCJRWFlBrzx8TJM9e3UY8o1XIq3oa4U= X-MC-Unique: SgFAeR0SO3eraSlaEDltOw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 22/48] qemu: Assume QEMU_CAPS_QUERY_DISPLAY_OPTIONS Date: Tue, 8 Nov 2022 09:29:24 +0100 Message-Id: <427d91a5d327eb72416f6fc28f8f2b15802c7e2c.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896265077100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v3.1.0-rc3~8^2 the query-display-options command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5393764844..b2c28b91ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5227,13 +5227,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qem= uCaps) static void virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) { - /* versions prior to the introduction of 'query-display-options' had S= DL - * mostly compiled in */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_DISPLAY_OPTIONS)) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS); - } - if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896223; cv=none; d=zohomail.com; s=zohoarc; b=Va0i9wE778tz4c189VqswFPI6snJaCGNGWZfJFRH92GQ+zKlfdXWeheqqsLj5D2d6ixl7ifhWetiXTsPJ1pbRZDruKME2KPA5PGsLgzHquS9SEJHhvDDInf0aMTfIAY863QvmTzPe/Yul1ANFYfKAlenPPxV8Fnevtjg7Xlp3yQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896223; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qK2dmrmfcGHjQ3dDjUMPunWiEqfsGbRPo22eTapl0bM=; b=R7nUnVruLPu20t1QL75jq8m8Dg6hMWsaPJ6yWnqy2LSTUn5tD0MMRD7MZLNx7OUgJWAbnD/zCubuTOKiOHwuoe5hsmInGab5c3QyiBE78sVmQ/3jp0JLpcWhtE/TVpFrp+Exog25TfHfUNHLwxRKRI+AY3FqgbTO5g3RuHf3VhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896223857684.2011972348344; Tue, 8 Nov 2022 00:30:23 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-550-soSTOSy4N0iDXh3lT4wygA-1; Tue, 08 Nov 2022 03:30:15 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 90A4B2A59556; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C49935429; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 625EA1946589; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E2E6D1946587 for ; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D8E7835429; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D47710197 for ; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896222; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qK2dmrmfcGHjQ3dDjUMPunWiEqfsGbRPo22eTapl0bM=; b=KUsilaLIUBunoWODY/+nr6/60AaLfcqxkYXYFKmiN3r0QtKuEZHUZSqTPPWEQpsZb0xyz5 vhMiQqJjoxjSJ6jyNcbJvF42In4F+fg9mJYnHdMPT+5qDYAyDXO1G3MO1Hnu86UKMdYDSR Ri9MymBtgRDNHXfyRTfDpf7M5mErRY0= X-MC-Unique: soSTOSy4N0iDXh3lT4wygA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 23/48] qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_DISPLAY_OPTIONS Date: Tue, 8 Nov 2022 09:29:25 +0100 Message-Id: <0af4e781cbc6f6b871ba3acbe691c4b901ec70e7.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896224875100004 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2c28b91ad..55fafcec21 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1214,7 +1214,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, - { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS }, { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN }, { "set-action", QEMU_CAPS_SET_ACTION }, { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index d00ebaa0aa..d240a0da7d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -121,7 +121,6 @@ - 4002000 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 3d4b99246e..c766c0cf4a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -123,7 +123,6 @@ - 4002000 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 05539c5822..2bd0530e5e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -85,7 +85,6 @@ - 4002000 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 6a16855793..919f6363ba 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -162,7 +162,6 @@ - 4002000 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 2f19631357..e380e137fb 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -131,7 +131,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 3bde244867..9a689e43f6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -137,7 +137,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index a7b2645933..b6bf1b0509 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -123,7 +123,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 28a67ce62f..6fb38e874e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -169,7 +169,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 7bd777592f..48e001b60f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -50,7 +50,6 @@ - 5001000 0 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index bd38a09580..3f5577d84f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -171,7 +171,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 02d5cbf811..1df8f486b2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -135,7 +135,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 7a8e1bfaf5..ff358bff1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -139,7 +139,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 543f8cccdb..06691ae0e7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -125,7 +125,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 2ff49c542f..06c4107783 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index b712ba2f79..eaed31c884 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -172,7 +172,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 7ad223562e..b26666c418 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -142,7 +142,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index ca14707e00..ee3e832914 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -98,7 +98,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 1744f632e7..d8432886a2 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -179,7 +179,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 2cd81bf751..2236289dce 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -181,7 +181,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 2b8ea4b605..954ad8d9c1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -151,7 +151,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 387ff140c7..9bad8cf7d1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -144,7 +144,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index e374621a44..ce275745f7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -181,7 +181,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 08aa68581e..dee827f4ff 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -152,7 +152,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 84f38f5df2..88171e1312 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -157,7 +157,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index c2465fad4e..6a1116d28b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -181,7 +181,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index a847b2ca19..96a71a19c6 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -153,7 +153,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 2192d1cef1..e41e456597 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -181,7 +181,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 259769bd8a..7d93fce389 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -181,7 +181,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896267; cv=none; d=zohomail.com; s=zohoarc; b=lXppcuuL1+3RA/NborinBCpGzrDqq69lK7gfj9qWvSQ+XT24PrphTuulB8OrDLqAvaURqv6y/UrqnjqY7dK+EV/Ua4BdfpSsAgfuzyTFXwKItCqaMfQaLyiN/eWJU1yH0X3acPjkfWWJo+DX9M8Vewh8u2FdTgAYzIWd4Ixm14s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896267; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6WBDl+H97Akg7PjGUMrd9eL4E3qlLul66V8IUOlqzY4=; b=ac7xqv+OgsNukCM4wgK65Wq4zjoyvW9kOBFlhrChybuRp8Bct44fOEHilHHaF0WDpjeMAELqHK6gPd9LQc9r5USohDzChw5S8q32npE6dubbGWg5694EHEDS4J4TyaZbp+i/yXbucTBS+H3yEqMDKrtH1uBWdJk20oFaaZc2zko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896267447295.6806882331572; Tue, 8 Nov 2022 00:31:07 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-aFRykhJbPBi_5OcGKP5Igw-1; Tue, 08 Nov 2022 03:30:15 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5443F1C0051A; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EF911401C24; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 29EBA19465A3; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8654C19465B1 for ; Tue, 8 Nov 2022 08:30:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 79BA34C816; Tue, 8 Nov 2022 08:30:07 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DCC310197 for ; Tue, 8 Nov 2022 08:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896265; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6WBDl+H97Akg7PjGUMrd9eL4E3qlLul66V8IUOlqzY4=; b=OV/LnodPQ9kcei9KdyrMvqCWIoePGX8hwd/udXCWY8Ira22bLAP/veVLLDSmSz7n9EM/dr JuwhphtvikqeJPLjxwLVcmqz44V89VxQmUSUhcGjDGEgkeOKqT2S7GEP2Vw2cp43sHIveD rLkNR0yckRX3PQ1Yw0Azqk7fxd0lxSk= X-MC-Unique: aFRykhJbPBi_5OcGKP5Igw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 24/48] qemu: Retire QEMU_CAPS_QUERY_DISPLAY_OPTIONS Date: Tue, 8 Nov 2022 09:29:26 +0100 Message-Id: <22454fb39c45e81d11e658769f565a0dbc6731b7.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896269048100009 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 55fafcec21..1f28c7c772 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -634,7 +634,7 @@ VIR_ENUM_IMPL(virQEMUCaps, =20 /* 405 */ "confidential-guest-support", /* QEMU_CAPS_MACHINE_CONFIDENT= AL_GUEST_SUPPORT */ - "query-display-options", /* QEMU_CAPS_QUERY_DISPLAY_OPTIONS = */ + "query-display-options", /* X_QEMU_CAPS_QUERY_DISPLAY_OPTION= S */ "s390-pv-guest", /* QEMU_CAPS_S390_PV_GUEST */ "set-action", /* QEMU_CAPS_SET_ACTION */ "virtio-blk.queue-size", /* QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE = */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 813b300838..995fd0399e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -613,7 +613,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ =20 /* 405 */ QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT, /* -machine confidential-= guest-support */ - QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp comman= d present */ + X_QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp comm= and present */ QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */ QEMU_CAPS_SET_ACTION, /* 'set-action' QMP command */ QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, /* virtio-blk-*.queue-size */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896225; cv=none; d=zohomail.com; s=zohoarc; b=ASL+lpNFpw7kIWwCy3pOOzNmYTf2tc/SfL6giHygjETPGARv+Ly6iugwO13xzEIWpX6ffqxf1q9boMsh21Ux23oF+QJtrCX/GQITlSFmDh8UMOyXZpBi7Bc+PXDy4cFqy/jeDFeH1yzrMsLlWF6VCQKQF56DdEXnAEy6jYiWUDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896225; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1v0VmuQe/v0pjT9VRfd7bGAtv0wAkKCXcO9IV839w2g=; b=VGWk60lL2oUoWHW2g1WAeFzabxSTxb528eRPeYw3jQzghLHuteoKkohh0EQjkVBWJp99I6MBaFw3WvvhPZ0tbyV0dtvoPJOHloCOEx35Gu+NOM/fLY8v9+eA25uvV8S+wbcm9zHXfreTDxyk+vS81IM77URzm5H3OP1ysg35jt0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 166789622577462.5820767692594; Tue, 8 Nov 2022 00:30:25 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-187-EUEkv8QmOtilQrC_C1VMrw-1; Tue, 08 Nov 2022 03:30:17 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E70486C049; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 592332028E90; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 03EB81946588; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3B64C1946587 for ; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1AFA635429; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B275810197 for ; Tue, 8 Nov 2022 08:30:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896224; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1v0VmuQe/v0pjT9VRfd7bGAtv0wAkKCXcO9IV839w2g=; b=R1YdOTBu/bT+byN7AHG64qwIXagjymnGi0YJFE74kwuJ8Pa9xZGvJEEutVrU5x9GU7fIyR XNrhYpXNx19NE+ufQiuMww2WgVrD9d+ENMrFSTH/EWJZ4BIPFnVrwHhZPlvgN8lhnzCeE7 pljdqAH5ea/uL/X5JgGeo7OT5CCXQ6g= X-MC-Unique: EUEkv8QmOtilQrC_C1VMrw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 25/48] qemu: Assume QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:27 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896226886100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.8.0-rc0~116^2~26 the .rx_queue_size attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 4 +--- tests/qemuxml2xmltest.c | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 78c68a99d0..74631378c6 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1866,12 +1866,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNe= tDef *net, _("rx_queue_size has to be a power of two")= ); return -1; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SI= ZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio rx_queue_size option is not suppo= rted " - "with this QEMU binary")); - return -1; - } } =20 if (net->driver.virtio.tx_queue_size) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dd2460bc0b..98ba6633f8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1466,10 +1466,8 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-netdev"); DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x"); DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); - DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE); + DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size"); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 45e16ce02d..22397f209f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -468,7 +468,6 @@ mymain(void) DO_TEST_NOCAPS("net-eth-unmanaged-tap"); DO_TEST_NOCAPS("net-virtio-network-portgroup"); DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896408; cv=none; d=zohomail.com; s=zohoarc; b=IvfczBwsXdu4vuz5ug0aAJYDLWhXWADqyknLroG8CmradIcZxLMwTchLJl0DbRbko2WzzBfVKa3rnEsRkPA0KUGwRVFX4t6Cq0vjqIw5hIi5v/50psC25OoPuW7NHQtV6lOqS4sb2Mgbir5TXo+yPdPj0MdBGeN7/ssXwxuk+Ks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896408; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UhJ7HR8HbTZvd/KTHrkgQkkBk5BAXl2EYzRVYoBaRH0=; b=E6nW26UheLN+EOMjH2K7/SIH4T928JQOHstM99AwV5We4qj9mmJS17BgXmLDrrxWuCZaUD9C05LcJBzQH9YE99+r+RQqbdTvIfwAEgdIc8M0TQARQhugNl76mNvQDGCTCaC+OwGbnGvGL/rtqEbJzS1ORd57dCE3+hJx58OImNk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896408228422.4775001557372; Tue, 8 Nov 2022 00:33:28 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-108-MMLoumwyM2aTgkFfiqeWvw-1; Tue, 08 Nov 2022 03:30:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 818341C0A10C; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AC4C40C94AA; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3AF9A19465B1; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CCFA6194658F for ; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BB02335429; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F16B10197 for ; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896406; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UhJ7HR8HbTZvd/KTHrkgQkkBk5BAXl2EYzRVYoBaRH0=; b=UYE+j7krf1m2LZ/+v9l/HWA3X+k7sipjjJkMF6V3yGwd78UrXUpbmRUZPneIcQbcU6F2h4 MDiyE/EZbTxJOxbbOhBdB+bnvDPJ1PJV61lXYNogveS4O3AA6dOeYHXIvs9HI+LhrSQuAS KVMEANUC4VRqIwsGQOyYptG4dUXOiKE= X-MC-Unique: MMLoumwyM2aTgkFfiqeWvw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 26/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:28 +0100 Message-Id: <3ec3cda8d811adbe7a6aedae27c1995a999e1c89.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896409712100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1f28c7c772..29a2cf6aaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBlk[] =3D { }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[= ] =3D { - { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, NULL }, { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index d240a0da7d..89f64801f9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -68,7 +68,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index c766c0cf4a..76cd22ca55 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -64,7 +64,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 2bd0530e5e..80845b2eff 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -36,7 +36,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 919f6363ba..773575996f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -89,7 +89,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index e380e137fb..b3a415db32 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 9a689e43f6..5ec1468373 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -65,7 +65,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index b6bf1b0509..cc54899152 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 6fb38e874e..6d07593242 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -89,7 +89,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 3f5577d84f..af6d109c6e 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -89,7 +89,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 1df8f486b2..59412be9f2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -69,7 +69,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index ff358bff1e..8071c6f551 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -64,7 +64,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 06691ae0e7..ac0facce09 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -69,7 +69,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 06c4107783..69d7a30822 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index eaed31c884..6cd627dafb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -89,7 +89,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index b26666c418..e011b87c17 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index ee3e832914..6ef18440be 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index d8432886a2..4e986cb73a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -88,7 +88,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 2236289dce..8a11065be6 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 954ad8d9c1..65aaeed167 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 9bad8cf7d1..b5a17ece5f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -64,7 +64,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index ce275745f7..f92a93a801 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index dee827f4ff..9c07f29d4c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 88171e1312..d7c24dac4d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -70,7 +70,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 6a1116d28b..d6a162c4b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 96a71a19c6..b378c1cd3b 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -69,7 +69,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index e41e456597..b8e7fc5eee 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -87,7 +87,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 7d93fce389..5ff97b088d 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -87,7 +87,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896222; cv=none; d=zohomail.com; s=zohoarc; b=l3K4S0ZyU3tgY2AfS/YE75eKkqb5fxpraLGR3W7lP49y06hN1kPCbjGo2/vB7n6fj3MJWlJEuyYIpnN0pdTAj/cGnIBLaJMrbnf4f33cbrm++WDlQDr+WWAFTz2qMpUk9TDbNqDHObVCPvp1wVUTKZvhz/mEFy96brcN4U6Y1Ic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896222; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q2gpn2i2pCugifwo3H2CLurfRs5B4HidWmj4HFdQrfk=; b=XZMXCY9qR0vw3BOj7D/rV/FjkbtpN1Ufggaj0Uw/l3Am/ifujrw7jhh9mnKFavcREldj/l/c/gODH+hYmTN0TYvHoBuC13067a7t6lQyvM46O4wDhDq1LNtGyqP04Blw8/idS7uhwTWmaaHRoqNqAPTBb+P9jyiIWGLGIk2dbqM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896222883303.35578053527297; Tue, 8 Nov 2022 00:30:22 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-648-6sHFv3pCMGWiNgdldHBE-Q-1; Tue, 08 Nov 2022 03:30:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED2E63C10699; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9B4B40C947B; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AA4561946597; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6EE9019465A8 for ; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 608284EA48; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04B2A4EA4A for ; Tue, 8 Nov 2022 08:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896221; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=q2gpn2i2pCugifwo3H2CLurfRs5B4HidWmj4HFdQrfk=; b=Spj9k7U9Z1iEfUECsqJRPQCSzeHotFyS7U7v2V57zRedlpl4QQ2aFHEOd1aIWNCEKIf6j+ 4Aj6/tQB3JNKUf6Gm3d9K1PeSOlyo+P5roJBq2QXz6gwM5OkD9r12GZYOkKQXt27nme99h nyYSXwx386PGUwQ1GPYpI+1BNUE/SEU= X-MC-Unique: 6sHFv3pCMGWiNgdldHBE-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 27/48] qemu: Retire QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:29 +0100 Message-Id: <96320863d71b10a773fc7b014257dbd43fee8330.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896224856100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 29a2cf6aaa..e511c279c4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -391,7 +391,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "smm", /* X_QEMU_CAPS_MACHINE_SMM_OPT */ "virtio-pci-disable-legacy", /* X_QEMU_CAPS_VIRTIO_PCI_DISAB= LE_LEGACY */ "query-hotpluggable-cpus", /* QEMU_CAPS_QUERY_HOTPLUGGABLE_C= PUS */ - "virtio-net.rx_queue_size", /* QEMU_CAPS_VIRTIO_NET_RX_QUEUE= _SIZE */ + "virtio-net.rx_queue_size", /* X_QEMU_CAPS_VIRTIO_NET_RX_QUE= UE_SIZE */ "machine-iommu", /* X_QEMU_CAPS_MACHINE_IOMMU */ =20 /* 235 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 995fd0399e..6fcbb5026b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -370,7 +370,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=3Don/off/auto */ X_QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */ QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS, /* qmp command query-hotpluggable-c= pus */ - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */ + X_QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */ X_QEMU_CAPS_MACHINE_IOMMU, /* -machine iommu=3Don */ =20 /* 235 */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896280; cv=none; d=zohomail.com; s=zohoarc; b=gsMUXs4JsIhFB+SQYH7gZMb9JU71vYiH2NIClzf6C9Gt5k8Xv4fTXVpLSaxLwmFjs/4mExwrnePPHeOlWh4wMtOr/CU4fT9XHpvEIFPDfDBPIUny7M1pFGZDHZn0J0qcjNFNu360Mwn9tJTl2lpvcNYqMFUBToY1B37UfQPqMSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896280; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9yUizZmo/uEGhv5BWZ9vvZtqlVR/X36NAeuHcOR4c2E=; b=LkVdf+f0f+aJnQJjh77eVsUzwzFaIZj+AXqabBK+HMOaYF8F3oKY1JZTWP07tl0B0OtAOCoYXP2E8DQzcnMM82w+mAuApFsPHYtd27OFo4ehOq3KLe7IEYsmQFZ6uZlkc1jILShTVJrwpLgAl6edeZ/KDWH+4swf8eX2/sNa5XY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896280154442.2005588978358; Tue, 8 Nov 2022 00:31:20 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-493-tZzH2bZ6OBCNvxysxxQI8w-1; Tue, 08 Nov 2022 03:30:22 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F8368027EC; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C25340C947B; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 220A21946587; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1C6F31946594 for ; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 020DB4C816; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 994C610197 for ; Tue, 8 Nov 2022 08:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896279; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9yUizZmo/uEGhv5BWZ9vvZtqlVR/X36NAeuHcOR4c2E=; b=ZH6IXNq9MVHSIIG4uur9qG2GMpHJ/TmZmlSUg1cODvcQEyaA7S6mqqj91pfUCBbVAazRz7 MUsrRW8T2CxpZa6hEJ0fkAsDfsYa8Qaj8DH6NGPKFzHlTjE8aUMosD7CZLSyoHtzA/V2ce 32pUSY/0UwW4w/74VkhcNGqCIEVBAHY= X-MC-Unique: tZzH2bZ6OBCNvxysxxQI8w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 28/48] qemu: Assume QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:30 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896281077100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.10.0-rc0~95^2~20 the .tx_queue_size attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 3 +-- tests/qemuxml2xmltest.c | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 74631378c6..88f2aa8c49 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1874,12 +1874,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNe= tDef *net, _("tx_queue_size has to be a power of two")= ); return -1; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SI= ZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio tx_queue_size option is not suppo= rted " - "with this QEMU binary")); - return -1; - } } =20 if (net->driver.virtio.rss && diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 98ba6633f8..029e60947f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1465,8 +1465,7 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-disable-offloads"); DO_TEST_NOCAPS("net-virtio-netdev"); DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x"); - DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); + DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size"); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 22397f209f..e8261b7e8c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -467,8 +467,7 @@ mymain(void) DO_TEST_NOCAPS("net-eth-hostip"); DO_TEST_NOCAPS("net-eth-unmanaged-tap"); DO_TEST_NOCAPS("net-virtio-network-portgroup"); - DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); + DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896333; cv=none; d=zohomail.com; s=zohoarc; b=GdDgtDm0LyH0HVFzD5fjtPC/QJCSj+A6im69aLnkoNc7iLn260DDFz6PPc+CLEBkAY0qE02Zk1K4BHJBK0geq+BYUbS4PbHX6MjN1zIBRxkiCr000CUdZ7T7v0iMyATAhKA6OnZOS1cdPoSRWeW/Aud0M8pFJpb2+OVK2lhptwM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896333; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZcqTv7880szKTJ+paJ+6mJFk2V9iBuTOuXMbufjSZ3g=; b=LuR/0/HigDyZrEtAkzo0aK967iDzONKg9dUZ7zYQpxrf71RNxpHDrGjoLtRcjWAzgHAL1mPTVxt4pgy1nithywgdZDfZdgCfufPs/JjH8cuApxmo/CZdZtCsfVH7suhXwDL+cc6CXpeKREfhTxJzu1C4wsuMapW6IIyZBJWBAVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896333228834.438213612933; Tue, 8 Nov 2022 00:32:13 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-159-lPui9ECuPZiJ4liQJIpyfA-1; Tue, 08 Nov 2022 03:30:26 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ACB4985A5B6; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 981ED492B05; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 67CAD19465B3; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A7F9F19465B8 for ; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9577610197; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39E9C4C816 for ; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896332; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZcqTv7880szKTJ+paJ+6mJFk2V9iBuTOuXMbufjSZ3g=; b=bRWOfZwQSLmmWsS1u9LL/XArHYFDe1nOlN2Pf1kySL71FXf12F3jgHmV1kjywVtFjBTbV8 9bJJG3QyUoD+7t12blUkos4WHVld9e8b0hc27pr1G3FHB6Yu3TuDgOEklaV6OuyrWDN9lX k0bwOag4q6YVnVr/4VT5kQ66VNPqg8Y= X-MC-Unique: lPui9ECuPZiJ4liQJIpyfA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 29/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:31 +0100 Message-Id: <58510307f3600337defc6c9f9b55d699d2d7f587.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896335391100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e511c279c4..7091cc3a25 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBlk[] =3D { }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[= ] =3D { - { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 89f64801f9..dee48940c2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 76cd22ca55..a3a0cd6f6f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 80845b2eff..6e93dffe7d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -41,7 +41,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 773575996f..fab759da81 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index b3a415db32..8eb16fb09f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 5ec1468373..2a9d308ede 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index cc54899152..8f6bdc9138 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 6d07593242..554c04ed11 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index af6d109c6e..dd5d19f836 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 59412be9f2..b0178d4db0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 8071c6f551..d73b839a84 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index ac0facce09..b7bf347186 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 69d7a30822..6d310929a5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -40,7 +40,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 6cd627dafb..f6f608e6a4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index e011b87c17..3cb22c00f1 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 6ef18440be..c13b1fbdb4 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -40,7 +40,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 4e986cb73a..0ea45334db 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 8a11065be6..61cec49e73 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 65aaeed167..546772bb08 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index b5a17ece5f..a8ec01363d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index f92a93a801..70e28a53e0 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 9c07f29d4c..7b368407ac 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index d7c24dac4d..fa1ffe3e83 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index d6a162c4b1..437fdfde22 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index b378c1cd3b..4779e01b9e 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index b8e7fc5eee..93315c6f53 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 5ff97b088d..49e88a572a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -103,7 +103,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896263; cv=none; d=zohomail.com; s=zohoarc; b=WP3mZ9DYJoD33I1nDp7eWNUakeO73TueSPL71XEgKHtTodRYgWov6+7uyD9lUwXSQbuzzmvY8AEI4w+Hte3DRcpR6BwtHHIQ27hf8jRSkyYrW1UQ+d4Gj62P+Fy3G3O7Mvf6anJ5Y2xQoqk6fA8LGT1K8/QOU2ORUzpfe47nfGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896263; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q0nzWZ0vsZ1Lgk40NmrQzxxQif0Tl1GORpCztZOryHE=; b=fHSRtiY5IaeD7rmfOKPVp2S787cSbxENHRETA4Q9HkfL8m6ugFSl7ZDQo4V8H9ewkYal/YIS0CojGltAWxYCMIW99PIymwrnNQ2SWDSIgj8jvKz9fxDiXKZU3hJ4A39nPAqshL3RXJ9UqM4L7XSmzQ8l3zmMOj+dCJ6J2l8GazM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896263827782.4465370998676; Tue, 8 Nov 2022 00:31:03 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-42-3VkU2QVzMNmr5O01TpFCuA-1; Tue, 08 Nov 2022 03:30:22 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D1EF185A7A3; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 899D5C15BB5; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 66FBE194658F; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 48F34194658D for ; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3625D35429; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEA3B10197 for ; Tue, 8 Nov 2022 08:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896262; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=q0nzWZ0vsZ1Lgk40NmrQzxxQif0Tl1GORpCztZOryHE=; b=cpsHOiHWQq7edk4WYcA1j4Ah0yplxpji+dIP3CVGSauCU8cT630jlMNj2WdM5Drlb4avyw qPkfjEQJBqI8g+DE1i6KEkcpNBqGqv56+EoeOzm4KlbOJTzJk9sx4svwKaU+aAso3yIar4 IyHAkKrTuk3mu0NGSZj/0YjwnnF9gPU= X-MC-Unique: 3VkU2QVzMNmr5O01TpFCuA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 30/48] qemu: Retire QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:32 +0100 Message-Id: <5d78806a96c5a7348bd58dcac86c02d73ba54b22.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896265072100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7091cc3a25..33bedbb7e5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -437,7 +437,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vnc-multi-servers", /* X_QEMU_CAPS_VNC_MULTI_SERVERS */ =20 /* 265 */ - "virtio-net.tx_queue_size", /* QEMU_CAPS_VIRTIO_NET_TX_QUEUE= _SIZE */ + "virtio-net.tx_queue_size", /* X_QEMU_CAPS_VIRTIO_NET_TX_QUE= UE_SIZE */ "chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */ "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTP= UTS */ "vxhs", /* QEMU_CAPS_VXHS */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6fcbb5026b..656c769e5c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -416,7 +416,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=3Dunix:/path */ =20 /* 265 */ - QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ + X_QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-= outputs=3D */ QEMU_CAPS_VXHS, /* -drive file.driver=3Dvxhs via query-qmp-schema */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896229; cv=none; d=zohomail.com; s=zohoarc; b=CNp8jeOcWn01ReDg/yRyU3Cp1oPSx15cqBjVI5hkcAKXWv+lKXf0thqAM5z/4K8kaPaDTdSggMwlUpmE+Fkt1ouVV3yY8Nq/DFuOAexLIkGK+Ot6Fa31TtUtEiDSnU0i6yULEfkmp2TuShYhbAV7cf+D7Ch0KyApfLiyel75CFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896229; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8b0Dd5G9/bri4AOrITJrhSNAO6drRKS3GnhmoCSR/OU=; b=Jv/h70mkAkHVtiAksk7fNgc5+8SePASya6+XckzoO9KuufGn+kl2upu6rf6dD22jlaycBbRhkiH5NxJTCZsu5JgBdzwLi5lp5vyU60ruEJmpLeH4cNh7WPOd3fWNmsUAjkEP9JHScfucIhqMOK212vylTuv9tPX+PdpKYR0eqbQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896229491313.96271198924876; Tue, 8 Nov 2022 00:30:29 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-205-i2QPHb-CNTiIXcYQiXU2Gw-1; Tue, 08 Nov 2022 03:30:24 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E90A33814943; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2C87112132D; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9C9A81946A7F; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E0D3919465A3 for ; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CAFD810197; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F55035429 for ; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896228; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8b0Dd5G9/bri4AOrITJrhSNAO6drRKS3GnhmoCSR/OU=; b=UGHLIVJz4e68W7qbxKyN4pFFX+mwMpvwc9X7vEBSsg0u1QbLQNTxoPH8hpiZL6uB3b5Dcf zYN2QqW1p9l1+Hs1t/EvjeFxpheTopsz6GtmJWy5nRDj71kWNcKHLhCXPmxu3gR1amWbYT icyy1xzolpb96G1rbOK+vaEBC2vc6uw= X-MC-Unique: i2QPHb-CNTiIXcYQiXU2Gw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 31/48] qemu: Assume QEMU_CAPS_VIRTIO_NET_HOST_MTU Date: Tue, 8 Nov 2022 09:29:33 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896230854100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.9.0-rc0~162^2~10 the .host_mtu attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 8 -------- tests/qemuxml2xmltest.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 88f2aa8c49..c01bc6f8b5 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1889,14 +1889,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNe= tDef *net, _("virtio rss hash report is not supported with= this QEMU binary")); return -1; } - - if (net->mtu && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting MTU is not supported with this " - "QEMU binary")); - return -1; - } } =20 if (net->mtu && diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e8261b7e8c..3a117ff137 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -493,7 +493,7 @@ mymain(void) DO_TEST_NOCAPS("watchdog"); DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC); DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC); - DO_TEST("net-mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU); + DO_TEST_NOCAPS("net-mtu"); DO_TEST_NOCAPS("net-coalesce"); DO_TEST_NOCAPS("net-many-models"); DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896344; cv=none; d=zohomail.com; s=zohoarc; b=lSF5JBRfIMoJjDqdU/f1uosf7WjKG7jf2W/lYyl2JmkFutcZWWul7Wu2nhUvnMYMGIWXWMknZrOpKSf7XwEn6R7fyXXDgwxa2/McGgodnXGgEPqKRfWeP74H3gooPJuSYb/1DmQvwULE9T2iv8JYrbcuMUpSmaqggX/vUDfuC44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896344; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=asLA0vLn9Ow6dbNc9oKdIz71rRGw41MNtSuT1UdmGWU=; b=M1lb1WuggcXuUTBp6NtMdsfNtjxdxb1aDCcdQVL9swWNnD9xNIGGCwoJ7JzVN45tcnDQ01BPu21CInTGYm0zCsQoqdetwKygQb7e9gotcWw7vBcEOqUfuB1XBfRKk/W85wi321gvwQPRqNqMzHk84z7n/G2Nhx7ncFLqm46FpM8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896344627509.27842200342843; Tue, 8 Nov 2022 00:32:24 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-532-h1yqSrguPBWiFG6sMocVMQ-1; Tue, 08 Nov 2022 03:30:26 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F0CB1C0A135; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5212410197; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2133A1946595; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7693119465B1 for ; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6B4654C816; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FD5C35429 for ; Tue, 8 Nov 2022 08:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896343; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=asLA0vLn9Ow6dbNc9oKdIz71rRGw41MNtSuT1UdmGWU=; b=guYPExMzK7rOeTfcf2vh92AKfHNsqgedmOlnYNJ9Y7EdrVs4mARfDCuC7KhIByiIM6MnN1 JbluSoSISo0r3TOPoR0+eMasxIl4VQC+ywVHsgelBjV2tXUk757rdOg+pBYJywLdOSfQ+8 MHfh+JM41+8zf8Ml086KrKbHY/Bhr9Q= X-MC-Unique: h1yqSrguPBWiFG6sMocVMQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 32/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_HOST_MTU Date: Tue, 8 Nov 2022 09:29:34 +0100 Message-Id: <4e2f8ff0720bf2fb0f095d5551d8848a10c924da.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896345440100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 33bedbb7e5..c91ffe4936 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBlk[] =3D { }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[= ] =3D { - { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, { "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index dee48940c2..0ca14c0c8a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -72,7 +72,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index a3a0cd6f6f..d1f129e082 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -68,7 +68,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 6e93dffe7d..0219143b00 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -38,7 +38,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index fab759da81..5cf91a2e82 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -94,7 +94,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 8eb16fb09f..2e06e7db5e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 2a9d308ede..ca835b9d4f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -69,7 +69,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 8f6bdc9138..c1ffd75173 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -73,7 +73,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 554c04ed11..354a03d898 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -94,7 +94,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index dd5d19f836..3ea4f6bd87 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -94,7 +94,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index b0178d4db0..82f3d77d62 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -73,7 +73,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index d73b839a84..bf5f455bf0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -68,7 +68,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index b7bf347186..ae0b230f89 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -72,7 +72,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 6d310929a5..e61d434026 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -37,7 +37,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index f6f608e6a4..7dc2839c88 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -94,7 +94,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 3cb22c00f1..4fce7293fc 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index c13b1fbdb4..c66e92a4ef 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -37,7 +37,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 0ea45334db..1f7dde4ea0 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -93,7 +93,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 61cec49e73..2ae7af59dd 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 546772bb08..1885a7d317 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index a8ec01363d..6a5c8e896c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -68,7 +68,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 70e28a53e0..5a52832a99 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 7b368407ac..c7a2ce50b9 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index fa1ffe3e83..4022323331 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 437fdfde22..2aaf30d4a6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 4779e01b9e..35ab888fe2 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -73,7 +73,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 93315c6f53..71654915c6 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -92,7 +92,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 49e88a572a..bb4ee25f98 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -92,7 +92,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896228; cv=none; d=zohomail.com; s=zohoarc; b=nwUYKjEhqB8hn2t7thmvvC/BnZrkB/D5UW//yCnvGxV0wS8Qn4MyAp4aYTZA5E5yg9XWA8s+7Q4aSDzWVo1ub4wE0DIp/aoSsIfBN0nJ53WoMGItHqjSXVA92fIEp/HxUpbA9bSGv8s688XAC1wP52V6DDJ8BzBU1bkl2lDwRRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896228; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xlan9IBxQaieyh4DQOAhuJ3j1dPWZPzcCKpNR/HoRj4=; b=U0dCVGqPc1MD2Il40BsppZ8BJxQucLwCbC1MP+SHgfSbwtkxqeXXjmnYXXIAjGsSfYZkX9Yyvk3tIC/AJt9F79JPWA4zHGgMQ4BNTYnxUiag8afwqlV8UmLGmkqR/K1ENz0NCCKEnYJDXvMkUqe2aizHntyOhgIrmxRhHXn3YNE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896228567559.2117542888482; Tue, 8 Nov 2022 00:30:28 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-146-7XFP-SrQOQuBX2EBmF6NIg-1; Tue, 08 Nov 2022 03:30:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B0D5E8017C3; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 950BB2023A1D; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7A55C1946A50; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3875A1946588 for ; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 109DD4EA4D; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6F3F4EA4B for ; Tue, 8 Nov 2022 08:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896226; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=xlan9IBxQaieyh4DQOAhuJ3j1dPWZPzcCKpNR/HoRj4=; b=eXMIigr+TDYEkPoZd0yxatk2mX+AzLP07XShS2kKyb9Rh68gz0YOf/qYNWP1BROUSSJJQN wn7p5UVZQHHc5TlMY3I1/P45Sw73XQ1n4tyD1dLGfpCNTK1q4bghAxrZnh1jaZd8v1Ix0I 5WxQYTgVHoXeGY8jOml7c2MFcDGgWIE= X-MC-Unique: 7XFP-SrQOQuBX2EBmF6NIg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 33/48] qemu: Retire QEMU_CAPS_VIRTIO_NET_HOST_MTU Date: Tue, 8 Nov 2022 09:29:35 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896228840100009 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c91ffe4936..a8e4b29349 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -406,7 +406,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vhost-scsi", /* QEMU_CAPS_DEVICE_VHOST_SCSI */ "drive-iotune-group", /* X_QEMU_CAPS_DRIVE_IOTUNE_GROUP */ "query-cpu-model-expansion", /* QEMU_CAPS_QUERY_CPU_MODEL_EX= PANSION */ - "virtio-net.host_mtu", /* QEMU_CAPS_VIRTIO_NET_HOST_MTU */ + "virtio-net.host_mtu", /* X_QEMU_CAPS_VIRTIO_NET_HOST_MTU */ =20 /* 245 */ "spice-rendernode", /* QEMU_CAPS_SPICE_RENDERNODE */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 656c769e5c..ff67f58e11 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -385,7 +385,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */ X_QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=3D */ QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion = */ - QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ + X_QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ =20 /* 245 */ QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896332; cv=none; d=zohomail.com; s=zohoarc; b=ggRr1+fLHcguST5MZ6NerRstRBQvDZQiIulrRhOeWpwesvzQuz9cuMmNDcyXyaXZXCLOYm3KisMuOQ+/FmxuNdLN8rQcHR+b+TT7Smeuk+Pk5KDSDH02eDt7zVJW5q8d5edMhJmj92fuaVw9DqxifcQfe6Pve0n5Ty26NMMIMCQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896332; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bWqMVqTNr/LdDgUzuQVTMDLYAk4sEkaUHH9mOQiCZkI=; b=KqbnhLoPKWA8JAavFcDmd0ozHtSN+MoSIGBu3qTjN7XAy5Xj2AGL62YGABHdHL7q9Q4NhUg1P2lpWWgU3OWHQC7lfGqY/WTq3Xj6E9oa1toK9CXYyy0pjmovS8e4uPrC7NSTnFnSDQnTBgoH2OvMTQJ3M9Qqsktc9P2WAICmsu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896332562421.376009530961; Tue, 8 Nov 2022 00:32:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-277-1rtvM_ahNPCUDF7oEryuZw-1; Tue, 08 Nov 2022 03:30:34 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D6A54100F7F5; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C12CE40C94AD; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7842F1946589; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BE37C19465A4 for ; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A30524C816; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4795835429 for ; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896331; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bWqMVqTNr/LdDgUzuQVTMDLYAk4sEkaUHH9mOQiCZkI=; b=AbRDv9d5d/2QUU1dmPNg4k7FebchgLlyx8IReGXRqhIPW7eMbr0ox71lrJRK8ZwAFifm9W 9xD6lzJYx+kN2f7nhHAZhascb1M3Zc++pgRa0VXxVh5mrdxVsHAGhHOYD6xHewNy0+hDvf NBKZd6Go+2Jj04H26lvzRfJxf+MILGI= X-MC-Unique: 1rtvM_ahNPCUDF7oEryuZw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 34/48] qemu: Assume QEMU_CAPS_VIRTIO_NET_FAILOVER Date: Tue, 8 Nov 2022 09:29:36 +0100 Message-Id: <8b64c3b625fd092a582a4a5c43834791c21f90a8.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896333344100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v4.2.0-rc0~23^2~4 the .failover attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/net-virtio-teaming.err | 1 - tests/qemuxml2argvtest.c | 3 --- tests/qemuxml2xmltest.c | 3 --- 4 files changed, 13 deletions(-) delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.err diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c01bc6f8b5..243ec29c71 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1900,12 +1900,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNe= tDef *net, } =20 if (net->teaming) { - if (net->teaming->type !=3D VIR_DOMAIN_NET_TEAMING_TYPE_NONE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_FAILOVER)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-net failover (teaming) is not support= ed with this QEMU binary")); - return -1; - } if (net->teaming->type =3D=3D VIR_DOMAIN_NET_TEAMING_TYPE_PERSISTE= NT && !virDomainNetIsVirtioModel(net)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.err b/tests/qemuxml2= argvdata/net-virtio-teaming.err deleted file mode 100644 index e49a1daa88..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-teaming.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: virtio-net failover (teaming) is not supported = with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 029e60947f..3b25c99639 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1468,11 +1468,8 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size"); DO_TEST("net-virtio-teaming", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-teaming"); DO_TEST("net-virtio-teaming-hostdev", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_NOCAPS("net-eth"); DO_TEST_NOCAPS("net-eth-ifname"); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3a117ff137..1b74a81f26 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -469,13 +469,10 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-network-portgroup"); DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST("net-virtio-teaming", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-virtio-teaming-network", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-virtio-teaming-hostdev", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("net-isolated-port"); DO_TEST_NOCAPS("net-hostdev"); --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896330; cv=none; d=zohomail.com; s=zohoarc; b=NLQ7sXgN/YvNve9RWedUSQMc7hFEUO40KhwwvDGmtW2fGNsYKD8XO1al1YeE3pgAE6QlmEq0FFF7IKl9CR2Oh6z7MozjS8lYS7AIzP7u2cFyx3NEGG3ylR2TZlYxE0+QQ1yXZyZEwCpV04X3G/UOzMG6R+1W9nTO4N/H/6P5RVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896330; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BeFlQbQa7iRZGRefGO77k9LQCPS4dw6X+YvV8li/aQo=; b=Yyo1oTuGUDAkGagsBc/+xf+95MUTYtJ+75d2X8XEwPKhx5Pr0FFZPbK/I7DPmCuuIPt2aKQOBrl07cqjQh9FLMdWVxpRHNNdKO5r4AfiDtXGLrQDc3J/tKPa8N4Jnw5xQLAqiBlORX7J0DiHpBZkUi0bJgAH1es7J3ZY8LrDgcU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896330177651.978700612109; Tue, 8 Nov 2022 00:32:10 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-669-8N8NXLVBPxG3RhBa1SfWhg-1; Tue, 08 Nov 2022 03:30:30 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D37D80280D; Tue, 8 Nov 2022 08:30:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 37B47492B05; Tue, 8 Nov 2022 08:30:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E28F31946A63; Tue, 8 Nov 2022 08:30:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 645941946587 for ; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 441864EA47; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC57A10197 for ; Tue, 8 Nov 2022 08:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896328; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BeFlQbQa7iRZGRefGO77k9LQCPS4dw6X+YvV8li/aQo=; b=V7ypwbz7l6/DvYuyaUunpGw/vr0+zwVys0ha1AWG4MAaK6Da77YL/LX1CccrzixyMRNIu9 CVCSgDKJa/7LKBxlH2ABPVKtLW/opbvOwQ7vG+3dkvzDQLeK7hZohLxQgLJtzOzKWoTt1R au1VM4lv3M98ukQLynjK5WFe6Pf8Dbo= X-MC-Unique: 8N8NXLVBPxG3RhBa1SfWhg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 35/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_FAILOVER Date: Tue, 8 Nov 2022 09:29:37 +0100 Message-Id: <359ec1f02547519c089317f618b53de9281fe64a.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896331341100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 27 files changed, 27 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a8e4b29349..b51a0a2767 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioBlk[] =3D { }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[= ] =3D { - { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, { "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL }, }; diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 0ca14c0c8a..06dce09fa9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 0219143b00..43834e1275 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -73,7 +73,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 5cf91a2e82..3a9a89d90a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -144,7 +144,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 2e06e7db5e..e283e96c2c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index ca835b9d4f..a7c8d88f9f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -112,7 +112,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index c1ffd75173..37a14068d0 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 354a03d898..06913257ef 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -145,7 +145,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 3ea4f6bd87..fc11c8a70d 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -144,7 +144,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 82f3d77d62..4beb567146 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index bf5f455bf0..229b7e37d1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index ae0b230f89..738007f72f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -101,7 +101,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index e61d434026..22ffc34761 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -72,7 +72,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 7dc2839c88..ee19c01f7c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -144,7 +144,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 4fce7293fc..32b11de0a6 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -110,7 +110,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index c66e92a4ef..7be2255769 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -71,7 +71,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 1f7dde4ea0..f5fab26893 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -144,7 +144,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 2ae7af59dd..ff7c30de69 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -143,7 +143,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 1885a7d317..c6d0ce0469 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -118,7 +118,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 6a5c8e896c..983b3309f7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 5a52832a99..6679ca1bb6 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -143,7 +143,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index c7a2ce50b9..a711b5539d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -118,7 +118,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 4022323331..7d48f2ed91 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -117,7 +117,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 2aaf30d4a6..b600e9707c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -143,7 +143,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 35ab888fe2..19c3d81fb0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -114,7 +114,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 71654915c6..a13de5ac6d 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -143,7 +143,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index bb4ee25f98..3469213697 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -143,7 +143,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896511; cv=none; d=zohomail.com; s=zohoarc; b=hhurhpJ+mJUBppXSe5E+dASAVvCd5k92g/iSsSerLGkJ5AhHFaZQuJtwmNVNQotq4hlfdpSnvPwp3VPZ502t/CF5vkMVKcH8i5HmtDVCS31FHXcsU0APsxw5zTEtmDLaJqgsclo3HM48IL0CZfh5sO/cJ3xOXbxwpVFMZoPGmuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896511; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CjZuAT+kTMbPGtY70hVNI9pJkMuNE9rgV5UPT5q/qlM=; b=krNZBuiMFSiu2UbpPyq8hcHMk8DM8+XDNEo+EcIfWBH1XYdm3BAvVUYcjfe3azFfzsVjFu4ecS8/g7rL/l7LWRK+OJo7XRTJGWz86r1Ng4rYFkzbiIqCo1CtjLGHZyCMqfwgfhx2OUyKCDNfQXyNvW6o5z+Z/x6koorH5c4j3Hs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896511995786.3833967376003; Tue, 8 Nov 2022 00:35:11 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-244-H5_Tka4eNIGeitjdctJqBg-1; Tue, 08 Nov 2022 03:30:26 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B0D10185A7AF; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C8E94B3FC6; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 58A66194704C; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB82619465B5 for ; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D88FC4EA47; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D1254C816 for ; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896511; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CjZuAT+kTMbPGtY70hVNI9pJkMuNE9rgV5UPT5q/qlM=; b=K4P5OXjlVlYUV6lLiX4NodbP+uM5uHWh4j0ZeF7CeVuebJfTlJFFKX0ZD20/S+5TGEWTXA CeZOY8uMSgIsnR9R7yeX9tWz8Ic9/CRan19Hs1Az1X5sQX7O51hVGsJhsDx+n0ubFaPkfG gySeAroQRVD27zs3unDx2f2eivd0xts= X-MC-Unique: H5_Tka4eNIGeitjdctJqBg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 36/48] qemu: Retire QEMU_CAPS_VIRTIO_NET_FAILOVER Date: Tue, 8 Nov 2022 09:29:38 +0100 Message-Id: <79b89e5e74ef16df80743b10a76caf5155728751.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896512346100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b51a0a2767..693ce98b3d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -558,7 +558,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 350 */ "i8042", /* QEMU_CAPS_DEVICE_I8042 */ "rng-builtin", /* QEMU_CAPS_OBJECT_RNG_BUILTIN */ - "virtio-net.failover", /* QEMU_CAPS_VIRTIO_NET_FAILOVER */ + "virtio-net.failover", /* X_QEMU_CAPS_VIRTIO_NET_FAILOVER */ "tpm-spapr", /* QEMU_CAPS_DEVICE_TPM_SPAPR */ "cpu.kvm-no-adjvtime", /* QEMU_CAPS_CPU_KVM_NO_ADJVTIME */ =20 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ff67f58e11..606731a641 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -537,7 +537,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 350 */ QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */ QEMU_CAPS_OBJECT_RNG_BUILTIN, /* -object rng-builtin */ - QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */ + X_QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */ QEMU_CAPS_DEVICE_TPM_SPAPR, /* -device tpm-spapr */ QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */ =20 --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896239; cv=none; d=zohomail.com; s=zohoarc; b=iCJiCM81uQoso4KE0KCGzw+dFikyLWJ7zxUiTW6jcruMxRe6C+MuP8d2/H70mLeSZ7L2ZWGzu9csgZDfqSGLrxlQPw76GSBoiIh8BDukJBb902YdqvJUdd77/TH58S6mxQ85FqVwLoTYTmUgFw5P9KJh8tTeZlUtP0zfEPspmfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896239; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H9u0gReN2qJsAJyHpbl0Guh+hKchWDS898Ut50Ag4z4=; b=DH/pRXOHhj6EXCPT8ta+Valuin73Y9DuWEhN1uXv/W6rmaJipTH2F1N06kHgS+BzwTmUDKWQw8F8QJBN3ndv3Vit69wtu8kvmM9utC+Gqt8c8f+gn4FvQkNvzG/2w3lA3rxaoh5jAEnOxorguLvc2AgVjhF+iHpFoV/nxpsb7Uk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896239093457.9213006020617; Tue, 8 Nov 2022 00:30:39 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-651-lpP8BvusMcmPOyujUxFaqg-1; Tue, 08 Nov 2022 03:30:30 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1AC44882836; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 052962018061; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DAE6A19465A2; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A0D71946594 for ; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 796C84EA48; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D9EB35429 for ; Tue, 8 Nov 2022 08:30:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896238; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=H9u0gReN2qJsAJyHpbl0Guh+hKchWDS898Ut50Ag4z4=; b=ZaF9wLKk7gWReHGipUAXM+KODRlrgZUsLe1FTMtMHNouBYng18eHSd2tRDiys6+nXDS9zu pYMJlmxzCBIPhJpH3b3MEoIchAvkK4HCnOv119ug5nEPsLI4bhGIfCz2KlMSKDPT1Sg8wM dmmrovx1m6OImGMy2Lx8T1A+Hw6s6b8= X-MC-Unique: lpP8BvusMcmPOyujUxFaqg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 37/48] qemu: Assume QEMU_CAPS_BLOCKIO Date: Tue, 8 Nov 2022 09:29:39 +0100 Message-Id: <16b1391d6e022d646fb8bfd993eefd83ce1b4f59.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896240904100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v0.13.0-rc0~1072 the .logical_block_size attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 256ef4912c..b0c9fb7059 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1751,8 +1751,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, g_autofree char *chardev =3D NULL; g_autofree char *drive =3D NULL; unsigned int bootindex =3D 0; - unsigned int logical_block_size =3D 0; - unsigned int physical_block_size =3D 0; + unsigned int logical_block_size =3D disk->blockio.logical_block_size; + unsigned int physical_block_size =3D disk->blockio.physical_block_size; g_autoptr(virJSONValue) wwn =3D NULL; g_autofree char *serial =3D NULL; virTristateSwitch removable =3D VIR_TRISTATE_SWITCH_ABSENT; @@ -1886,11 +1886,6 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_FLOPPY) bootindex =3D disk->info.effectiveBootIndex; =20 - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKIO)) { - logical_block_size =3D disk->blockio.logical_block_size; - physical_block_size =3D disk->blockio.physical_block_size; - } - if (disk->wwn) { unsigned long long w =3D 0; =20 --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896237; cv=none; d=zohomail.com; s=zohoarc; b=lHSsuF1Oaki0Auyh0yhMOJWLAPdLhkNDI2Dld+8EV3GkNEuT6WVEcdJ1Ru7oSBS6mMWJRDCYSzFEr6Ch6ODef67R0nSVUZAL7rjgx3sTjbV69njf4njcfVg4vuk4P+qPLVHbVyc6PpwflL+5BvCeEPCQbsMWbARH5B1ZKgN/q/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896237; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1sAaBJTPSHICEHkpvzPm7TCl0ZNBNjZNmW1dd5djLzk=; b=PcrLI1JCKL6Z21VZYRE4lrVsvuIbnoN75d1gTpECRoDvCQGyK1Mj8SJD/h4eEcAAB1I1RVkjj0+c9By2EoiOpBdzD6OU+n0KvjCaxnrrRaB04s32ue3CX7i0vjTZXRapCPzp76yaxZRWK0T3rGlfgg8RuM440M5XTXOCAenxYHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896237785319.9287329237121; Tue, 8 Nov 2022 00:30:37 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-wKSNmizTPwqKixtSBrO3wA-1; Tue, 08 Nov 2022 03:30:32 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C288E18E0924; Tue, 8 Nov 2022 08:30:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD72C140EBF3; Tue, 8 Nov 2022 08:30:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8C9F219465A0; Tue, 8 Nov 2022 08:30:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2B49F1946589 for ; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1B2A14EA4E; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B2F4C35429 for ; Tue, 8 Nov 2022 08:30:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896235; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=1sAaBJTPSHICEHkpvzPm7TCl0ZNBNjZNmW1dd5djLzk=; b=JlMgviU8f8+7y0MyvbNVD/H9AWq79Uw0Iq5Dx+tFI3J5iNKRCUkwrkNVGFsHn9scGM575o mdLixeVt6l84j7GGM9I4p94qLKfY+VTRomkJuHBg6IdguCfufrhFyGS2cisodFM5pJVeYm gmWZEnBYFDDwfuk+neks7+ZUNiNjFDo= X-MC-Unique: wKSNmizTPwqKixtSBrO3wA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 38/48] qemu_capabilities: Stop detecting QEMU_CAPS_BLOCKIO Date: Tue, 8 Nov 2022 09:29:40 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896238919100002 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 693ce98b3d..caa988a478 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1415,7 +1415,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONVal= ue *props, =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[= ] =3D { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSC= SIDefault }, - { "logical_block_size", QEMU_CAPS_BLOCKIO, NULL }, { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 06dce09fa9..be96f5e31e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index d1f129e082..3210276ed1 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 43834e1275..0503b343d0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -10,7 +10,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 3a9a89d90a..bbf40d403f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -27,7 +27,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index e283e96c2c..c47a2f5375 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index a7c8d88f9f..c3f4da9f18 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 37a14068d0..2f34912311 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 06913257ef..ba60c52251 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -27,7 +27,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index fc11c8a70d..349139c1db 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -27,7 +27,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 4beb567146..60c0393b9e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 229b7e37d1..def3d7f682 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 738007f72f..92861e8fa4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 22ffc34761..e4d7a0423c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -10,7 +10,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index ee19c01f7c..ad5fafb979 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -27,7 +27,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 32b11de0a6..d877136199 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 7be2255769..d5e9c8d04b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -10,7 +10,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index f5fab26893..38256f4e19 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index ff7c30de69..e1890008f5 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index c6d0ce0469..ccebad1f76 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -25,7 +25,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 983b3309f7..451f40a4cd 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -20,7 +20,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 6679ca1bb6..2437b75663 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index a711b5539d..38535a51c1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -25,7 +25,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 7d48f2ed91..4a47b44060 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index b600e9707c..9492ee9c80 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 19c3d81fb0..586b702e5c 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index a13de5ac6d..a28a88998e 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 3469213697..2e96f59313 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -26,7 +26,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896286; cv=none; d=zohomail.com; s=zohoarc; b=GRtFs3ihQnOF8Ilw7FN0T4XN7tvfq4VNSY6fwVIE8ku/j2sOwA2YnWLODnviR5MFBVOZwQbXjr4yf2JrTGaVsY7G+qiTJGkpXfdolkOmWf/cATaccxDk0x+GivOPGiz/iPISB9FOCyOR95anvXvhk2u2yJp2xdKt+xUesKvzJZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896286; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bpktw7FohLFg7y/f3HfV0mmFfMRrUgt4+74t6eRAO1s=; b=E+rIwzobS1jck9CcckIlGQVjde07WQ1Udp8ZR4zDIiYaJ4yljUpb7+Egh59Tw3g99ooqspN2IRZMc/L+Kwf3W53jet2d04nFS+KG3ZCkR9EM3S5tmOiF1VPeGzy3jcDe9ptBLiUKkB1SEjkXn3TrV+Uz22kS9YJUjVKhf79uqZU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896286357317.6083330099615; Tue, 8 Nov 2022 00:31:26 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-509-gKxmt7uuN8Kw_CEvB8sUwQ-1; Tue, 08 Nov 2022 03:30:28 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0FCCA811E87; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id F11D240C9559; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CAA5E1946594; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 23AA719465A0 for ; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E36F010197; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8852835429 for ; Tue, 8 Nov 2022 08:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896285; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=bpktw7FohLFg7y/f3HfV0mmFfMRrUgt4+74t6eRAO1s=; b=K2k/nJk9+Xwf5r95a4Mlm77z8YPuj0oCjZrOHAfO9rUVdJGKD+2PqhR1dWDWEuijZUG5Sn dxFFhygf+pp0D1XVsH8Aa1M3cIEV0cAVUkVaI063Ha1vOLp/E1kj1UZnsyLxc2XU9iCOjk JRXNwxagaTtB5nNmi8lW/f/8brFrMss= X-MC-Unique: gKxmt7uuN8Kw_CEvB8sUwQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 39/48] qemu: Retire QEMU_CAPS_BLOCKIO Date: Tue, 8 Nov 2022 09:29:41 +0100 Message-Id: <616ce6d194172315d4fd2c53fef25b75f895d263.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896287092100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index caa988a478..538ebe0ede 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -207,7 +207,7 @@ VIR_ENUM_IMPL(virQEMUCaps, =20 /* 100 */ "virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */ - "blockio", /* QEMU_CAPS_BLOCKIO */ + "blockio", /* X_QEMU_CAPS_BLOCKIO */ "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */ "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */ "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 606731a641..46ff416eb1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -185,7 +185,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ =20 /* 100 */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ - QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ + X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896237; cv=none; d=zohomail.com; s=zohoarc; b=FEBX4b9wemAeib+y042unZXOobXxczhV5oZsgcSMk344zJ8NBEwWCMdPRJzmn3o1z0bGppt8PAawoXOV8a+PtUAahBFfUyTDYTi7kY+GGPM297guxD9b5YLAMNtguX+tEqc5SMI64IXP40HXIuHs8od3oHMWTr118dbiMhSq308= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896237; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GrHE48+bAvwCfnmmQuN48uE5oFYkcM8JPKAWvb9hrjo=; b=V+zNNnWVuMzi6e961A3pAVZVPAU+qifPPfXmW0TPhuqkpqiAEQugFcgwUhf1AMNadiz9Ogf/2VFFnUfIav7SD6zeZgv4UTLXqregEDbBwhzQX6HRivcvjRuCkzsqnaT2bnCLVGKPh0L6AA+GQ6IRsWMSlCfs7ZY5iTjHuJrJnDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896237376138.89081161403794; Tue, 8 Nov 2022 00:30:37 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-AW2Xs9MePiOPQm4pFvT0fw-1; Tue, 08 Nov 2022 03:30:28 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF1F5857D1A; Tue, 8 Nov 2022 08:30:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBDE34B3FC8; Tue, 8 Nov 2022 08:30:22 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8989A1946A52; Tue, 8 Nov 2022 08:30:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 988D019465B1 for ; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8459110197; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2874235429 for ; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896236; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GrHE48+bAvwCfnmmQuN48uE5oFYkcM8JPKAWvb9hrjo=; b=iIBIeOhkUdIN0F4mvQ+HCl60LvZOYK+5Y8TJrQ3aEDgLANeBQIk2yJS9aIHtOK0pC74f/3 a5yfR3Yoh9URcZXs8upgRt5E+hmakr3PqUBhQ4Bg7+fpJqTW+yvmX80aw1MCaKFUtU/C4Y Fl7ykPYNsXlM9YSA8l2TPxsn+NyGgb4= X-MC-Unique: AW2Xs9MePiOPQm4pFvT0fw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 40/48] qemu: Assume QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES Date: Tue, 8 Nov 2022 09:29:42 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896238908100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.7.0-rc0~83^2 the .num-queues attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 243ec29c71..4a01fe4d14 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2977,13 +2977,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDom= ainDiskDef *disk, break; =20 case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (disk->queues && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("num-queues property isn't supported by this " - "QEMU binary")); - return -1; - } if (disk->queue_size > 0 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896336; cv=none; d=zohomail.com; s=zohoarc; b=IJ+NbeeaJMoK1HXkR4XQk0qLL/ebFtu+F+EXSKkG05R6XT/2V5iHwFezN2IZiIRFIShikDCARsrAJAWdeNL946n2rNWGZfqafieJkslYfiYYunoP0RAzF8s0TtM84NqUhJXvC+WhF64Dz4WU6pQVR7RJQTtX/OmlCFWkJJ2fkWo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896336; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hOxVkMawXY8ACQ+xjWMvsVKcxcJbi3btoubVePAK+qM=; b=Lkhle7dMvmYVls7AD+vut4DJmsoHJbbALoVyAdIs1ZCxRD9j0r7t4U5fp8cB6veLwhTWkUlWCkGJWKMCmyxf/vVVMgKjGDTuvONdyiohV7nqDs0HsXYRRBRGbELEg0K9av6JBuUEefle6xj9+Tz8faFcHWZGNQe6kOlgWqllDeM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 166789633626231.58788577011103; Tue, 8 Nov 2022 00:32:16 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-567-3cPsxaXNOJWo7DdaQsyUJA-1; Tue, 08 Nov 2022 03:30:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 824AA2A5954A; Tue, 8 Nov 2022 08:30:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CE53112132D; Tue, 8 Nov 2022 08:30:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 107AE1946A5E; Tue, 8 Nov 2022 08:30:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 478D519465A0 for ; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 25DC84EA4D; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDDD810197 for ; Tue, 8 Nov 2022 08:30:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896335; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hOxVkMawXY8ACQ+xjWMvsVKcxcJbi3btoubVePAK+qM=; b=dNadGsk5m0nmORPIu8w3O7fC5vV7GEjkTa/7KEA1Rf9WcAal10JET8Xtxe69+WzHfqpWGF MkGwQb3DEw4vo6SaFIOua2TjVo26m6zyMAUZi4Y087I1iTnLSNppE+P2OAuEd5OrLrcdLl TppiWxUrD+p8poqbbEyT0tQxdtoJiDM= X-MC-Unique: 3cPsxaXNOJWo7DdaQsyUJA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 41/48] qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE Date: Tue, 8 Nov 2022 09:29:43 +0100 Message-Id: <6e8efbd5d8b9f8f84c02b3b8a0e27f7e79694690.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896337388100005 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 538ebe0ede..8202e1ecca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1415,7 +1415,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONVal= ue *props, =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[= ] =3D { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSC= SIDefault }, - { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index be96f5e31e..483e1a5d32 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 3210276ed1..a3eabbd66d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 0503b343d0..8f9b7f8e6c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -41,7 +41,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index bbf40d403f..9e92ac61d7 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index c47a2f5375..bd8a49c98a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index c3f4da9f18..3f250c17d9 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 2f34912311..381f2cb84a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index ba60c52251..d207ed6e30 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 349139c1db..654088af75 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index 60c0393b9e..e25b49fa68 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index def3d7f682..63ab249b6d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 92861e8fa4..de3a91fb58 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index e4d7a0423c..0f18c2b5dd 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -39,7 +39,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index ad5fafb979..d3649604ad 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index d877136199..6ec373e727 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index d5e9c8d04b..7a8ef27b7c 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -39,7 +39,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index 38256f4e19..ad5c43ea6f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index e1890008f5..14e10b2480 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index ccebad1f76..737e3ce902 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 451f40a4cd..8d2d43d916 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -74,7 +74,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 2437b75663..5d1f5dbb5e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 38535a51c1..89aaf97e01 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -85,7 +85,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 4a47b44060..8a49694013 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 9492ee9c80..b15a52c55a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 586b702e5c..6c63704b03 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index a28a88998e..8664317266 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -102,7 +102,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 2e96f59313..35b96c2a32 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -102,7 +102,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896505; cv=none; d=zohomail.com; s=zohoarc; b=lHT4mQPA8/1ZcZ2JTCKpmL2o+TazUbb93llMgjVTNt1ut2LjWaTUgPpbohwnQuub5GTaO9w6DCKdf/oS/ZLTEPEMH0qvjv8sVigHwHKpf+9uxskZXGdspXgixGv/iIAZgeb+xKIq3M878UsXhWkL/tocwVwUxSC2yXv45dEoYoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896505; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iSyRHt7pk+gLCaHpxSceG2eYqcPFyfVUnDNl2nZ2ZPE=; b=S6nIej8qK5Rk6xeLAbZobWrA4WkdyFNlZ/ZujjdJNb6m4twqXd+Io+LheJOiiD1ms9qnrUZnHFP6EdROVfCJSmFq4p8TK29HMIbDOvKzpdbjHyLy+PlL3zjYEOH1qGsyz8Lm3+fw0AS5kvy98SmEihf9ewf0funVpkKATYgzDoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896505433895.8804728737906; Tue, 8 Nov 2022 00:35:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-weOXj_Y1N1CQevNTqk4Yjw-1; Tue, 08 Nov 2022 03:30:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A000C8828C3; Tue, 8 Nov 2022 08:30:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CF5D2166B35; Tue, 8 Nov 2022 08:30:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 693811946A73; Tue, 8 Nov 2022 08:30:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C710B1946A45 for ; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BA6F84EA48; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EB0135429 for ; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896504; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iSyRHt7pk+gLCaHpxSceG2eYqcPFyfVUnDNl2nZ2ZPE=; b=eWYmAkB18ET6hUUJRyparE6j7xBGBfFkmJvUIGMmfnMgGpwozvmmRU/vdB4U6neoCGXbiu lbeBBM1EZ124cxT0anhFyfuW5jC3zQMjAZH/Wbc3hUblq7pL51SG2MbTMwUHWyg+6Kx1/O vMiGW84Vmeq2Yt3wCrAKhzy2BY+PQVE= X-MC-Unique: weOXj_Y1N1CQevNTqk4Yjw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 42/48] qemu: Retire QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES Date: Tue, 8 Nov 2022 09:29:44 +0100 Message-Id: <9179135852cc796a02106e5b718695448ab3aa2c.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896506301100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8202e1ecca..322c002e84 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -441,7 +441,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */ "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTP= UTS */ "vxhs", /* QEMU_CAPS_VXHS */ - "virtio-blk.num-queues", /* QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES = */ + "virtio-blk.num-queues", /* X_QEMU_CAPS_VIRTIO_BLK_NUM_QUEUE= S */ =20 /* 270 */ "machine.pseries.resize-hpt", /* X_QEMU_CAPS_MACHINE_PSERIES= _RESIZE_HPT */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 46ff416eb1..0a62765a04 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -420,7 +420,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-= outputs=3D */ QEMU_CAPS_VXHS, /* -drive file.driver=3Dvxhs via query-qmp-schema */ - QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ + X_QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ =20 /* 270 */ X_QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, /* -machine pseries,resize-hpt= */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896324; cv=none; d=zohomail.com; s=zohoarc; b=gL8THjl8swZ2BTbDDLIVRim9Ka9NJ3VFUiv06Ngah1KHXa3xtLf8j4DrhrGPEz/yP6H0oDl30hmW2wtoNLxt01+kh70qSQG/yKVfJGqPo4XUuMDwjSnWFSWtd82uUqHRGyt0QGpZ7PVPUGdlF277XU3YHcu31PX049ObuUJHUtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896324; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ziQMCzgzDCP2W3AHJmCfpEE/QshcHpegNhcjGA4TKqQ=; b=Sfi+dW8+p/FUmnOVcIDycRa9bkt0x+T5SlRi3AqbjoCwS5qud7B8GusMst98ooXrMXUd52nV0Cl6cGwEkMciVC2HRFEXBrBPBK84admDTc3WlWa6nob9SAbPfzsj/RUMU4IADrIOO+9hZERh2lyhCEFcR0ki8sQ/BOzsKHuJKLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896324497342.07521424695915; Tue, 8 Nov 2022 00:32:04 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-594-yNBDs1CKMe2sLilnLzzpVg-1; Tue, 08 Nov 2022 03:30:30 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D33ED8828C9; Tue, 8 Nov 2022 08:30:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF6B82166B35; Tue, 8 Nov 2022 08:30:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9946719465B5; Tue, 8 Nov 2022 08:30:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9A9F11946A7E for ; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5AD1E4EA48; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id F38DC35429 for ; Tue, 8 Nov 2022 08:30:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896323; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ziQMCzgzDCP2W3AHJmCfpEE/QshcHpegNhcjGA4TKqQ=; b=SJB1zO4qjudHqyB9ZfQTAv2ND3n8ZIb74ld4Yhe4gqe3yBKUp4gfQleO3dCLretV45jDsV m7C1B3msOKWpvCHrokD53pOpe8OO5ZzMsvhwR4sH6DwsdoTRLsTf0hx9EXPJLegX0YkZRr LW9ID5JFuA9waa9Erkf96Ag+GYpbNxk= X-MC-Unique: yNBDs1CKMe2sLilnLzzpVg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 43/48] qemu: Assume QEMU_CAPS_DISK_SHARE_RW Date: Tue, 8 Nov 2022 09:29:45 +0100 Message-Id: <5d21196a259856f254d9dc39833c867f3dca28af.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896325267100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.9.0-rc0~48^2~25 the .share-rw attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. The change in controller-order.args is justified, because the qemuxml2argvdatatest runs the test case with very minimalistic set of capabilities, that's nowhere near real life scenario. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 3 +-- tests/qemuxml2argvdata/controller-order.args | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b0c9fb7059..f775170e32 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1871,8 +1871,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (qemuBuildDeviceAddressProps(props, def, &disk->info) < 0) return NULL; =20 - if (disk->src->shared && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW)) + if (disk->src->shared) shareRW =3D VIR_TRISTATE_SWITCH_ON; =20 if (virStorageSourceGetActualType(disk->src) =3D=3D VIR_STORAGE_TYPE_V= HOST_USER) { diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index fd9eba459a..c0ba064bec 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr/.config \ -device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1.1 \ -blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node= -name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-r= ead-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,share-rw=3Don,drive=3Dlibvir= t-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop= .iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896326; cv=none; d=zohomail.com; s=zohoarc; b=LZf9ayUNmDJNJ1N7MZ90wseeDMQsRFPnd1+YKvmYKWpXsOemsXjXjnmbDuO8o8xtOPM051ulx70vqYO8a//FCf7SaZ6ERMxX5ayUouCDPL2MeUDIPIqSlMYfJ0XeFJbu0qlsZB1JnjkoU5eZgTa4wETWN9FWU9w5HPheVvDDydU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896326; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kIgX9eWlNI0t4w4wcLCjeIGU6HXE0RnltP5E0IuRsp8=; b=YPp2NX8JwHxYMa8drDsTNTxY8Gm8YhivQQaDb6NtZeVqowmld1BRUoJyeSF/PL5x5+EXKoeQhOHTMcDr6Tze3nkFdUQr1/Hz8F7qpCf1cPhrBA5L5hDXnLVrJPX4lwE8Kqu8JaejQJB8/KxxKXSQHukiu4aVnulTTD2jvl4r9HI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896326351784.5957127935054; Tue, 8 Nov 2022 00:32:06 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-659-mSJ6asv9Nmi24FFTxwSIBQ-1; Tue, 08 Nov 2022 03:30:35 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A0FA92A59554; Tue, 8 Nov 2022 08:30:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8950B492B05; Tue, 8 Nov 2022 08:30:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 70D0119465BA; Tue, 8 Nov 2022 08:30:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 09B361946A7D for ; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EF26D35429; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93E1310197 for ; Tue, 8 Nov 2022 08:30:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896325; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kIgX9eWlNI0t4w4wcLCjeIGU6HXE0RnltP5E0IuRsp8=; b=bwJ70BTgeKhX2FBd8j97BpppWOMfB4KsFXxuAnuvtbzOx1CaCUMyjb0yDpjbzyzuZC7yN1 eWp2BZz26qdyLELVUsAY6/osmw7zFeQqKL1gjrvEUmnbvRjjpb457ff78oPDtoEs0iqoOB ZjApZY7YbUsFZZlBrdmqNxX9pQyzo6I= X-MC-Unique: mSJ6asv9Nmi24FFTxwSIBQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 44/48] qemu_capabilities: Stop detecting QEMU_CAPS_DISK_SHARE_RW Date: Tue, 8 Nov 2022 09:29:46 +0100 Message-Id: <059ef36bdefcaa1531b12713eba14bd15ddf10ad.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896327264100003 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 4 ---- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 322c002e84..6b9b4e96de 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1416,7 +1416,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONVal= ue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[= ] =3D { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSC= SIDefault }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, }; @@ -1450,14 +1449,12 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCa= psDevicePropsVfioPCI[] =3D { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[]= =3D { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[]= =3D { { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; =20 @@ -1473,7 +1470,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsUSBRedir[] =3D { =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage= [] =3D { { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; =20 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 483e1a5d32..d36f3ff6ab 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index a3eabbd66d..7afd35f5ac 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 8f9b7f8e6c..92486c7a4b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -42,7 +42,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 9e92ac61d7..04e8fc40dd 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index bd8a49c98a..551eded1a5 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 3f250c17d9..32db5ac3dd 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 381f2cb84a..0b50236f53 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index d207ed6e30..89cc1e4e70 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 48e001b60f..7ba8152589 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 654088af75..fef56fadf1 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index e25b49fa68..fe46995758 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 63ab249b6d..239ce68f1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index de3a91fb58..241bc4ebc1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 0f18c2b5dd..efe85e77e2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -40,7 +40,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index d3649604ad..df4a2cb5a8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 6ec373e727..d3e37172bc 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index 7a8ef27b7c..a020e56a64 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -40,7 +40,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index ad5c43ea6f..d3255b1eeb 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -104,7 +104,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 14e10b2480..d2f871138d 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 737e3ce902..67f2cf482a 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 8d2d43d916..318c962299 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -75,7 +75,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 5d1f5dbb5e..c859553038 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 89aaf97e01..1707aef39e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -86,7 +86,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 8a49694013..d8f87430d6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index b15a52c55a..4227f95880 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index 6c63704b03..f05143e297 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 8664317266..504ecc0a7f 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 35b96c2a32..4d7b9c1e7d 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -103,7 +103,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896691; cv=none; d=zohomail.com; s=zohoarc; b=dQpULStB5MX97hJSWmR3mm793YCWy/IbYAo25cV0dUz39SQnFQa7tD8AFfdkbvIjyUT+ZUCSUr3ajOsFC2oOD2WhZ8Rj/4tkcEX5AYlHLwKigJaxLrHj/pYFXxPBo4ezG8qZFgbcuKEtlEuJNRDwhX/mt2r8VN7h83vVsnTaNNM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896691; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dJYNZaMfjQeWls8ir/6D9gGDoyMayFJPCCCWFbpoERw=; b=TOMlM5bfQZkO23z/Fozc2k4nkTY76adhk7XrybXHQ1ensDiA8BtBmrZ02q1rUVOoGF3XSr+xshbrmFoYhVr8OPhTmhiLeoJklF7vqnqKNKJ7GAU7BQuMz8pCy//efUWa0AgmBq/IJQAaTEBaxw1hk7eAx+MtTMbERyZ4oEumypE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896691604157.5051037111191; Tue, 8 Nov 2022 00:38:11 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-253-GPAklLpxNSmO0GorbSBgtQ-1; Tue, 08 Nov 2022 03:30:33 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D1951066147; Tue, 8 Nov 2022 08:30:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 494BC4B3FC8; Tue, 8 Nov 2022 08:30:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C8D1E194707C; Tue, 8 Nov 2022 08:30:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B89231946A6F for ; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8FA4D4C816; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3425C10197 for ; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896690; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dJYNZaMfjQeWls8ir/6D9gGDoyMayFJPCCCWFbpoERw=; b=ZFyutRiYk9Re1OkcW/dDxPZ/qcTUmGJ4S/etQKPmnna1xU6AoFoOeTSulyhEntCA6vC9Yo Q2iii262v/S+7dwJxys3NGeziAOsc7kfjyI0rOa1uZXA1FVhsPu49RCXT9mp2ZGd0MXh7k sxPYA6LbDxJp3JFbLfiAit62QccJAGE= X-MC-Unique: GPAklLpxNSmO0GorbSBgtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 45/48] qemu: Retire QEMU_CAPS_DISK_SHARE_RW Date: Tue, 8 Nov 2022 09:29:47 +0100 Message-Id: <86883b2de6c637fba75e81d34f868aeca5021bdf.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896692032100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6b9b4e96de..6520f52c40 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -451,7 +451,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "numa.dist", /* X_QEMU_CAPS_NUMA_DIST */ =20 /* 275 */ - "disk-share-rw", /* QEMU_CAPS_DISK_SHARE_RW */ + "disk-share-rw", /* X_QEMU_CAPS_DISK_SHARE_RW */ "iscsi.password-secret", /* X_QEMU_CAPS_ISCSI_PASSWORD_SECRE= T */ "isa-serial", /* QEMU_CAPS_DEVICE_ISA_SERIAL */ "pl011", /* QEMU_CAPS_DEVICE_PL011 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0a62765a04..ead8ef45d9 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -430,7 +430,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_NUMA_DIST, /* -numa dist */ =20 /* 275 */ - QEMU_CAPS_DISK_SHARE_RW, /* share-rw=3Don for concurrent disk access */ + X_QEMU_CAPS_DISK_SHARE_RW, /* share-rw=3Don for concurrent disk access= */ X_QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=3Discsi,...,p= assword-secret=3D */ QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */ QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896745; cv=none; d=zohomail.com; s=zohoarc; b=Cp1fXxsYT33/rGqNx+5u9sQH7zXtyBH9LUI61rBT06X7wrLlQnqXkrG1XdfS6KF7hMPXwctZMYmaUByxXB3/ELI+k9crF5OS/kKjOu9Z8lUuypVG9PDTtg5G91zayd0McO86qcI7NKNRq0EwPjZ8iIYap2rNsibv4DsBIiPyDr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896745; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4XEk9HN6q3oW6deA7tMHQpbzqi2t+ykueITIG2RBeB0=; b=kFLnoHF9k3BBMvkEBdsDnm6ChrN86NdZPwjpCZoUCncbiSgRTwYi1kj+FZ6ONxv8fj0LHZ4BjBcCBkU/GYvoM/68a74YuvThXHlb0OYx+7AsDA7qFvl+d1gf7OpgSxNV1NAkWqXrDRu8pEJNhZZiwYl7wdsu6nU9N+QXJ4t+5S4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1667896745514109.73984546284044; Tue, 8 Nov 2022 00:39:05 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-280-v67lZUpkOLGDovpt8jwBzA-1; Tue, 08 Nov 2022 03:30:36 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BFD9B2A59555; Tue, 8 Nov 2022 08:30:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FC1F111F3BB; Tue, 8 Nov 2022 08:30:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3CE9E194704B; Tue, 8 Nov 2022 08:30:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 514EA194704A for ; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3240C35429; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id CABE04EA4D for ; Tue, 8 Nov 2022 08:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896744; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=4XEk9HN6q3oW6deA7tMHQpbzqi2t+ykueITIG2RBeB0=; b=ZpL5Zh2oa3Z4hObUB8dA4k5lbTqCFMH2+/kMNfeT6htsNH1vL+NpbK12mqlTZrQyThS7nr Ved6GI3aEaC59RubSHxA40ZE/qUS1Ol94RJ+qY3Hc8RYOBr907J/jIhZAZDGV2ouaJZQMi 9PbTQ0o/gBdS/8pyQB3hKGePxJFnq/s= X-MC-Unique: v67lZUpkOLGDovpt8jwBzA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 46/48] qemu: Assume QEMU_CAPS_DISK_WRITE_CACHE Date: Tue, 8 Nov 2022 09:29:48 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896746280100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Introduced in QEMU's commit of v2.7.0-rc0~32^2~5 the .write-cache attribute of virtio-blk dvice is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. The change in some .args is justified, because the qemuxml2argvdatatest runs these test caseses with very minimalistic set of capabilities, that's nowhere near real life scenario. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 3 +-- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/video-device-pciaddr-default.args | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f775170e32..3236196c14 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1900,8 +1900,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->cachemode !=3D VIR_DOMAIN_DISK_CACHE_DEFAULT) { /* VIR_DOMAIN_DISK_DEVICE_LUN translates into 'scsi-block' * where any caching setting makes no sense. */ - if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_LUN && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_WRITE_CACHE)) { + if (disk->device !=3D VIR_DOMAIN_DISK_DEVICE_LUN) { bool wb; =20 if (qemuDomainDiskCachemodeFlags(disk->cachemode, &wb, NULL, diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index c0ba064bec..242639591c 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr/.config \ -device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1.1 \ -blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node= -name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-r= ead-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,share-rw=3Don,drive=3Dlibvir= t-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,share-rw=3Don,drive=3Dlibvir= t-2-format,id=3Dvirtio-disk0,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop= .iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ -device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tes= ts/qemuxml2argvdata/video-device-pciaddr-default.args index e216aacc64..9b421c012d 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qe= muxml2argvdata/video-qxl-device-vgamem.args index 1332f798da..14b3931140 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2a= rgvdata/video-qxl-device.args index dc679b7aa5..570bb64323 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/test= s/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index 42de87528c..1715ee0cf7 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemux= ml2argvdata/video-qxl-sec-device.args index c55e3eb9db..6140fffa72 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qe= muxml2argvdata/video-vga-device-vgamem.args index 8d1108216e..c9ac626b77 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2a= rgvdata/video-vga-device.args index 1a832df4cb..10f3b38e09 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device VGA,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qe= muxml2argvdata/video-virtio-gpu-device.args index 1dd818f5fc..2c31631572 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qe= muxml2argvdata/video-virtio-gpu-sdl-gl.args index d4ab9fac16..adeab6d53d 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -display sdl,gl=3Don \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/= qemuxml2argvdata/video-virtio-gpu-spice-gl.args index f198d4da8b..60862a48d7 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qem= uxml2argvdata/video-virtio-gpu-virgl.args index 140bee6187..87c79a4865 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2a= rgvdata/video-virtio-vga.args index 704a6334b0..f0352d7583 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896334; cv=none; d=zohomail.com; s=zohoarc; b=KUkOYq+nwn2T2pDSI+8JM3yyNLOqoqlcBwDezTRYvbQ22bnbw9wGaGgqWXSigg3ojb9v+T25SaiY3InfsX92/5DuEJUuy4XKXUrS+e9smY0mpfxacn7UidI0FbFq7Y00ghbCv2AUoegRJ6cH/5e19mA+61o8rdoVgHytd1/cjBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896334; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SPcgQtt0UIvjbhbt+RGvUu4p5lxWarT3fryVa2nlRhM=; b=iwlWMBfg+/LVsVceBUYWFRKvw/IJFSfjDYi1iKe8UFGuSP2EMmAeadVvP14+yLOUTgazircyr36W8pv0lGIw+p661lgnN6DOfrNsMU6lkajJ49B+RE3OiPflrUiX0Fw61Bn6dI7wEc6Q72mabsm6fg4bhb5ql2TGEXoEVrq1820= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896334287310.68924531349444; Tue, 8 Nov 2022 00:32:14 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-367-W5xFaEQsPzOBdHkCTo1_gQ-1; Tue, 08 Nov 2022 03:30:38 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3E0B41C08971; Tue, 8 Nov 2022 08:30:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 252C340C2064; Tue, 8 Nov 2022 08:30:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0B5341946A51; Tue, 8 Nov 2022 08:30:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E734B1946A45 for ; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C823B4C819; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B64A10197 for ; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896333; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=SPcgQtt0UIvjbhbt+RGvUu4p5lxWarT3fryVa2nlRhM=; b=R1OtbtB3i1wzkqVFRdxflYzsykhbXLEeZ/ljxhNFmXAsCMSOPqFF5vMc4/xo+TbYiocFV2 LZJkldvgUHgCeCXJFPgKCGaGZZ+LiA+GsHhv73UafqeGf5U7omSE6jxcprET7XoLja2m1/ egP7LXIeEvH+rjiBRme2wYHENh2VFco= X-MC-Unique: W5xFaEQsPzOBdHkCTo1_gQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 47/48] qemu_capabilities: Stop detecting QEMU_CAPS_DISK_WRITE_CACHE Date: Tue, 8 Nov 2022 09:29:49 +0100 Message-Id: <783f51699d41cfa281e16cfbc906d4d088512184.1667896101.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896335393100002 Content-Type: text/plain; charset="utf-8"; x-default="true" All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 4 ---- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6520f52c40..0b267e4f30 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1416,7 +1416,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONVal= ue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[= ] =3D { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSC= SIDefault }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, }; =20 @@ -1449,13 +1448,11 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCa= psDevicePropsVfioPCI[] =3D { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[]= =3D { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[]= =3D { { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = =3D { @@ -1470,7 +1467,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsUSBRedir[] =3D { =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage= [] =3D { { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; =20 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = =3D { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index d36f3ff6ab..1f42ff6cf9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 7afd35f5ac..047abcee8c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 92486c7a4b..0baeeccb9b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -46,7 +46,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 04e8fc40dd..438927aad0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 551eded1a5..ff989e0878 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 32db5ac3dd..e336e71831 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -79,7 +79,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 0b50236f53..4ce2594557 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -78,7 +78,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index 89cc1e4e70..bf32de2ee4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -108,7 +108,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 7ba8152589..a791a84940 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index fef56fadf1..f8c64b4cc2 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -107,7 +107,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index fe46995758..7c8b98b600 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -80,7 +80,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 239ce68f1e..88807f0c3c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 241bc4ebc1..1555b5bcb7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -76,7 +76,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index efe85e77e2..4433caa492 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index df4a2cb5a8..4c34fcef02 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -107,7 +107,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index d3e37172bc..6f33a827b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -81,7 +81,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index a020e56a64..f269a8935f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0.x86_64.xml index d3255b1eeb..ae511fdb96 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -106,7 +106,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index d2f871138d..72af7d3f01 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 67f2cf482a..10e67e4c5a 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -88,7 +88,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 318c962299..698eb14698 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -77,7 +77,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index c859553038..ef1c66a5d7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 1707aef39e..a59a91a576 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -88,7 +88,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index d8f87430d6..e8c3886d14 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -83,7 +83,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 4227f95880..12980ffcf6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0.ppc64.xml index f05143e297..2cd47a7770 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -82,7 +82,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0.x86_64.xml index 504ecc0a7f..e9210dfd44 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0.x86_64.xml index 4d7b9c1e7d..56d1ff5fa9 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -105,7 +105,6 @@ - --=20 2.37.4 From nobody Fri Apr 26 07:31:35 2024 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1667896351; cv=none; d=zohomail.com; s=zohoarc; b=Ps4dEUsBpuSAUGWN8Hh4I48zJxfLo7m2xbF9GU7wFVxOmpbBnfu2BUEgKUyjrJzHCHmspJUFpwWezuLectb9PptQHPvDLBPXnIBj4Pjr2t7oJR6FeyYpRXFBfLPXfKYpe1eZO2pkfU+AxvO5XCmtp1rAXmEAtZ6ZFKWSEiKJp5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667896351; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hbqNnKXfdOIIz6qOZn0nWA68eF8ZWOY7eUc4EFOSPo0=; b=fE9RHizR+7BXe4Qgq4QjZwIGTkwq/9L3BEdxzScfNS3mXDbH5tNeQhCGMklLrew4xbCjW8MT645Hz5iADnJb4MQMCIKE0/kkMUWSre/5vwhbSuoqqo6CVky9St5KHUnKZzr8n0kBxxh0c2dA7DApn8MUp+6t3ra6g6EDbiAjtsc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1667896351215883.3845551236053; Tue, 8 Nov 2022 00:32:31 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-503-hKfjR7drOQGT25b7Yl55kQ-1; Tue, 08 Nov 2022 03:30:36 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0D0CA1C08983; Tue, 8 Nov 2022 08:30:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECF6D492B05; Tue, 8 Nov 2022 08:30:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 986DC1947073; Tue, 8 Nov 2022 08:30:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 87B281947058 for ; Tue, 8 Nov 2022 08:30:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6A13110197; Tue, 8 Nov 2022 08:30:22 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EC4D4EA4A for ; Tue, 8 Nov 2022 08:30:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667896350; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hbqNnKXfdOIIz6qOZn0nWA68eF8ZWOY7eUc4EFOSPo0=; b=NJ6dt9yf6U3Nm59B3W2Si3tdh2Iql819xjS1HlQbAnBtYtCLWn3HuKECRHI8VhtCcFDELY t5CCdqtYUbzo369+1ukp7KUuAfzBies/ZmnMXm1mWJtrTmVJtxH5RFPchVe760tePttEYs 571udYXRExFqgDlT4OGUxpdwjeZRoR0= X-MC-Unique: hKfjR7drOQGT25b7Yl55kQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 48/48] qemu: Retire QEMU_CAPS_DISK_WRITE_CACHE Date: Tue, 8 Nov 2022 09:29:50 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667896351406100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0b267e4f30..4c301c3638 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -469,7 +469,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */ "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */ "query-cpus-fast", /* X_QEMU_CAPS_QUERY_CPUS_FAST */ - "disk-write-cache", /* QEMU_CAPS_DISK_WRITE_CACHE */ + "disk-write-cache", /* X_QEMU_CAPS_DISK_WRITE_CACHE */ =20 /* 290 */ "nbd-tls", /* QEMU_CAPS_NBD_TLS */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ead8ef45d9..c79bc7cd24 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -448,7 +448,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */ X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */ X_QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ - QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cach= e param */ + X_QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-ca= che param */ =20 /* 290 */ QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */ --=20 2.37.4