From nobody Tue Apr 30 03:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1589216159; cv=none; d=zohomail.com; s=zohoarc; b=CQRIxVE/9vjqFx0UFamyYmdzcZaHaV4ToyOmBz/KMEDQ5kJL4lsFWFKn2htqN2K7eeN0sK7b1uuWhErKg3I/Lv15uZOhLwdgVB+KgxjYC6O0UaOLFpIO9Xy+aQYkMZCBrKA93szOAJwtqOYKwZUA2dmCbZf70CrYc1FJ0Bk6Amk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589216159; 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=gPx3YDAhZWrFF7890VdnpRmnDVgdmS2F/06VSYnGMLM=; b=Be8QqtuSR8QkleZt//QhjdLRNtmKpYlMxHhG89NDciYrDUNlC1pTQWawIcX6DTB3GgojWOwn7J4L1D+buQbkzfkDfTYDWnbXxa7ig7/x1qDHRHW2uBIqeizIwgmWAmMhu0PgR97lcUSlfM4+Ka1ORWeG83t9p9TYKne7S3U89G4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1589216159664491.3530277297598; Mon, 11 May 2020 09:55:59 -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-426-wjuI4DRqO2OFMUvbVU6S0A-1; Mon, 11 May 2020 12:55:54 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 80B6CEC1A0; Mon, 11 May 2020 16:55:49 +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 41D507527E; Mon, 11 May 2020 16:55:49 +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 C54264E561; Mon, 11 May 2020 16:55:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04BGtlCQ016610 for ; Mon, 11 May 2020 12:55:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id D6D8B610AF; Mon, 11 May 2020 16:55:47 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49A0360C05 for ; Mon, 11 May 2020 16:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589216157; 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=gPx3YDAhZWrFF7890VdnpRmnDVgdmS2F/06VSYnGMLM=; b=PqfEyU17ztOqq0wIY7NdJveaxFZU0dMEmcY+HaEQvxsFQRqko1DaXgfUmcVAf3/T9oXWBg lYmrKVLeraPDGODPv4qfxHYIMM9igOcjkT1F6v6VNzxupUOgQcVuhTd60X54KMRUimlMGH iNfckReNExe9IfX2kCc0+IAm7WCqLhk= X-MC-Unique: wjuI4DRqO2OFMUvbVU6S0A-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/5] storage_file: create: Create new images with write permission bit Date: Mon, 11 May 2020 18:55:38 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.11 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" The 'Create' API of the two storage file backends is used only on code-paths where we need to format the image after creating an empty file. Since the DAC security driver only modifies the owner of the file and not the mode we need to create all files which are going to be formatted with the write bit set for the user. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/storage/storage_file_fs.c | 6 +----- src/storage/storage_file_gluster.c | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c index 0d3f134765..8aafd58992 100644 --- a/src/storage/storage_file_fs.c +++ b/src/storage/storage_file_fs.c @@ -84,13 +84,9 @@ virStorageFileBackendFileInit(virStorageSourcePtr src) static int virStorageFileBackendFileCreate(virStorageSourcePtr src) { - mode_t mode =3D S_IRUSR; VIR_AUTOCLOSE fd =3D -1; - if (!src->readonly) - mode |=3D S_IWUSR; - - if ((fd =3D virFileOpenAs(src->path, O_WRONLY | O_TRUNC | O_CREAT, mod= e, + if ((fd =3D virFileOpenAs(src->path, O_WRONLY | O_TRUNC | O_CREAT, S_I= RUSR | S_IWUSR, src->drv->uid, src->drv->gid, 0)) < 0) { errno =3D -fd; return -1; diff --git a/src/storage/storage_file_gluster.c b/src/storage/storage_file_= gluster.c index f389a94437..608f93d2f6 100644 --- a/src/storage/storage_file_gluster.c +++ b/src/storage/storage_file_gluster.c @@ -152,13 +152,9 @@ virStorageFileBackendGlusterCreate(virStorageSourcePtr= src) { virStorageFileBackendGlusterPrivPtr priv =3D src->drv->priv; glfs_fd_t *fd =3D NULL; - mode_t mode =3D S_IRUSR; - - if (!src->readonly) - mode |=3D S_IWUSR; if (!(fd =3D glfs_creat(priv->vol, src->path, - O_CREAT | O_TRUNC | O_WRONLY, mode))) + O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR)= )) return -1; ignore_value(glfs_close(fd)); --=20 2.26.2 From nobody Tue Apr 30 03:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1589216168; cv=none; d=zohomail.com; s=zohoarc; b=h8SdhZ8TCaJu7TINqdXVId8RfTvSFuzapC3dR3kgHqykgevC1Dm4/HwJaEgAJUkAIkGrF1hGLcn1WuYMhESyJisniIA1eG2AJ3IU8Ss2TKR+M9NZYIqEEDzyipPbqJOp88AAQCWTu60xH+I3t4td+wMWIhFuNJZfuiHCcq/4ZrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589216168; 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=jtcNpLoBrCG7s4spq1H4LHQrqNibve/+rlGEP0RlmKU=; b=IfJvK4e3CncfYb3PcQPItgL4B7a3WEF41BJbq/k8yLrgplYtJ8a56XsccZAPXTKyRHbRbKtErIVVrv9v7+rHkXetCe7HVDIVPMAC/to6zHsq26Q9FYSQQ1yUPet7LG/K2UZW5uCaZrXEwKrXEl/VQb+b+z/NshbrQidfkyvC7NI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 158921616895919.009000108878354; Mon, 11 May 2020 09:56:08 -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-44-GOBQVdI3Mjalt51M0y3XBQ-1; Mon, 11 May 2020 12:56:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B6E778018AB; Mon, 11 May 2020 16:55:54 +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 959EA34203; Mon, 11 May 2020 16:55:54 +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 64E264E587; Mon, 11 May 2020 16:55:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04BGtp7h016628 for ; Mon, 11 May 2020 12:55:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5B97660BF1; Mon, 11 May 2020 16:55:51 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB73D61988 for ; Mon, 11 May 2020 16:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589216167; 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=jtcNpLoBrCG7s4spq1H4LHQrqNibve/+rlGEP0RlmKU=; b=P32iirz9whvAzPC6frBn3p7aJO9L03ad0v7uUneLA5hS951ybfPVuio/XhPXrs+QDY5iMv fzlJP6T9RUab3hr1YW9V00UnhjdHTz9K00XF4abxJp2D5nEwazRsaxOeXJDDoXRikY8lhJ sQW/x4yo1l57ADQGFGuuvZSCNbKSXZ4= X-MC-Unique: GOBQVdI3Mjalt51M0y3XBQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/5] qemuBlockStorageSourceCreateFormat: Force write access when formatting images Date: Mon, 11 May 2020 18:55:39 +0200 Message-Id: <2c040f2362bfc7b08675685e7fadac36480e0a4a.1589216000.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.84 on 10.5.11.23 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 need qemu to be able to write the newly created images so that it can format them to the specified storage format. Force write access by relabelling the images when formatting. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_block.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index d32277d7fd..6f9c7071c9 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -2671,6 +2671,12 @@ qemuBlockStorageSourceCreate(virDomainObjPtr vm, return -1; } + /* grant write access to read-only images during formatting */ + if (src->readonly && + qemuDomainStorageSourceAccessAllow(priv->driver, vm, src, false, + false, true) < 0) + return -1; + if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) goto cleanup; @@ -2697,6 +2703,12 @@ qemuBlockStorageSourceCreate(virDomainObjPtr vm, asyncJob) < 0) goto cleanup; + /* revoke write access to read-only images during formatting */ + if (src->readonly && + qemuDomainStorageSourceAccessAllow(priv->driver, vm, src, true, + false, true) < 0) + goto cleanup; + if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, asyncJob) < 0) goto cleanup; --=20 2.26.2 From nobody Tue Apr 30 03:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1589216163; cv=none; d=zohomail.com; s=zohoarc; b=Vhy31YBSJgiZVBG4mLxxZ3exWmtMjqq/NuOl/wb+ovOH5JocekLO6PCmGXSecT+7fj6LohaWiaWqY21ErSda+n61jUFQ2nbQZbURkyWqkn5ppGbb3eFL2apF47tC1TY94x/ronMCUxPcMiThBvfw2dJHZZTfipMYgkUEiReXcGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589216163; 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=TIGB9YDcy/5yTGvkZQWQeGzU7geZ9Sov2HNJnzGiASY=; b=MieEjWR2Us/F/erETXjmdZ6bvAQ2viT+bTV1zxMqC5NqDfHeAYAK+bBmpM6+xUPeCHSCpLWWKcZc2BKYeSe7ICG4a52sBDMi3RFEh+UFuDn3XRDYOM/sZopEvlQi8RwLyNXJe8QBu4J7iwn9g3puGdIjtRcfL4ybZJzj7tO5J7Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1589216163640342.13587480975514; Mon, 11 May 2020 09:56:03 -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-177-0Xa4KfyNMGiv8lza1VF13Q-1; Mon, 11 May 2020 12:56:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C31CF100CCC6; Mon, 11 May 2020 16:55:54 +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 A1B0467642; Mon, 11 May 2020 16:55:54 +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 71B021809554; Mon, 11 May 2020 16:55:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04BGtqES016633 for ; Mon, 11 May 2020 12:55:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5049B60BF1; Mon, 11 May 2020 16:55:52 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3A9F60C87 for ; Mon, 11 May 2020 16:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589216162; 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=TIGB9YDcy/5yTGvkZQWQeGzU7geZ9Sov2HNJnzGiASY=; b=Zvriqbum5gjYlVsQO+NhNy98S2xXPfzZAGL1tRCnt8sb9I4ClEFAlh6Xtmqx6aiTWnkzxG UJ31h9uLTiBRKUdTaF5xLEVkvO0PmbsmPB6cKedNt1ksUteVtdsh7t4zQAf2rT51mdTgeX btt/nyq0ejsyzJg8SKobdXOKUYJjl30= X-MC-Unique: 0Xa4KfyNMGiv8lza1VF13Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/5] qemu: snapshot: Allow snapshots of read-only disks when we can create them Date: Mon, 11 May 2020 18:55:40 +0200 Message-Id: <3fd88826bd7c45e5e6e133c6f69b4cb95892897e.1589216000.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.13 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" With -blockdev or when reusing externally created images and thus without the need for formatting the image we actually can support snapshots of read-only disks. Arguably it's not very useful so they are not done by default but users of libvirt such as oVirt are actually using this. https://bugzilla.redhat.com/show_bug.cgi?id=3D1832204 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- 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 1c7c87128d..29d964f1e8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14683,7 +14683,7 @@ qemuDomainSnapshotPrepareDiskExternal(virDomainDisk= DefPtr disk, int err; int rc; - if (disk->src->readonly) { + if (disk->src->readonly && !(reuse || blockdev)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("external snapshot for readonly disk %s " "is not supported"), disk->dst); --=20 2.26.2 From nobody Tue Apr 30 03:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1589216169; cv=none; d=zohomail.com; s=zohoarc; b=CsrQR1oC5/VajyCiGAa7xdYzsjLfg6JP53iqo/ma8/D530dT93z2pkSnzbuvzfgNIw8ta5xr1gLQZaVax7cceHxNcrDaL6o32sNOVoE+9Kx26C31QtVBfRcj5znjXBu2bGn3rnW4NfG27ym1jvf8zKKiUAs8QgTa2X3SUsnUuC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589216169; 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=Jk5oSZ0TpLikfbOiHLKuBY4o9zlk+6zC0UjSvA48NAM=; b=Od0V8CgVeP5fs418smvJzzfcUgrfAlLorhCM8jSwSN880ESKQMKQEMR3rkfoKbG1Zb0ImY5/zgkT98i5JBsvrb01WAG8d1CVUQFjmRefsUFP4tbsvtxHKnnAyKtxwvZZqB+ovDYKxytPgD3ImpBmJbAQuhD3sF/RxC3OooghrbI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1589216169765599.3231281595631; Mon, 11 May 2020 09:56:09 -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-257-yFqnnt0aNUC9jIt3eimrCQ-1; Mon, 11 May 2020 12:56:05 -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 2F4B98018AC; Mon, 11 May 2020 16:55:57 +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 0E31F60C05; Mon, 11 May 2020 16:55:57 +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 D57B94E981; Mon, 11 May 2020 16:55:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04BGtrni016643 for ; Mon, 11 May 2020 12:55:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3FFBE60C05; Mon, 11 May 2020 16:55:53 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFCE660BF1 for ; Mon, 11 May 2020 16:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589216168; 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=Jk5oSZ0TpLikfbOiHLKuBY4o9zlk+6zC0UjSvA48NAM=; b=ZtzZnLeDNNw0YLVM8Op33msUZegBeujfJe/DqQnMjbGv2ICoP08dGcVPOFCkS5BhEqbXWQ yqK//Dnx+bEBG8Zk9eRH/10+IySVK6WpiYy8r4uATIY++GQ4mh+xN0PhSDnXS8hYShEhUD BaWivH0lq7Z7dTCWwfUlN+nTDoDW30I= X-MC-Unique: yFqnnt0aNUC9jIt3eimrCQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/5] qemu: blockcopy: Allow copy of read-only disks with -blockdev Date: Mon, 11 May 2020 18:55:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 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" 'blockdev-mirror' requires the write permission internally to do the copy. This means that we have to force the image to be read-write for the duration of the copy and can fix it after the copy is done. https://bugzilla.redhat.com/show_bug.cgi?id=3D1832204 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_blockjob.c | 5 +++++ src/qemu/qemu_driver.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index b9eecd3f98..e51499532f 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1282,6 +1282,7 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDri= verPtr driver, qemuBlockJobDataPtr job, qemuDomainAsyncJob asyncJob) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; VIR_DEBUG("copy job '%s' on VM '%s' pivoted", job->name, vm->def->name= ); /* mirror may be NULL for copy job corresponding to migration */ @@ -1297,6 +1298,10 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDr= iverPtr driver, !virStorageSourceIsBacking(job->disk->mirror->backingStore)) job->disk->mirror->backingStore =3D g_steal_pointer(&job->disk->sr= c->backingStore); + if (job->disk->src->readonly && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) + ignore_value(qemuBlockReopenReadOnly(vm, job->disk->mirror, asyncJ= ob)); + qemuBlockJobRewriteConfigDiskSource(vm, job->disk, job->disk->mirror); qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job= ->disk->src); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 29d964f1e8..1c73604249 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18110,6 +18110,15 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, keepParentLabel) < 0) goto endjob; + if (mirror->readonly) { + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("copy of read-only disks is not supported")); + goto endjob; + } + mirror->readonly =3D false; + } + /* we must initialize XML-provided chain prior to detecting to keep se= mantics * with VM startup */ if (blockdev) { --=20 2.26.2 From nobody Tue Apr 30 03:56:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1589216165; cv=none; d=zohomail.com; s=zohoarc; b=Yjt5Nmhi2HVLhmdvEWIMHTIGYQliLIaq0l2m/aGNKrxRpX3yZOz0bvfsIKIg6m7IRfJtcipnoUScwbVNrFuaw8RypWhXwUuk2mqb0SlMucm6NFynyeAoHaSjAdUXbyHIR+bA40Z5gC6wbSuWu9OrmoIy710vrnbgOGMfucVrfnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589216165; 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=cxifLjMjpK8aJhvpmQf8QL5bnLQPUmrmbD3EEyXSyAs=; b=Um+h2MGy7WyLLHMM7vgmkmxNEmBfxgkj2G8oojZ8KoEFtyHz5tOeQu2MTE0ab3qrNiEYGyPOfO3i9kCB2F8ARd6Q7B3/exm5PDGi9WqAice61kZJGYX9zQBa11QPrup8xH54+R61tyVmecGmSkT0EWC26aJ4jlDdfjS4uSe9y20= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1589216165492559.4864790315286; Mon, 11 May 2020 09:56:05 -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-27-Bm6ua8N9N3mcYGNW9Osj3g-1; Mon, 11 May 2020 12:56:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60AF7107ACF4; Mon, 11 May 2020 16:55:56 +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 41808100EBA4; Mon, 11 May 2020 16:55:56 +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 11F3F1809557; Mon, 11 May 2020 16:55:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04BGtsIE016652 for ; Mon, 11 May 2020 12:55:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3033560BF1; Mon, 11 May 2020 16:55:54 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95F5860C87 for ; Mon, 11 May 2020 16:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589216164; 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=cxifLjMjpK8aJhvpmQf8QL5bnLQPUmrmbD3EEyXSyAs=; b=RnAGxkqs5MZLx2WPStguGpvKDt9/aEDcHHZXFouhpxY/ZGQOdO85TtN7vhb85KW+LGgfW3 RcmNl9fSqpQvQYIFPnO3KUBs4/w127o5dqaevec/7iYnNLhZqlxlMCvKlWGIqLJVNqUD7j 28BbYVxXwdkmhoubCHYdxOCb4T4utc4= X-MC-Unique: Bm6ua8N9N3mcYGNW9Osj3g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 5/5] HACK: qemu: caps: enable blockdev reopen Date: Mon, 11 May 2020 18:55:42 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.84 on 10.5.11.22 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" This patch is meant for testing. Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_monitor_json.c | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 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 + 18 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c6e36685e..c953f7d8da 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1455,6 +1455,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevic= ePropsNVDIMM[] =3D { /* see documentation for virQEMUQAPISchemaPathGet for the query format */ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] =3D { + { "x-blockdev-reopen/arg-type", QEMU_CAPS_BLOCKDEV_REOPEN }, { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUS= TER_DEBUG_LEVEL}, { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVE= L}, { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS}, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 619717eae5..fc9908db0d 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8839,7 +8839,7 @@ qemuMonitorJSONBlockdevReopen(qemuMonitorPtr mon, g_autoptr(virJSONValue) reply =3D NULL; virJSONValuePtr pr =3D g_steal_pointer(props); - if (!(cmd =3D qemuMonitorJSONMakeCommandInternal("blockdev-reopen", pr= ))) + if (!(cmd =3D qemuMonitorJSONMakeCommandInternal("x-blockdev-reopen", = pr))) return -1; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.aarch64.xml index 2e8460f829..1d20487bc4 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -169,6 +169,7 @@ + 4000000 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 978fad0ba6..d9ccdf0cd2 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -174,6 +174,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv32.xml index 4322ca3593..e87a248df0 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -170,6 +170,7 @@ + 4000000 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_4.0.0.riscv64.xml index 8df0e1eb79..fe7f3409eb 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -170,6 +170,7 @@ + 4000000 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.s390x.xml index 60d3a942be..9533961c1f 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml @@ -136,6 +136,7 @@ + 4000000 diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.0.0.x86_64.xml index 4285bec2bf..28679974d6 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -211,6 +211,7 @@ + 4000000 diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.1.0.x86_64.xml index 1c960faa6c..cb0566b0b7 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -217,6 +217,7 @@ + 4001000 diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index 418b5937a0..b05e298380 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -179,6 +179,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 796ed0a2bc..601ab732bc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -179,6 +179,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 4c0908294a..c982058412 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -144,6 +144,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 0d4d6e71d5..44f5b5b661 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -223,6 +223,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 1f743aaa11..de0635328f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -186,6 +186,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index a5f0bb538b..d1734de01e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -191,6 +191,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index e9651ca581..899dfe2bda 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -181,6 +181,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index f127f38bcc..919e9f141d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -226,6 +226,7 @@ + diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 9611549bd7..cd6b6ac45f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -226,6 +226,7 @@ + --=20 2.26.2