From nobody Mon Feb 9 01:31:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1603719029; cv=none; d=zohomail.com; s=zohoarc; b=klznnNbSQ3z/25PkKS9RX6p6grQLNHN/xLKrLSShmsnzX2ZL5NHXnRG3S/5L6jJKlGFpcpB9YYJ5C0OgXpt3kvNuhVd/D33P88hkBPKGcUhoup7Ow0GF39bjsfVhIjFo3kscFpAD62DXbrZr7E8no8/mZazi66a0EN6MOfGiMuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603719029; 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=0lV4uJj07KZRXZUqxovh9bMY6C4WgKjN5NAwohYO2lw=; b=gEc2VbsOC0qVioufpPYQvDFQwBSXOWGuCdrgyieUNvKQnCtyg5Qcler6d8kMm3K+KJA3qd33gjMpa1Jseh4Fr0RU8C0N0Kf/e/3IRPIU8gIDHVIoIFFmpbekl4lm6kFNrjcxCHPSADKxiFL4gSlbIgQBsu9lM76966RuHr9GTS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1603719029390464.55736001757896; Mon, 26 Oct 2020 06:30:29 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-0ZbdOhKONuyRUB2qNbE4YA-1; Mon, 26 Oct 2020 09:30:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7ABFA5720E; Mon, 26 Oct 2020 13:30:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05A6260BF3; Mon, 26 Oct 2020 13:30:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0AED192F21; Mon, 26 Oct 2020 13:30:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09QDJaeU031295 for ; Mon, 26 Oct 2020 09:19:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB2051002D46; Mon, 26 Oct 2020 13:19:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 150DB1002D42 for ; Mon, 26 Oct 2020 13:19:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603719026; 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=0lV4uJj07KZRXZUqxovh9bMY6C4WgKjN5NAwohYO2lw=; b=D3TwfaY+Xf3mNrxQMlrfSa7xe4TW6jG9QNccDBHbodVMLs/qgeVw41K9DvLJRPYnzsT3WE MSyIdpN5NlNFp5Md8BhuwetMN19C9LkmbO28bP3MNbdkIwyrhEXhrxBXyy1hqmOFneehMb JsliD0CHECx83aWLDBpCWgELpfCcW9E= X-MC-Unique: 0ZbdOhKONuyRUB2qNbE4YA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] qemu: capabilities: Disable detection of QEMU_CAPS_BLOCK_EXPORT_ADD Date: Mon, 26 Oct 2020 14:19:28 +0100 Message-Id: <893bab167d23e8f26f0b030030801a35e5a39a8f.1603718080.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We use the capability to switch to using 'block-export-add' in the upcoming qemu release instead of the at the same time deprecated 'nbd-server-add'. Unfortunately qemu wants to change the interface of 'block-export-add' before the release. Since we've tried to stay up to date and added the code before it was written in stone, we need to disable the use of the new interface for the upcoming libvirt release so that we don't have a version of libvirt which would not work with the upcoming qemu version. Remove the detection of 'block-export-add' until we are more sure how the qemu interface will look. This patch partially reverts commit adb9f7123adb94645 Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a67fb785b5..78be372a0c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1172,7 +1172,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "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 }, }; struct virQEMUCapsStringFlags virQEMUCapsMigration[] =3D { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 7e07ac486d..63e947c1b3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -246,7 +246,6 @@ - 5001050 0 --=20 2.26.2