From nobody Mon Feb 9 02:51:51 2026 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 --- 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