From nobody Mon Apr 29 22:03:48 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 63.128.21.124 as permitted sender) client-ip=63.128.21.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1601534884; cv=none;
	d=zohomail.com; s=zohoarc;
	b=FoWNm4dC3qDxv50r6itQIBZUeY0hQ+G8nO8q/NqnK/dOknL8gWaoJHNYrfC7GOlRfAo2LCZWyYRbwoPqh6miqfJu9zic67TaV//op8WGZpeN6vTCDhpZ2TUFTe2eV8QyT5icGG3AVnuw0kRuSCFzKOKcz9BGGASimkNSu1LZO2s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1601534884;
 h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To;
	bh=1Igrk0V3M6RUv+qejiRz23zxA1UtbZ+2Ip2Ztqb149c=;
	b=AQz2udPGiINpGUEx02QJkfLiUuJN6i65RhPqA5dOEDWjz8fKJrGw1f6z5A+QlMLZfmqJXsLpO0MaVm2s/B1KKV/eQtlmEmgNOFIUCzDEQWsUezg2oLr+M8uDgotbdQ54TQ9uZd19b/amqfXjLP81MWrfqIT/XGcWXh42V/k/H5M=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
 header.from=<mprivozn@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com
	with SMTPS id 1601534884515923.0218087091158;
 Wed, 30 Sep 2020 23:48:04 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-594-Ip63q289Ndq5Tg4R2PraUw-1; Thu, 01 Oct 2020 02:48:01 -0400
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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE206107465F;
	Thu,  1 Oct 2020 06:47:54 +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 5E2555D9E2;
	Thu,  1 Oct 2020 06:47:53 +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 2B7A1180B65D;
	Thu,  1 Oct 2020 06:47:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
	[10.5.11.12])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 0916hS7Z019041 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 1 Oct 2020 02:43:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AB77E672C0; Thu,  1 Oct 2020 06:43:28 +0000 (UTC)
Received: from localhost.localdomain (unknown [10.40.192.120])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 19FD060BFA
	for <libvir-list@redhat.com>; Thu,  1 Oct 2020 06:43:24 +0000 (UTC)
Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1601534883;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=1Igrk0V3M6RUv+qejiRz23zxA1UtbZ+2Ip2Ztqb149c=;
	b=NwvopqotAahx+X9Qnq1R7kynCpFNuTYfmLijpUOCd97byTHdW+4uk6/o0l0xXDXvyuKnt/
	1PsyhDYLiSvZjQ/CP8ZP0ylE0Bs2UNTGFOde79xVVa8MiBwstUWzs5b8cEYmm3vSdu4QAO
	iviDhFiJznb9KYuNXWloVM7VTZvgAsE=
X-MC-Unique: Ip63q289Ndq5Tg4R2PraUw-1
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH] qemuxml2xmloutdata: Make more symlinks
Date: Thu,  1 Oct 2020 08:43:17 +0200
Message-Id: 
 <33560c961f3ecf67298e5e27ddf562cedd3677eb.1601534597.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-loop: libvir-list@redhat.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

I've found two files under qemuxml2xmloutdata/ that are the same
as in qemuxml2argvdata/. Replace them with symlinks.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
---
 tests/qemuxml2xmloutdata/downscript.xml       | 61 +------------------
 .../video-qxl-resolution.xml                  | 43 +------------
 2 files changed, 2 insertions(+), 102 deletions(-)
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/downscript.xml
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/video-qxl-resoluti=
on.xml

diff --git a/tests/qemuxml2xmloutdata/downscript.xml b/tests/qemuxml2xmlout=
data/downscript.xml
deleted file mode 100644
index 4d0fb1beab..0000000000
--- a/tests/qemuxml2xmloutdata/downscript.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <cpu mode=3D'custom' match=3D'exact' check=3D'none'>
-    <model fallback=3D'forbid'>qemu64</model>
-  </cpu>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type=3D'file' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source file=3D'/var/lib/libvirt/images/img1'/>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0a' f=
unction=3D'0x0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0' model=3D'piix3-uhci'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09' f=
unction=3D'0x0'/>
-    </controller>
-    <filesystem type=3D'mount' accessmode=3D'passthrough'>
-      <source dir=3D'/export/fs1'/>
-      <target dir=3D'fs1'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </filesystem>
-    <filesystem type=3D'mount' accessmode=3D'mapped'>
-      <driver type=3D'path'/>
-      <source dir=3D'/export/fs2'/>
-      <target dir=3D'fs2'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
-    </filesystem>
-    <interface type=3D'ethernet'>
-      <mac address=3D'52:54:00:f6:66:88'/>
-      <script path=3D'/home/ifup.sh'/>
-      <downscript path=3D'/home/ifdown.sh'/>
-      <model type=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b' f=
unction=3D'0x0'/>
-    </interface>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/downscript.xml b/tests/qemuxml2xmlout=
data/downscript.xml
new file mode 120000
index 0000000000..5edee5a7c4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/downscript.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/downscript.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemu=
xml2xmloutdata/video-qxl-resolution.xml
deleted file mode 100644
index e693cbce47..0000000000
--- a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<domain type=3D'qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit=3D'KiB'>219136</memory>
-  <currentMemory unit=3D'KiB'>219136</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'i686' machine=3D'pc'>hvm</type>
-    <boot dev=3D'hd'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
-    <disk type=3D'block' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source dev=3D'/dev/HostVG/QEMUGuest1'/>
-      <target dev=3D'hda' bus=3D'ide'/>
-      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <video>
-      <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'>
-        <resolution x=3D'1280' y=3D'720'/>
-      </model>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </video>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-resolution.xml b/tests/qemu=
xml2xmloutdata/video-qxl-resolution.xml
new file mode 120000
index 0000000000..f2d0595dda
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/video-qxl-resolution.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/video-qxl-resolution.xml
\ No newline at end of file
--=20
2.26.2