From patchwork Mon Oct 7 21:49:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 175416 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4845785ill; Mon, 7 Oct 2019 14:49:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxkvNuJByrGp3joxnbOSix0FtjhEY4iWh1w6a5bmY+DqJoKPFfI3et0fM/UU0d9f0Lwv8Uw X-Received: by 2002:a6b:8e92:: with SMTP id q140mr26548251iod.205.1570484977099; Mon, 07 Oct 2019 14:49:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570484977; cv=none; d=google.com; s=arc-20160816; b=ZPZvEecf/tysS+BmSxNUfEw+hInsPk8Tg/o0ZoNAdXuevMuwQAR5/dOQYneLzfIE2o 5jMPoj3iBKg+S3ukncB3W2Q2oc6Fv1pk0Kk/pDCAkqyHF2Ez9/SMZWook07K9SnOsQeA OM/RuS9NNfrDk2Fpt0PdkZxhswWgdZP50oGD/ixxCKnQ0TYJHfAgjR0SrKcrVVpT2rTN bZE6dt1dpWWDf7LaLPE0nDHP9mSGtYUfYp/KaiMnuBMLREJbVyEDkols+2BkbmUthf12 O/kQlUPjaCbOENtfBfOHf79ikUJOMsYyNZVP5DBjLomxdd/MM8D0ZZek+DdUj4sYg+Ej AO2A== 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=wSFofZ0ACqVXSiFp8wCl2F/P87ioVhl58AmY0kmYSbA=; b=SQJaedl3gPEhBhKlzEnOyG0QE5ujiCt21urQ41JEsc/jKtFBJsIPt1OHdr3DmSILNT 4U5MXi1flqvFXJHztfK0Q+eTVPGmUJlMIZmsrpNy/opGvppqjftB7IHdMinavE5QUVu6 QqjhmS2RHDi3SVWQgLddHNOmR/x9oQkMeMzSONNYTLcnDnLwnG0La484MESw4EKXBqaW 95JBiHUIDY4+RUK4vY9FklHQ0rOvDGJu/gmp30NxhgiIs1BkO3SNIqee/2P/VgLiLcfx 9rHJNt6JYuiRQBUjMdSDFKCeyq3PiFGG9vfl3OF+t9NbF9sS9FWFJsV2ur8nLDuNB0BC 7Big== 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 l1si18047631ilo.147.2019.10.07.14.49.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Oct 2019 14:49:37 -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 C43AB300DA2E; Mon, 7 Oct 2019 21:49:35 +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 A2C345DA8C; Mon, 7 Oct 2019 21:49:35 +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 658E74EBDD; Mon, 7 Oct 2019 21:49:35 +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 x97LnNj6014526 for ; Mon, 7 Oct 2019 17:49:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 50DE15C219; 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 E77FE5C1D4; Mon, 7 Oct 2019 21:49:22 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 7 Oct 2019 17:49:17 -0400 Message-Id: <9a71f43d7538443901fe5cd70df7e052447fb5a0.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 03/30] storagefile: qcow1: Fix check for empty backing file 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.47]); Mon, 07 Oct 2019 21:49:36 +0000 (UTC) >From f772b3d91fd the intention of this code seems to be to set format=NONE when the image does not have a backing file. However 'buf' here is the whole qcow1 file header. What we want to be checking is 'res' which is the parsed backing file path. qcowXGetBackingStore sets this to NULL when there's no backing file. 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 1549067c48..016c8f0799 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 == BACKING_STORE_OK && *buf == '\0') + if (ret == BACKING_STORE_OK && !*res) *format = VIR_STORAGE_FILE_NONE; return ret; }