[PATCH 18/21] qemuxml2xmloutdata: Don't symlink output data for 'mach-virt*' cases

Peter Krempa pkrempa at redhat.com
Fri Mar 31 11:26:12 UTC 2023


Replace them with full files so that potential fallout from conversion
to real capabilities is more obvious and the test is simpler to add.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../mach-virt-console-native.xml              | 33 ++++++++++++++++++-
 .../mach-virt-serial+console-native.xml       | 33 ++++++++++++++++++-
 .../mach-virt-serial-native.xml               | 33 ++++++++++++++++++-
 3 files changed, 96 insertions(+), 3 deletions(-)
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/mach-virt-console-native.xml
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
 mode change 120000 => 100644 tests/qemuxml2xmloutdata/mach-virt-serial-native.xml

diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
deleted file mode 120000
index 8b64e06c7f..0000000000
--- a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
new file mode 100644
index 0000000000..f66fe2916a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-console-native.xml
@@ -0,0 +1,32 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>524288</memory>
+  <currentMemory unit='KiB'>524288</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <gic version='2'/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='usb' index='0' model='none'/>
+    <serial type='pty'>
+      <target type='system-serial' port='0'>
+        <model name='pl011'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
deleted file mode 120000
index 8b64e06c7f..0000000000
--- a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
new file mode 100644
index 0000000000..f66fe2916a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial+console-native.xml
@@ -0,0 +1,32 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>524288</memory>
+  <currentMemory unit='KiB'>524288</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <gic version='2'/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='usb' index='0' model='none'/>
+    <serial type='pty'>
+      <target type='system-serial' port='0'>
+        <model name='pl011'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
deleted file mode 120000
index 8b64e06c7f..0000000000
--- a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
+++ /dev/null
@@ -1 +0,0 @@
-mach-virt-serial-compat.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
new file mode 100644
index 0000000000..f66fe2916a
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial-native.xml
@@ -0,0 +1,32 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid>
+  <memory unit='KiB'>524288</memory>
+  <currentMemory unit='KiB'>524288</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <gic version='2'/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <controller type='usb' index='0' model='none'/>
+    <serial type='pty'>
+      <target type='system-serial' port='0'>
+        <model name='pl011'/>
+      </target>
+    </serial>
+    <console type='pty'>
+      <target type='serial' port='0'/>
+    </console>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
-- 
2.39.2



More information about the libvir-list mailing list