From nobody Sat Feb 7 08:13:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; 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=1627033469; cv=none; d=zohomail.com; s=zohoarc; b=DsjzpqEUu5D6CA+hDX+32emoUL4/w1BmWU9EHyS5o2NThgqTCGv74dF1D//HIvFzMHh8S3TpIvK2CwI8kVHSXRepTphjBYmafIcqDqLQzVF7Dr85mKAynkJ6IOUw0kieTStEi6eUbktdclYpLG988W19ZbXMxe/3mll65/WodDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1627033469; 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=VoTEjNeew88KOf3TQB9hh5LufjiKydD3NRXb4uKbBvQ=; b=XBjLIP5r2Wgi9/dO/Ls/R9gCGfuiJboLEFyfkmXHr0/6nDHR39es882VHQRpUYZTj1vmv1KgJP5QFGBE+kMXQ4E5DkS8dEKonBzSObD/PtHvB2Yf4JyrWHFGiRv48z7U9mroE7Pch5gehbLv7tSIfBiWixHSevjhVcV7buNPwhs= 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 1627033469933955.8695961222511; Fri, 23 Jul 2021 02:44: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-26-jN7qK_S9MGqTH-jCaY9gig-1; Fri, 23 Jul 2021 05:44:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 908A4192CC43; Fri, 23 Jul 2021 09:44:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 718855D9D5; Fri, 23 Jul 2021 09:44:22 +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 3B7FE180BAB3; Fri, 23 Jul 2021 09:44:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16N9i6sJ022898 for ; Fri, 23 Jul 2021 05:44:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id E21A45C230; Fri, 23 Jul 2021 09:44:06 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 544B25C1D5 for ; Fri, 23 Jul 2021 09:44:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627033468; 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=VoTEjNeew88KOf3TQB9hh5LufjiKydD3NRXb4uKbBvQ=; b=Gj1D00qZWosa9U25QgmXiz4zS4tOQFXsOnmUDyRgXdLmMmACqiIdKB8eZlaCrPJO4/HR6P T2bLS+owh7vpRsBwXCjqqLdIFLtQjUkOWcTdVrGdjJpzA5Xf4vr9yNCvlYcaBWse+DxyyZ A303YjsQFQfkTD24swB5cKFDrXMOkZQ= X-MC-Unique: jN7qK_S9MGqTH-jCaY9gig-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/6] qemuBlockReopenFormatMon: Adapt to new argument format of 'blockdev-reopen' Date: Fri, 23 Jul 2021 11:43:55 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.14 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) X-ZM-MESSAGEID: 1627033470167100001 Content-Type: text/plain; charset="utf-8" This function was added prior 'blockdev-reopen' being stable and qemu changed the arguments to actually contain an array of block node definitions to reopen. In our case we are just changing between read-only and read-write modes and thus we can keep operating on the nodes one-by-one. Modify the code to add the wrapper array. Signed-off-by: Peter Krempa --- src/qemu/qemu_block.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index c96be8b52d..d9b876e5c1 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3304,8 +3304,18 @@ qemuBlockReopenFormatMon(qemuMonitor *mon, virStorageSource *src) { g_autoptr(virJSONValue) reopenprops =3D NULL; + g_autoptr(virJSONValue) srcprops =3D NULL; + g_autoptr(virJSONValue) reopenoptions =3D virJSONValueNewArray(); - if (!(reopenprops =3D qemuBlockStorageSourceGetBlockdevProps(src, src-= >backingStore))) + if (!(srcprops =3D qemuBlockStorageSourceGetBlockdevProps(src, src->ba= ckingStore))) + return -1; + + if (virJSONValueArrayAppend(reopenoptions, &srcprops) < 0) + return -1; + + if (virJSONValueObjectCreate(&reopenprops, + "a:options", &reopenoptions, + NULL) < 0) return -1; if (qemuMonitorBlockdevReopen(mon, &reopenprops) < 0) --=20 2.31.1