From nobody Mon Feb 9 05:20:59 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=1631177450; cv=none; d=zohomail.com; s=zohoarc; b=E29ZEp0PHtkdHisldLZeDFV8rySuEWz+Wsi9aUwDRyFPEN+LZ8F2TmNWcYt+FFaY+2PWu2Xvo+Lttd/0N4Rk+LKlSRDkyTTVvFx0Jk8db7uFxezYqqUBwkJLgy3wo/OQRzlWjmIq/alWp9fYmuoHWEXO1MHTc8eNhhEopMoqlVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631177450; 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=/luQhag0BnCUK57OW/h5IqOUhcoWmKltWMOb+eYnnlA=; b=iab65QQXJvseZVWjbHuVp63/m7dzh4mUz2upRoj1E/eYe4EvWcFw43M0LVGdwjKyWLnUQSgZBCQk8RbGtG8fNO5ixR39Yd/1YA+4kj5iI9G744b1KXM9czsUqF2wwpA6J76TAGMDZ+zKzCgKn5nfq7w0llF6wjouo2JaFy863Vg= 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 1631177450784681.0294820135437; Thu, 9 Sep 2021 01:50:50 -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-558-F2st_ePeOvSty4NCnabj4Q-1; Thu, 09 Sep 2021 04:50:48 -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 1AB0F101AFA7; Thu, 9 Sep 2021 08:50:42 +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 E313C19C79; Thu, 9 Sep 2021 08:50:41 +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 B367B1832DF2; Thu, 9 Sep 2021 08:50:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1898odpm030782 for ; Thu, 9 Sep 2021 04:50:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8F15926DEC; Thu, 9 Sep 2021 08:50:39 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4E8226E40 for ; Thu, 9 Sep 2021 08:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631177449; 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=/luQhag0BnCUK57OW/h5IqOUhcoWmKltWMOb+eYnnlA=; b=JdKJL1XKp/vwfVtzM3zq9CzqjGobiagiCYR0IEhv3wwhpB777lWrqKNlKbOZghZOh8bXY5 AB/Um/1HQU+8Rhj6km4tl2NiheKLp14Iwa6opfsg8rrQ1T6nr7oy/UqT9eI3wOG08UbLMr g+D+VkNZGndG8kLyust4fP/Vo+85NQA= X-MC-Unique: F2st_ePeOvSty4NCnabj4Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 17/24] virstoragetest: Don't rewrite the 'qcow2' image Date: Thu, 9 Sep 2021 10:49:17 +0200 Message-Id: <11133815fa813635a195af8176983cbc9bcfbb17.1631177237.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 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: 1631177451999100001 Content-Type: text/plain; charset="utf-8" Create it with the appropriate backing file path rather than using another instance of 'qemu-img rebase'. Signed-off-by: Peter Krempa --- tests/virstoragetest.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 1ee7bb5230..9a7905e28d 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -132,18 +132,15 @@ testPrepImages(void) /* Create a qcow2 wrapping relative raw; later on, we modify its * metadata to test other configurations */ virCommandFree(cmd); - cmd =3D virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); - virCommandAddArgFormat(cmd, "-obacking_file=3Draw,backing_fmt=3Draw%s", - compat ? ",compat=3D0.10" : ""); + cmd =3D virCommandNewArgList(qemuimg, "create", + "-f", "qcow2", + "-F", "raw", + "-b", absraw, NULL); + if (compat) + virCommandAddArgList(cmd, "-o", "compat=3D0.10", NULL); virCommandAddArg(cmd, "qcow2"); if (virCommandRun(cmd, NULL) < 0) goto skip; - /* Make sure our later uses of 'qemu-img rebase' will work */ - virCommandFree(cmd); - cmd =3D virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", - "-F", "raw", "-b", absraw, "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) - goto skip; /* Create a second qcow2 wrapping the first, to be sure that we * can correctly avoid insecure probing. */ --=20 2.31.1