From patchwork Mon Oct 7 21:49:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175414 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4845664ill; Mon, 7 Oct 2019 14:49:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzH3f2nV5XBJygl7fZpxtoiQvYa8aDdhkoV4seOIZI+4hImC0XBmAT86q7SqDqESlMVFlf4 X-Received: by 2002:a6b:b2d0:: with SMTP id b199mr1579540iof.159.1570484968416; Mon, 07 Oct 2019 14:49:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570484968; cv=none; d=google.com; s=arc-20160816; b=LSWJXR0AOPYfqoGk5w+Tmw8Jf3XQKbmc8IEaBHlcN4w+oAgRYzkZO64e5yzx4/HpIN l7G50oeKfkzOdLwF0R/Fjvbnnts7tDm2J7anyQYV/z9HVlM4vazq2HdC/Y4afvkiBpLU ulXn13e/EblWfH1W+TLUB+/LeJKy/C99zo94bDEHsiuOKyEo9BDIavKpFEK8rO3i3QrR lCQizFKIdO06wzg65K2B7ITEWiFIxHsOnfsn1dM4cHinAtQBAlG3XuTyAmF+JoQSIPJP /BCeOhgoOMBBy4XAufItECecFoNSFpYtJn8qnuf7DvLyKzCa9TRpYuxyAiJ/QmMiXG2y S6mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=Er7dLCQZnHUE3ARe80J8CoLvCLvKRgQaPRwdOUpajZw=; b=vHR+c72osWPrLLbEagJMZ++MR/EpJUlMDWaFC24aj2+EUaVik0AI+amR+EiBMzL1PG 09YimIbYV5yeZDCyDQxjHvIIFHynY0NHdSWk/b0UNpWc9NHyp8p8eXNF6eHCzLh9EaDT U7rpFI+n9sCJ2OOhlDoNZv/JydNMQTeMcKsiVnpOF38ZiDAwlk0xD2eDFjRRsy6T1pq4 2XAMkqN6p+sKyzonTN6ykqoYGfnbo+E6qijwcphFpQiZkipbQcjKiuPMrTvUEVmC4q03 qngGaVW0gHarxDJPuNPzSML35GaRoq4ltajDPwr7S6rp5XwtCWkBaaQYe/Q4YbjZVSDP 8QcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id t4si17471568ilg.101.2019.10.07.14.49.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:49:28 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com 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 mx1.redhat.com (Postfix) with ESMTPS id 2793D30089A1; Mon, 7 Oct 2019 21:49:27 +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 BB3AC60BF4; Mon, 7 Oct 2019 21:49:26 +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 657CC4E58C; Mon, 7 Oct 2019 21:49:26 +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 x97LnOKt014545 for ; Mon, 7 Oct 2019 17:49:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 705C15C219; Mon, 7 Oct 2019 21:49:24 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-123-156.rdu2.redhat.com [10.10.123.156]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12A185C1D4; Mon, 7 Oct 2019 21:49:23 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:19 -0400 Message-Id: <79f92e315686e90a7247bb40ef5dc2e50d5d3977.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 05/30] storagefile: Check version to determine if qcow2 or not 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-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:27 +0000 (UTC) Rather than require a boolean to be passed in Signed-off-by: Cole Robinson --- src/util/virstoragefile.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Daniel Henrique Barboza diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 905e70b1a9..9bf4c1178b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -486,7 +486,7 @@ qcowXGetBackingStore(char **res, int *format, const char *buf, size_t buf_size, - bool isQCow2) + bool isQCow2 ATTRIBUTE_UNUSED) { unsigned long long offset; unsigned int size; @@ -548,8 +548,11 @@ qcowXGetBackingStore(char **res, * for qcow2 v3 images, the length of the header * is stored at QCOW2v3_HDR_SIZE */ - if (isQCow2) { - version = virReadBufInt32BE(buf + QCOWX_HDR_VERSION); + + version = virReadBufInt32BE(buf + QCOWX_HDR_VERSION); + if (version >= 2) { + /* QCow1 doesn't have the extensions capability + * used to store backing format */ if (version == 2) start = QCOW2_HDR_TOTAL_SIZE; else @@ -569,8 +572,6 @@ qcow1GetBackingStore(char **res, const char *buf, size_t buf_size) { - /* QCow1 doesn't have the extensions capability - * used to store backing format */ return qcowXGetBackingStore(res, format, buf, buf_size, false); }