From patchwork Mon Oct 7 21:49:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175420 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4845837ill; Mon, 7 Oct 2019 14:49:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqwZEXBB+ANIxFDQqqMS0mmGLoKYFg95lgosyfkP03e2S193I8dsZIVArw+Da5VEZq68ZsPv X-Received: by 2002:a92:3314:: with SMTP id a20mr30700048ilf.276.1570484981542; Mon, 07 Oct 2019 14:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570484981; cv=none; d=google.com; s=arc-20160816; b=kMiZAzcc7rywvOD6A6qDnwUIGPqBFMFVMBx/Av5b44TqFt1vDSB+wVwJR2yFA4caXa oy2AOJL6FO52Vn/TtXqpNARYj62kuRkg9IC9yKzip/MEFv+CzrJ0hR+SraA8Othhansj erxuYEE/PvOIEc54kcYor6bfPcylPd43Fm5F3xWD1lko2gtI1+tCKg83zY5Jm4OyWR0r LiOFHT6QyOXDPAdovWd2+5Mq3V2P8zH+FJzH6NauGJaC8bm172DjE0hYJopn4uBekUXz JwBcFOqDVrkH/RZLUQJEyWX5ZH0tdy8cwPUpsenELrlLkH8x1dM3W/txnjTh4MRzErvf uoQg== 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=HRCVMCZIT1Bc69Lneq5240E70lCr2QFF9swB2o7p9GM=; b=foNVxVoGCvJX0NwvMbep8PluwZShGHkwlFVehkIo3F6cdxxAgBL3r/1StYCoPKmKgN EzxhqUY7e1kUTpQ2uOd+pPAMTuMU+XnYevt/m7ZMskmBNJkMwFJ1zqacyS1tfqeJgGaR qTmoDRYVLQBbDCdi7YuhmPhVqhr5VxCmugFJzTSyGEFxXvjG0ZQM1HLsObIbjdl5fFdp I3Ts00LnHsW1h9PmUgVSuWQJbD/5qNNm4Sce8K0Sfyx6+ZRbenj1ya1VnogmMwB77M5L c7zKfA6rqghjcKLs7AN7y643XwJ9bhwg6CZY+f8NJjmSm9PSO5bgm6/H4JcP9RK6GAAV A6GA== 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 z95si20300382jah.67.2019.10.07.14.49.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:49:41 -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-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) 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 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: , 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) Letting qcowXGetBackingStore fill in format gives the same behavior we were opencoding in qcow1GetBackingStore Signed-off-by: Cole Robinson --- src/util/virstoragefile.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 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 016c8f0799..905e70b1a9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -494,8 +494,7 @@ qcowXGetBackingStore(char **res, int version; *res = NULL; - if (format) - *format = VIR_STORAGE_FILE_AUTO; + *format = VIR_STORAGE_FILE_AUTO; 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; if (offset == 0) { - if (format) - *format = VIR_STORAGE_FILE_NONE; + *format = VIR_STORAGE_FILE_NONE; return BACKING_STORE_OK; } size = virReadBufInt32BE(buf + QCOWX_HDR_BACKING_FILE_SIZE); if (size == 0) { - if (format) - *format = VIR_STORAGE_FILE_NONE; + *format = 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 = virReadBufInt32BE(buf + QCOWX_HDR_VERSION); if (version == 2) start = 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 = VIR_STORAGE_FILE_AUTO; - ret = qcowXGetBackingStore(res, NULL, buf, buf_size, false); - if (ret == BACKING_STORE_OK && !*res) - *format = VIR_STORAGE_FILE_NONE; - return ret; + return qcowXGetBackingStore(res, format, buf, buf_size, false); } static int