From patchwork Mon Oct 7 21:49:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175413 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4845656ill; Mon, 7 Oct 2019 14:49:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqyVc5cpn7mjc0AntYzDRy6V6ptmRZ5/Ufj7Wl05Lxi3g6r3WU3ZByGeVXSccF26GQ6qG8vD X-Received: by 2002:a02:7113:: with SMTP id n19mr28419865jac.82.1570484968236; 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=UNQ6LivxwPup+tFnbqUWLUQXmY+kuF3B9WLW1TozTvZ6a8ynYfFyNxFGEjjdBwpnzH 2f2mZUJpf3IpOHHQHv7pOkcV1TFv/iPhgGcVCYLsnQXbFUc+9HHy0aUPuJJRWHohhnvY qWVV/rq1HNVCpHGB/vapOAEmPFMiGF5qzC1IExdpuo2rOM4BnWuhUhPK6zT1d1FmZzX0 VUwod8oqi60i2UEvm+lq6d9jtjD1uCwyN62W7ebfVE3MADH8xKqWqgu7OKvAF3bb8zce U6A1EdNBtoo8zt54l4BK0w/AtRdVuAdxthIasv/yL3acn2ywK3JQPgDPEVtfl5w0Y/V4 Z4yQ== 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=cL130Jc0gPyOA1itsk7pXvvLN8eIyhVL1Gx6MfHFImo=; b=BHYEoELbCmcpQSBsTuWLx4FGihc4h5kWXQV0miPzFNQAnh6GBUIgr1qqqHBvkdUUdS BYWDikw72Bu9UTz49wu/+02OjrZ0aRslNU4e87EJ6eSP1FwkTkoSMNdG/FyGcTmQ1Tbe zy7tYdKXnQihEviKJln7Z7OBipPluMj7nGcEyqcMWxQod+em7H7CiPmb6JDKNXSKeJUD w+0tfONqS+2BT7HcbxNRsZGrqr9CMz0fKrBW+F7WfGuQj8cMyMZ0WrDE49VCBB2YXEEY bDJ3RndajN6qbbEOoyIbpT0X288CbSTX1Ir6Q8aN9DiPe80MRLZt0XMQkIVmoOpHOGjh WJ4w== 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 o73si22284914jao.101.2019.10.07.14.49.27 (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-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 mx1.redhat.com (Postfix) with ESMTPS id 8A21A81F31; Mon, 7 Oct 2019 21:49:26 +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 55C4160A9F; 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 5CDE44E58A; Mon, 7 Oct 2019 21:49:24 +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 x97LnMVk014519 for ; Mon, 7 Oct 2019 17:49:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA4C95C223; Mon, 7 Oct 2019 21:49:22 +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 5BEA05C1D4; Mon, 7 Oct 2019 21:49:22 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:16 -0400 Message-Id: <0a700c71217660dfd47ee117e174635aefb5618a.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 02/30] storagefile: qcow1: Check for BACKING_STORE_OK 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 07 Oct 2019 21:49:27 +0000 (UTC) Check explicitly for BACKING_STORE_OK and not its 0 value Signed-off-by: Cole Robinson --- src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 51726006e7..1549067c48 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -578,7 +578,7 @@ qcow1GetBackingStore(char **res, * used to store backing format */ *format = VIR_STORAGE_FILE_AUTO; ret = qcowXGetBackingStore(res, NULL, buf, buf_size, false); - if (ret == 0 && *buf == '\0') + if (ret == BACKING_STORE_OK && *buf == '\0') *format = VIR_STORAGE_FILE_NONE; return ret; }