[PATCH 16/21] qemuxml2xmlout: Do not symlink output files for 'aarch64-gic' cases

Upcoming patch will be modifying all of them to use real capabilities. This way it will be more obvious what will change. Keeping the symlinks around is tedious for humans to do. Waste some storage instead. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../aarch64-gic-default-both.xml | 26 ++++++++++++++++++- .../aarch64-gic-default-v2.xml | 26 ++++++++++++++++++- .../aarch64-gic-default-v3.xml | 26 ++++++++++++++++++- .../aarch64-gic-default.xml | 26 ++++++++++++++++++- tests/qemuxml2xmloutdata/aarch64-gic-host.xml | 26 ++++++++++++++++++- .../aarch64-gic-none-both.xml | 26 ++++++++++++++++++- .../aarch64-gic-none-v2.xml | 26 ++++++++++++++++++- .../aarch64-gic-none-v3.xml | 26 ++++++++++++++++++- tests/qemuxml2xmloutdata/aarch64-gic-none.xml | 26 ++++++++++++++++++- tests/qemuxml2xmloutdata/aarch64-gic-v2.xml | 26 ++++++++++++++++++- tests/qemuxml2xmloutdata/aarch64-gic-v3.xml | 26 ++++++++++++++++++- 11 files changed, 275 insertions(+), 11 deletions(-) mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-default.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-host.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-none.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-v2.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/aarch64-gic-v3.xml diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml deleted file mode 120000 index bf9d58c385..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v3.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml new file mode 100644 index 0000000000..247d6025f7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml deleted file mode 120000 index ee470fb1fa..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v2.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml new file mode 100644 index 0000000000..474e641ccd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml deleted file mode 120000 index bf9d58c385..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v3.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml new file mode 100644 index 0000000000..247d6025f7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default.xml deleted file mode 120000 index ee470fb1fa..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-default.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v2.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default.xml new file mode 100644 index 0000000000..474e641ccd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-default.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-host.xml b/tests/qemuxml2xmloutdata/aarch64-gic-host.xml deleted file mode 120000 index 03f9d288fa..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-host.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-host.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-host.xml b/tests/qemuxml2xmloutdata/aarch64-gic-host.xml new file mode 100644 index 0000000000..0598473318 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-host.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='host'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml deleted file mode 120000 index bf9d58c385..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v3.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml new file mode 100644 index 0000000000..247d6025f7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-both.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml deleted file mode 120000 index ee470fb1fa..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v2.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml new file mode 100644 index 0000000000..474e641ccd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-v2.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml deleted file mode 120000 index bf9d58c385..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v3.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml new file mode 100644 index 0000000000..247d6025f7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-v3.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none.xml deleted file mode 120000 index ee470fb1fa..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-none.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v2.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none.xml new file mode 100644 index 0000000000..474e641ccd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-none.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml deleted file mode 120000 index ee470fb1fa..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v2.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml new file mode 100644 index 0000000000..474e641ccd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-v2.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml deleted file mode 120000 index bf9d58c385..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-gic-v3.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml new file mode 100644 index 0000000000..247d6025f7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-gic-v3.xml @@ -0,0 +1,25 @@ +<domain type='kvm'> + <name>aarch64test</name> + <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='3'/> + </features> + <cpu mode='host-passthrough' check='none'/> + <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'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> -- 2.39.2