Re: [libvirt] [PATCH] qemuxml2xmloutdata: Use more symlinks

2018-08-09 Thread Ján Tomko 

On Thu, Aug 09, 2018 at 04:50:58PM +0200, Michal Privoznik wrote:

There are couple of files that are the same in both
qemuxml2argvdata and qemuxml2xmloutdata directories. Link them
instead of having full copy.

Signed-off-by: Michal Privoznik 
---
tests/qemuxml2xmloutdata/boot-floppy-q35.xml   | 33 +---
tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml  | 33 +---


These two are a) identical to each other b) one of them will be made
redundant after Peter pushes the BOOTINDEX capability changes.
If you wait until he pushes it, there might be one less change needed in
this commit.


tests/qemuxml2xmloutdata/disk-virtio-queues.xml| 35 +---
tests/qemuxml2xmloutdata/intel-iommu-machine.xml   | 27 +
tests/qemuxml2xmloutdata/intel-iommu.xml   | 27 +


These are also identical. It makes sense for them to point to their
respective source counterparts. But the followup question is, whether we
want to make the source files point to each other.


tests/qemuxml2xmloutdata/luks-disks.xml| 46 +-
tests/qemuxml2xmloutdata/vcpu-placement-static.xml | 34 +---
7 files changed, 7 insertions(+), 228 deletions(-)
mode change 100644 => 12 tests/qemuxml2xmloutdata/boot-floppy-q35.xml
mode change 100644 => 12 tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
mode change 100644 => 12 tests/qemuxml2xmloutdata/disk-virtio-queues.xml
mode change 100644 => 12 tests/qemuxml2xmloutdata/intel-iommu-machine.xml
mode change 100644 => 12 tests/qemuxml2xmloutdata/intel-iommu.xml
mode change 100644 => 12 tests/qemuxml2xmloutdata/luks-disks.xml
mode change 100644 => 12 tests/qemuxml2xmloutdata/vcpu-placement-static.xml



One way or another:
Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH] qemuxml2xmloutdata: Use more symlinks

2018-08-09 Thread Michal Privoznik 
There are couple of files that are the same in both
qemuxml2argvdata and qemuxml2xmloutdata directories. Link them
instead of having full copy.

Signed-off-by: Michal Privoznik 
---
 tests/qemuxml2xmloutdata/boot-floppy-q35.xml   | 33 +---
 tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml  | 33 +---
 tests/qemuxml2xmloutdata/disk-virtio-queues.xml| 35 +---
 tests/qemuxml2xmloutdata/intel-iommu-machine.xml   | 27 +
 tests/qemuxml2xmloutdata/intel-iommu.xml   | 27 +
 tests/qemuxml2xmloutdata/luks-disks.xml| 46 +-
 tests/qemuxml2xmloutdata/vcpu-placement-static.xml | 34 +---
 7 files changed, 7 insertions(+), 228 deletions(-)
 mode change 100644 => 12 tests/qemuxml2xmloutdata/boot-floppy-q35.xml
 mode change 100644 => 12 tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
 mode change 100644 => 12 tests/qemuxml2xmloutdata/disk-virtio-queues.xml
 mode change 100644 => 12 tests/qemuxml2xmloutdata/intel-iommu-machine.xml
 mode change 100644 => 12 tests/qemuxml2xmloutdata/intel-iommu.xml
 mode change 100644 => 12 tests/qemuxml2xmloutdata/luks-disks.xml
 mode change 100644 => 12 tests/qemuxml2xmloutdata/vcpu-placement-static.xml

diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml 
b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
deleted file mode 100644
index af685d9c98..00
--- a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-  QEMUGuest1
-  c7a5fdbd-edaf-9455-926a-d65c16db1809
-  219100
-  219100
-  1
-  
-hvm
-
-  
-  
-  destroy
-  restart
-  destroy
-  
-/usr/bin/qemu-system-x86_64
-
-  
-  
-  
-  
-
-
-  
-
-
-
-
-
-
-  
-
diff --git a/tests/qemuxml2xmloutdata/boot-floppy-q35.xml 
b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
new file mode 12
index 00..2543835ffb
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/boot-floppy-q35.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/boot-floppy-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml 
b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
deleted file mode 100644
index af685d9c98..00
--- a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-  QEMUGuest1
-  c7a5fdbd-edaf-9455-926a-d65c16db1809
-  219100
-  219100
-  1
-  
-hvm
-
-  
-  
-  destroy
-  restart
-  destroy
-  
-/usr/bin/qemu-system-x86_64
-
-  
-  
-  
-  
-
-
-  
-
-
-
-
-
-
-  
-
diff --git a/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml 
b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
new file mode 12
index 00..0ab2dad20f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/bootindex-floppy-q35.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/bootindex-floppy-q35.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml 
b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
deleted file mode 100644
index 37885c6f9c..00
--- a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-  QEMUGuest1
-  c7a5fdbd-edaf-9455-926a-d65c16db1809
-  219136
-  219136
-  1
-  
-hvm
-
-  
-  
-  destroy
-  restart
-  destroy
-  
-/usr/bin/qemu-system-i686
-
-  
-  
-  
-  
-
-
-  
-
-
-  
-
-
-
-
-
-  
-
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-queues.xml 
b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
new file mode 12
index 00..d6773202b7
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-virtio-queues.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/disk-virtio-queues.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml 
b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml
deleted file mode 100644
index 0961e4288d..00
--- a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  QEMUGuest1
-  c7a5fdbd-edaf-9455-926a-d65c16db1809
-  219100
-  219100
-  1
-  
-hvm
-
-  
-  
-  destroy
-  restart
-  destroy
-  
-/usr/bin/qemu-system-x86_64
-
-
-  
-
-
-
-
-
-  
-
diff --git a/tests/qemuxml2xmloutdata/intel-iommu-machine.xml 
b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml
new file mode 12
index 00..dd29ce5ff0
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/intel-iommu-machine.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/intel-iommu-machine.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/intel-iommu.xml 
b/tests/qemuxml2xmloutdata/intel-iommu.xml
deleted file mode 100644
index 0961e4288d..00
--- a/tests/qemuxml2xmloutdata/intel-iommu.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-  QEMUGuest1
-  c7a5fdbd-edaf-9455-926a-d65c16db1809
-  219100
-  219100
-  1
-  
-hvm
-
-  
-  
-  destroy
-  restart
-