- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Unify qemucaps2xml output files
by Andrea Bolognani 04 Feb '19

04 Feb '19

Turns out different versions of QEMU on the same architecture produce the same output, so we can have a single output file per architecture instead of duplicating the same data over and over again. Spotted-by: Ján Tomko <jtomko(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- ...ps_2.10.0.aarch64.xml => caps.aarch64.xml} | 0 .../{caps_2.10.0.ppc64.xml => caps.ppc64.xml} | 0 ...aps_3.0.0.riscv32.xml => caps.riscv32.xml} | 0 ...aps_3.0.0.riscv64.xml => caps.riscv64.xml} | 0 .../{caps_2.10.0.s390x.xml => caps.s390x.xml} | 0 ...{caps_1.5.3.x86_64.xml => caps.x86_64.xml} | 0 .../qemucaps2xmloutdata/caps_1.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_1.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.1.1.x86_64.xml | 28 ------------------- .../caps_2.10.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.11.0.s390x.xml | 26 ----------------- .../caps_2.11.0.x86_64.xml | 28 ------------------- .../caps_2.12.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.12.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.12.0.s390x.xml | 26 ----------------- .../caps_2.12.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.4.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.5.0.x86_64.xml | 28 ------------------- .../caps_2.6.0.aarch64.xml | 27 ------------------ .../qemucaps2xmloutdata/caps_2.6.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.6.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.7.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.7.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.8.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.8.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_2.9.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_2.9.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.0.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.s390x.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.0.0.x86_64.xml | 28 ------------------- .../qemucaps2xmloutdata/caps_3.1.0.ppc64.xml | 26 ----------------- .../qemucaps2xmloutdata/caps_3.1.0.x86_64.xml | 28 ------------------- .../caps_4.0.0.riscv32.xml | 25 ----------------- .../caps_4.0.0.riscv64.xml | 25 ----------------- .../qemucaps2xmloutdata/caps_4.0.0.x86_64.xml | 28 ------------------- tests/qemucaps2xmltest.c | 4 +-- 37 files changed, 2 insertions(+), 812 deletions(-) rename tests/qemucaps2xmloutdata/{caps_2.10.0.aarch64.xml => caps.aarch64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.ppc64.xml => caps.ppc64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv32.xml => caps.riscv32.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_3.0.0.riscv64.xml => caps.riscv64.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_2.10.0.s390x.xml => caps.s390x.xml} (100%) rename tests/qemucaps2xmloutdata/{caps_1.5.3.x86_64.xml => caps.x86_64.xml} (100%) delete mode 100644 tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml delete mode 100644 tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps.aarch64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.aarch64.xml rename to tests/qemucaps2xmloutdata/caps.aarch64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps.ppc64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.ppc64.xml rename to tests/qemucaps2xmloutdata/caps.ppc64.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps.riscv32.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv32.xml rename to tests/qemucaps2xmloutdata/caps.riscv32.xml diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps.riscv64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_3.0.0.riscv64.xml rename to tests/qemucaps2xmloutdata/caps.riscv64.xml diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml b/tests/qemucaps2xmloutdata/caps.s390x.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_2.10.0.s390x.xml rename to tests/qemucaps2xmloutdata/caps.s390x.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml b/tests/qemucaps2xmloutdata/caps.x86_64.xml similarity index 100% rename from tests/qemucaps2xmloutdata/caps_1.5.3.x86_64.xml rename to tests/qemucaps2xmloutdata/caps.x86_64.xml diff --git a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_1.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.1.1.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.10.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.11.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>aarch64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='aarch64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.12.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.4.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.5.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml deleted file mode 100644 index f6572c8ecd..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.aarch64.xml +++ /dev/null @@ -1,27 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>aarch64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='aarch64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.6.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.7.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.8.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_2.9.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml deleted file mode 100644 index bb82a15040..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.s390x.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>s390x</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='s390x'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-s390x</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml deleted file mode 100644 index 85623f3980..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.ppc64.xml +++ /dev/null @@ -1,26 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>ppc64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='ppc64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-ppc64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_3.1.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml deleted file mode 100644 index 63c374da7f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv32.xml +++ /dev/null @@ -1,25 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>riscv32</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='riscv32'> - <wordsize>32</wordsize> - <emulator>/usr/bin/qemu-system-riscv32</emulator> - <domain type='qemu'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml deleted file mode 100644 index 09b7eb7f2f..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.riscv64.xml +++ /dev/null @@ -1,25 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>riscv64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='riscv64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <domain type='qemu'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml b/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml deleted file mode 100644 index d41693a001..0000000000 --- a/tests/qemucaps2xmloutdata/caps_4.0.0.x86_64.xml +++ /dev/null @@ -1,28 +0,0 @@ -<capabilities> - - <host> - <cpu> - <arch>x86_64</arch> - </cpu> - <power_management/> - <iommu support='no'/> - </host> - - <guest> - <os_type>hvm</os_type> - <arch name='x86_64'> - <wordsize>64</wordsize> - <emulator>/usr/bin/qemu-system-x86_64</emulator> - <domain type='qemu'/> - <domain type='kvm'/> - </arch> - <features> - <cpuselection/> - <deviceboot/> - <disksnapshot default='on' toggle='no'/> - <acpi default='on' toggle='yes'/> - <apic default='on' toggle='no'/> - </features> - </guest> - -</capabilities> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index ec9d16e8dd..0d9b4e679a 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -128,8 +128,8 @@ testQemuCapsXML(const void *opaque) char *capsXml = NULL; virCapsPtr capsProvided = NULL; - if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/%s.%s.xml", - abs_srcdir, data->base, data->archName) < 0) + if (virAsprintf(&xmlFile, "%s/qemucaps2xmloutdata/caps.%s.xml", + abs_srcdir, data->archName) < 0) goto cleanup; if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", -- 2.20.1

2 1

[libvirt] [PATCH] news: Fix typo
by Andrea Bolognani 04 Feb '19

04 Feb '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index a443af013b..8d6d58ae6a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -70,7 +70,7 @@ <description> By default, libvirt runs the QEMU process as <code>qemu:qemu</code> which could cause issues during probing as some features like AMD SEV - might be inaccesible to QEMU because of file system permissions. + might be inaccessible to QEMU because of file system permissions. Therefore, <code>CAP_DAC_OVERRIDE</code> is granted to overcome these for the purposes of probing. </description> -- 2.20.1

1 0

[libvirt] [PATCH 0/9] Add semicolon to macro calls
by Cole Robinson 04 Feb '19

04 Feb '19

Recently I was experimenting with the vim-ale plugin for basic code validation on file write. For C the simplest option seemed to be using cppcheck. However cppcheck when trivially invoked on many files in our codebase will error if a macro call is missing an ending semicolon. Example: $ cppcheck -q src/qemu/qemu_command.c [src/qemu/qemu_command.c:109]: (error) There is an unknown macro here somewhere. Configuration is required. If VIR_ENUM_DECL is a macro then please configure it. Googling around it sounds like it's generally considered good practice to end macro calls with a semicolon, and we have mixed usage throughout the code. So let's standardize on adding semicolon to a few macro calls. The first 4 patches add semicolons to all VIR_ENUM_DECL, VIR_ENUM_IMPL, VIR_LOG_INIT, VIR_ONCE_GLOBAL INIT calls The next 4 patches rework the macro definitions slightly so that the compiler will _require_ callers to specify use a semicolon. I don't know if this is controversial or not so I kept the patches separate, but they can be squashed together if desired. The only one that's kinda suspect is adding a dummy struct to eat the semicolon in VIR_ONCE_GLOBAL_INIT, maybe someone has a better suggestion. The last patch is a bit of a detour but if we are interested in doing it now is as good a time as we will get: it changes VIR_ENUM_IMPL to add a newline after the last entry. This means diffs extending the enum value list only generate one line diff instead of two. An example is in the patch description. If people agree with the idea, it could be squashed into patch #2 to reduce 'git blame' pollution Thanks, Cole Cole Robinson (9): Add semicolon to VIR_ENUM_DECL calls Add semicolon to VIR_ENUM_IMPL calls Add semicolon to VIR_LOG_INIT calls Add semicolon to VIR_ONCE_GLOBAL_INIT calls Require a semicolon for VIR_ENUM_DECL calls Require a semicolon for VIR_ENUM_IMPL calls Require a semicolon for VIR_LOG_INIT calls Require a semicolon for VIR_ONCE_GLOBAL_INIT calls Add newline after last entry in VIR_ENUM_IMPL calls src/access/viraccessperm.c | 30 ++- src/bhyve/bhyve_conf.c | 2 +- src/conf/capabilities.c | 9 +- src/conf/cpu_conf.c | 21 +- src/conf/cpu_conf.h | 12 +- src/conf/domain_capabilities.c | 5 +- src/conf/domain_conf.c | 313 ++++++++++++++++-------- src/conf/domain_conf.h | 220 ++++++++--------- src/conf/domain_event.c | 2 +- src/conf/interface_conf.c | 3 +- src/conf/interface_conf.h | 2 +- src/conf/netdev_vlan_conf.c | 3 +- src/conf/network_conf.c | 17 +- src/conf/network_conf.h | 8 +- src/conf/network_event.c | 2 +- src/conf/node_device_conf.c | 12 +- src/conf/node_device_conf.h | 8 +- src/conf/node_device_event.c | 2 +- src/conf/numa_conf.c | 9 +- src/conf/numa_conf.h | 6 +- src/conf/nwfilter_conf.c | 21 +- src/conf/object_event.c | 2 +- src/conf/secret_event.c | 2 +- src/conf/snapshot_conf.c | 6 +- src/conf/snapshot_conf.h | 4 +- src/conf/storage_adapter_conf.c | 3 +- src/conf/storage_adapter_conf.h | 2 +- src/conf/storage_conf.c | 24 +- src/conf/storage_conf.h | 16 +- src/conf/storage_event.c | 2 +- src/conf/virdomainobjlist.c | 2 +- src/conf/virinterfaceobj.c | 2 +- src/conf/virnetworkobj.c | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnwfilterbindingobj.c | 2 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/datatypes.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_domain.h | 2 +- src/libxl/libxl_migration.c | 2 +- src/locking/lock_daemon.c | 5 +- src/logging/log_daemon.c | 5 +- src/logging/log_handler.c | 2 +- src/lxc/lxc_conf.c | 2 +- src/lxc/lxc_domain.c | 6 +- src/lxc/lxc_domain.h | 6 +- src/lxc/lxc_monitor.c | 2 +- src/network/leaseshelper.c | 3 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_agent.c | 8 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 43 ++-- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 14 +- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 10 +- src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_migration_cookie.c | 3 +- src/qemu/qemu_migration_params.c | 4 +- src/qemu/qemu_migration_params.h | 2 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 18 +- src/qemu/qemu_tpm.c | 2 +- src/remote/remote_daemon.c | 5 +- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetclientstream.c | 2 +- src/rpc/virnetdaemon.c | 2 +- src/rpc/virnetsaslcontext.c | 2 +- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/test/test_driver.c | 2 +- src/util/vircgroup.c | 3 +- src/util/vircgroupbackend.c | 3 +- src/util/vircgroupv1.c | 3 +- src/util/vircgroupv2.c | 3 +- src/util/virclosecallbacks.c | 2 +- src/util/virconf.c | 3 +- src/util/virconf.h | 2 +- src/util/virdevmapper.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virerror.c | 4 +- src/util/virfdstream.c | 2 +- src/util/virfilecache.c | 4 +- src/util/virfirewall.c | 12 +- src/util/virgic.c | 2 +- src/util/virhash.c | 2 +- src/util/virhook.c | 35 +-- src/util/virhostdev.c | 2 +- src/util/viridentity.c | 2 +- src/util/virkeycode.c | 2 +- src/util/virlog.c | 5 +- src/util/virlog.h | 2 +- src/util/virmdev.c | 5 +- src/util/virmdev.h | 2 +- src/util/virnetdev.c | 9 +- src/util/virnetdev.h | 6 +- src/util/virnetdevmacvlan.c | 3 +- src/util/virnetdevmacvlan.h | 2 +- src/util/virnetdevvlan.h | 2 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virnetdevvportprofile.h | 4 +- src/util/virpci.c | 9 +- src/util/virpci.h | 4 +- src/util/virperf.c | 3 +- src/util/virportallocator.c | 2 +- src/util/virprocess.c | 3 +- src/util/virresctrl.c | 18 +- src/util/virscsi.c | 2 +- src/util/virscsivhost.c | 2 +- src/util/virsecret.c | 3 +- src/util/virsecret.h | 2 +- src/util/virstorageencryption.c | 7 +- src/util/virstorageencryption.h | 4 +- src/util/virstoragefile.c | 20 +- src/util/virstoragefile.h | 10 +- src/util/virstoragefilebackend.c | 2 +- src/util/virsysinfo.c | 3 +- src/util/virsysinfo.h | 2 +- src/util/virthread.h | 5 +- src/util/virthreadjob.c | 2 +- src/util/virtypedparam.c | 3 +- src/util/virtypedparam.h | 2 +- src/util/virusb.c | 2 +- src/util/virutil.c | 6 +- src/util/virutil.h | 10 +- src/vmware/vmware_conf.c | 3 +- src/vmware/vmware_conf.h | 2 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- tests/virfilecachetest.c | 2 +- tools/virsh-domain-monitor.c | 60 +++-- tools/virsh-domain.c | 102 ++++---- tools/virsh-network.c | 12 +- tools/virsh-nodedev.c | 4 +- tools/virsh-pool.c | 8 +- tools/virsh-secret.c | 4 +- tools/virsh-volume.c | 6 +- tools/virt-admin.c | 4 +- 152 files changed, 861 insertions(+), 622 deletions(-) -- 2.20.1

3 13

[libvirt] ANNOUNCE: virt-manager 2.1.0 released
by Cole Robinson 04 Feb '19

04 Feb '19

I'm happy to announce the release of virt-manager 2.1.0! The release can be downloaded from: http://virt-manager.org/download/ This release includes: - Bash autocompletion support (Lin Ma, Cole Robinson) - UI and command line --vsock support (Slavomir Kaslev) - virt-xml: Add --os-variant option (Andrea Bolognani) - virt-install: use libosinfo cpu, mem, disk size defaults (Fabiano Fidencio) - virt-install: Better usage of libosinfo -unknown distro IDs (Fabiano Fidencio) - virt-install: More usage of libosinfo for ISO --location detection - virt-install: Add --location LOCATION,kernel=X,initrd=Y for pointing to kernel/initrd in media that virt-install/libosinfo fails to detect - Various bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PULL 0/5] Ui 20190201 patches
by Gerd Hoffmann 03 Feb '19

03 Feb '19

The following changes since commit e8977901b79fb678f288dd372261b640bbeccd0d: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging (2019-01-31 15:40:39 +0000) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20190201-pull-request for you to fetch changes up to 0015ca5cbabe0b31d31610ddfaafd90a9e5911a4: ui: remove support for SDL1.2 in favour of SDL2 (2019-02-01 11:59:12 +0100) ---------------------------------------------------------------- ui: fix build with SDL disabled, drop SDL1 support. ---------------------------------------------------------------- Daniel P. Berrangé (1): ui: remove support for SDL1.2 in favour of SDL2 Philippe Mathieu-Daudé (4): hw/display: Move Milkymist specific hardware out of common-obj list configure: LM32 Milkymist Texture Mapping Unit (tmu2) also depends of X11 hw/display/milkymist-tmu2: Explicit the dependency to both X11 / OpenGL hw/display/milkymist-tmu2: Move inlined code from header to source configure | 70 +-- hw/lm32/milkymist-hw.h | 63 --- include/hw/display/milkymist_tmu2.h | 41 ++ ui/sdl_zoom.h | 25 - ui/sdl_zoom_template.h | 219 -------- hw/display/milkymist-tmu2.c | 49 ++ hw/lm32/milkymist.c | 1 + ui/sdl.c | 1027 ----------------------------------- ui/sdl_zoom.c | 93 ---- MAINTAINERS | 1 + default-configs/lm32-softmmu.mak | 2 +- hw/display/Makefile.objs | 8 +- qemu-deprecated.texi | 9 - ui/Makefile.objs | 5 - 14 files changed, 114 insertions(+), 1499 deletions(-) create mode 100644 include/hw/display/milkymist_tmu2.h delete mode 100644 ui/sdl_zoom.h delete mode 100644 ui/sdl_zoom_template.h delete mode 100644 ui/sdl.c delete mode 100644 ui/sdl_zoom.c -- 2.9.3

3 7

[libvirt] [PATCH] util: remove test code accidentally committed to virFirewallDZoneExists
by Laine Stump 03 Feb '19

03 Feb '19

Just before pushing the series containing commit 3bba4825 I had added a "return true" to the top of virFirewallDZoneExists() to measure the impact of calling that function once per network during startup. I found that the effect was minimal, but forgot to remove the "return true" before pushing. This unfortunately causes a failure to start networks on systems that have a firewalld version that doesn't support our libvirt zone file (i.e. pretty much everyone). This patch removes the unintended line. Signed-off-by: Laine Stump <laine(a)laine.org> --- Pushed as trivial / buildbreaker. src/util/virfirewalld.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c index ca03020f74..47bacdcf4a 100644 --- a/src/util/virfirewalld.c +++ b/src/util/virfirewalld.c @@ -235,8 +235,6 @@ virFirewallDZoneExists(const char *match) char **zones = NULL; bool result = false; - return true; - if (virFirewallDGetZones(&zones, &nzones) < 0) goto cleanup; -- 2.20.1

1 0

[libvirt] [PATCH 0/3] bhyve: bhyve:commandline followup fixes
by Roman Bogorodskiy 01 Feb '19

01 Feb '19

Roman Bogorodskiy (3): bhyve: bhyveDomainDefNamespaceFormatXML cleanup bhyve: emit warning when using bhyve:commandline docs: bhyve: warn about bhyve:commandline risks docs/drvbhyve.html.in | 5 +++++ src/bhyve/bhyve_command.c | 4 ++++ src/bhyve/bhyve_domain.c | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH v2] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 01 Feb '19

01 Feb '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary duplication of effort (even if it is not too difficult). Note that obtaining the offsets of a partition (MBR or GPT) can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you instead of bothering with qemu exporting a subset. Or, keeping to just user-space code, use nbdkit's partition filter, which has already known both GPT and primary MBR partitions for a while, and was just recently enhanced to support arbitrary logical MBR parititions. Start the clock on the deprecation cycle, with examples of how to write device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: actual nbdkit example [Rich], improved doc wording --- qemu-deprecated.texi | 33 +++++++++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836f..d35e78c81ff 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -175,3 +175,36 @@ The above, converted to the current supported format: @subsubsection "irq": "" (since 3.0.0) The ``irq'' property is obsoleted. + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and has never correctly handled +logical partitions beyond partition 5. If you know the offset and +length of the partition (perhaps by using @code{sfdisk} within the +guest), you can achieve the effect of exporting just that subset of +the disk by use of the @option{--image-opts} option with a raw +blockdev using the @code{offset} and @code{size} parameters layered on +top of any other existing blockdev. For example, if partition 1 is +100MiB long starting at 1MiB, the old command: + +@code{qemu-nbd -t -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@code{qemu-nbd -t --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. Using this to rewrite the above example results in: + +@code{qemu-nbd -t -k /tmp/sock -f qcow2 file.qcow2 &} +@code{nbdkit -f --filter=partition nbd socket=/tmp/sock partition=1} + +Note that if you are exposing the export via /dev/nbd0, it is easier +to just export the entire image and then mount only /dev/nbd0p1 than +it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a +subset of the image. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

3 3

[libvirt] [PATCH] qemu: command: Don't skip 'readonly' and throttling info for empty drive
by Peter Krempa 01 Feb '19

01 Feb '19

In commit f80eae8c2ae I was too agresive in removing properties of -drive for empty drives. It turns out that qemu actually persists the state of 'readonly' and the throttling information even for the empty drive. Removing 'readonly' thus made qemu open any subsequent images added via the 'change' command as RW which was forbidden by selinux thanks to the restrictive sVirt label for readonly media. Fix this by formating the property again and bump the tests and leave a note detailing why the rest of the properties needs to be skipped. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 18 +++++++++++++----- tests/qemuxml2argvdata/disk-cdrom.args | 4 ++-- .../disk-cdrom.x86_64-2.12.0.args | 4 ++-- .../disk-cdrom.x86_64-latest.args | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a59583fb75..6d3aa69569 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1764,10 +1764,18 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, } } + if (disk->src->readonly) + virBufferAddLit(&opt, ",readonly=on"); + + /* qemu rejects some parameters for an empty -drive, so we need to skip + * them in that case: + * cache: modifies properties of the format driver which is not present + * copy_on_read: really only works for floppies + * discard: modifies properties of format driver + * detect_zeroes: works but really depends on discard so it's useless + * iomode: setting it to 'native' requires a specific cache mode + */ if (!virStorageSourceIsEmpty(disk->src)) { - if (disk->src->readonly) - virBufferAddLit(&opt, ",readonly=on"); - if (disk->cachemode) { virBufferAsprintf(&opt, ",cache=%s", qemuDiskCacheV2TypeToString(disk->cachemode)); @@ -1792,10 +1800,10 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",aio=%s", virDomainDiskIoTypeToString(disk->iomode)); } - - qemuBuildDiskThrottling(disk, &opt); } + qemuBuildDiskThrottling(disk, &opt); + if (virBufferCheckError(&opt) < 0) goto error; diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args index a9f60aa477..4823ae82de 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.args +++ b/tests/qemuxml2argvdata/disk-cdrom.args @@ -27,7 +27,7 @@ bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,media=cdrom,\ readonly=on \ -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0,media=cdrom \ +-drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive if=none,id=drive-ide0-1-1,media=cdrom \ +-drive if=none,id=drive-ide0-1-1,media=cdrom,readonly=on \ -device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args index a39d920f67..2fe84177b8 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args @@ -28,10 +28,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0 \ +-drive if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ write-cache=on \ --drive if=none,id=drive-ide0-1-1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args index 029ae23dfa..9b9451f435 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -28,10 +28,10 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ -drive file=/root/boot.iso,format=raw,if=none,id=drive-ide0-0-1,readonly=on \ -device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive if=none,id=drive-ide0-1-0 \ +-drive if=none,id=drive-ide0-1-0,readonly=on \ -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\ write-cache=on \ --drive if=none,id=drive-ide0-1-1 \ +-drive if=none,id=drive-ide0-1-1,readonly=on \ -device ide-cd,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ resourcecontrol=deny \ -- 2.20.1

2 1

[libvirt] [PATCH] util: Fix build issue with virStorageFileGetNPIVKey
by John Ferlan 01 Feb '19

01 Feb '19

Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- pushed as build breaker <sigh>... src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index d83d84fcf5..6df0885669 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1564,7 +1564,7 @@ virStorageFileGetNPIVKey(const char *path, return ret; } #else -int virStorageFileGetNPIVKey(const char *path, +int virStorageFileGetNPIVKey(const char *path ATTRIBUTE_UNUSED, char **key ATTRIBUTE_UNUSED) { return -1; -- 2.20.1

1 0