From nobody Fri May 16 05:31:08 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1501063383258807.4201973797626; Wed, 26 Jul 2017 03:03:03 -0700 (PDT) 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 50EC27F7A2; Wed, 26 Jul 2017 10:03:00 +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 25EE053CCA; Wed, 26 Jul 2017 10:03:00 +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 C64AD180BA88; Wed, 26 Jul 2017 10:02:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6QA0u87008754 for ; Wed, 26 Jul 2017 06:00:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 77A576FE6A; Wed, 26 Jul 2017 10:00:56 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8DBB51C89; Wed, 26 Jul 2017 10:00:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 50EC27F7A2 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 26 Jul 2017 12:00:34 +0200 Message-Id: <03ef08379ad5589ba921996436c72ecdd3119ed5.1501062802.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 04/24] tests: qemumonitorjson: Drop redundant data from testBlockNodeNameDetectFormat 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: , MIME-Version: 1.0 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 26 Jul 2017 10:03:01 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The node name and backing file name can be inferred from the hierarchy. This will also help when converting to detect node names using query-blockstats data. --- .../qemumonitorjson-nodename-basic.result | 6 ------ .../qemumonitorjson-nodename-gluster.result | 4 ---- .../qemumonitorjson-nodename-relative.result | 12 --------= ---- .../qemumonitorjson-nodename-same-backing.result | 4 ---- tests/qemumonitorjsontest.c | 4 ---- 5 files changed, 30 deletions(-) diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.resul= t b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result index e43f3d366..992fc5165 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result @@ -1,15 +1,9 @@ filename : '/var/lib/libvirt/images/rhel7.3.1483545313' format node : '#block118' storage node: '#block078' -backingfile : '/var/lib/libvirt/images/rhel7.3.1483536402' -backing ptr : '#block331' filename : '/var/lib/libvirt/images/rhel7.3.1483536402' format node : '#block331' storage node: '#block281' - backingfile : '/var/lib/libvirt/images/rhel7.3.qcow2' - backing ptr : '#block567' filename : '/var/lib/libvirt/images/rhel7.3.qcow2' format node : '#block567' storage node: '#block424' - backingfile : '' - backing ptr : '' diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.res= ult b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result index f38798d4b..d99576202 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result @@ -1,10 +1,6 @@ filename : 'gluster://gluster-host/vol0/img1' format node : '#block1008' storage node: '#block981' -backingfile : 'gluster://gluster-host/vol0/img0' -backing ptr : '#block349' filename : 'gluster://gluster-host/vol0/img0' format node : '#block349' storage node: '#block269' - backingfile : '' - backing ptr : '' diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.re= sult b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result index 2cd908786..27d9652c6 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result @@ -1,31 +1,19 @@ filename : '/var/lib/libvirt/images/img3' format node : '#block153' storage node: '#block076' -backingfile : '/var/lib/libvirt/images/img2' -backing ptr : '#block357' filename : '/var/lib/libvirt/images/img2' format node : '#block357' storage node: '#block290' - backingfile : '/var/lib/libvirt/images/img1' - backing ptr : '#block514' filename : '/var/lib/libvirt/images/img1' format node : '#block514' storage node: '#block481' - backingfile : '/var/lib/libvirt/images/img0' - backing ptr : '#block709' filename : '/var/lib/libvirt/images/img0' format node : '#block709' storage node: '#block665' - backingfile : '' - backing ptr : '' filename : '/var/lib/libvirt/images/relsnap.qcow2' format node : '#block1177' storage node: '#block1027' -backingfile : '/var/lib/libvirt/images/base.qcow2' -backing ptr : '#block957' filename : '/var/lib/libvirt/images/base.qcow2' format node : '#block957' storage node: '#block840' - backingfile : '' - backing ptr : '' diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backin= g.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.= result index 2c774be27..3ad8423a3 100644 --- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result +++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result @@ -1,11 +1,7 @@ filename : '/var/lib/libvirt/images/a.qcow2' format node : '#block170' storage node: '#block057' -backingfile : '/var/lib/libvirt/images/base.qcow2' -backing ptr : '' filename : '/var/lib/libvirt/images/b.qcow2' format node : '#block574' storage node: '#block405' -backingfile : '/var/lib/libvirt/images/base.qcow2' -backing ptr : '' diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 5bab9f507..56a0a25e1 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2721,10 +2721,6 @@ testBlockNodeNameDetectFormat(virBufferPtr buf, NULLSTR(entry->nodeformat)); virBufferAsprintf(buf, "storage node: '%s'\n", NULLSTR(entry->nodestorage)); - virBufferAsprintf(buf, "backingfile : '%s'\n", - NULLSTR(entry->backingstore)); - virBufferAsprintf(buf, "backing ptr : '%s'\n", - NULLSTR(entry->nodebacking)); virBufferAdjustIndent(buf, 2); --=20 2.13.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list