From nobody Sun Feb 8 13:45:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1570484981; cv=none; d=zoho.com; s=zohoarc; b=HzHIQXCHQLzr30DvRxVhrKTY+1gZiKH7Bo82RerF5LvYT79Xsvb3PsREJlBmRR7MT4PsVzFetV41AnmWCFY3RAb5OoIO1Qy8TzBHL7i2OoF/rktg0fhD5gGZuRyOqWxjKmDvhzkNK0pFb+t74UOU8mAuilifo/eSOq7wGJwh9kU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570484981; 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:ARC-Authentication-Results; bh=HRCVMCZIT1Bc69Lneq5240E70lCr2QFF9swB2o7p9GM=; b=YXD9vmGHWZ23G9o166tZe63I+x1iP4WFHafiMMY4a1/snizswv4KAvlJUMGMf7Sb8q66h23BHRfY1lk6TAb7Zs4TVSc5qt7eNKk8NTOrlqL9+iHnNVPaZQqxeIPGiUQPyEEgWexbk3xcPcNwfisTa3FIQO7MY7Ruzp67Afe1G4k= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1570484981937740.4540590879102; Mon, 7 Oct 2019 14:49:41 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 6F5F6302C08B; Mon, 7 Oct 2019 21:49:40 +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 474125D9CD; Mon, 7 Oct 2019 21:49:40 +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 0A3C8180BA9A; Mon, 7 Oct 2019 21:49:40 +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 x97LnN4f014532 for ; Mon, 7 Oct 2019 17:49:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id D97FA5C219; Mon, 7 Oct 2019 21:49:23 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-123-156.rdu2.redhat.com [10.10.123.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D0C35C1D4; Mon, 7 Oct 2019 21:49:23 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:18 -0400 Message-Id: <49563de9ab9c17295ecc2a4894b49ae14afe901e.1570482718.git.crobinso@redhat.com> 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 Subject: [libvirt] [PATCH 04/30] storagefile: qcow1: Let qcowXGetBackingStore fill in format 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 07 Oct 2019 21:49:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Letting qcowXGetBackingStore fill in format gives the same behavior we were opencoding in qcow1GetBackingStore Signed-off-by: Cole Robinson Reviewed-by: Daniel Henrique Barboza --- src/util/virstoragefile.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 016c8f0799..905e70b1a9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -494,8 +494,7 @@ qcowXGetBackingStore(char **res, int version; =20 *res =3D NULL; - if (format) - *format =3D VIR_STORAGE_FILE_AUTO; + *format =3D VIR_STORAGE_FILE_AUTO; =20 if (buf_size < QCOWX_HDR_BACKING_FILE_OFFSET+8+4) return BACKING_STORE_INVALID; @@ -504,15 +503,13 @@ qcowXGetBackingStore(char **res, return BACKING_STORE_INVALID; =20 if (offset =3D=3D 0) { - if (format) - *format =3D VIR_STORAGE_FILE_NONE; + *format =3D VIR_STORAGE_FILE_NONE; return BACKING_STORE_OK; } =20 size =3D virReadBufInt32BE(buf + QCOWX_HDR_BACKING_FILE_SIZE); if (size =3D=3D 0) { - if (format) - *format =3D VIR_STORAGE_FILE_NONE; + *format =3D VIR_STORAGE_FILE_NONE; return BACKING_STORE_OK; } if (size > 1023) @@ -551,7 +548,7 @@ qcowXGetBackingStore(char **res, * for qcow2 v3 images, the length of the header * is stored at QCOW2v3_HDR_SIZE */ - if (isQCow2 && format) { + if (isQCow2) { version =3D virReadBufInt32BE(buf + QCOWX_HDR_VERSION); if (version =3D=3D 2) start =3D QCOW2_HDR_TOTAL_SIZE; @@ -572,15 +569,9 @@ qcow1GetBackingStore(char **res, const char *buf, size_t buf_size) { - int ret; - /* QCow1 doesn't have the extensions capability * used to store backing format */ - *format =3D VIR_STORAGE_FILE_AUTO; - ret =3D qcowXGetBackingStore(res, NULL, buf, buf_size, false); - if (ret =3D=3D BACKING_STORE_OK && !*res) - *format =3D VIR_STORAGE_FILE_NONE; - return ret; + return qcowXGetBackingStore(res, format, buf, buf_size, false); } =20 static int --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list