[PATCH 0/2] qemu: Caps update for 'vdpa-block' and corner case hardening
Peter Krempa (2): tests: qemucapabilitiesdata: Update data for qemu-8.1 dev cycle Explicitly reject unsupported storage types for legacy config generators src/libxl/xen_xl.c | 4 +- src/qemu/qemu_command.c | 5 +- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 +- .../caps_8.1.0_x86_64.replies | 82 +++++++++++-------- .../caps_8.1.0_x86_64.xml | 43 ++++++++-- .../cpu-host-model.x86_64-latest.args | 2 +- 8 files changed, 95 insertions(+), 52 deletions(-) -- 2.40.1
Update to v8.0.0-1739-g5f9dd6a8ce and build on a newer kernel and with newer libblkio. Notable changes: - 'fdset' feature is supported for the vdpa block backend provided by libblkio - 'xsaves' feature is optional for EPYC-Rome - 'cryptodev-backend-lkcf' and 'PIIX3-xen' devices removed Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 +- .../caps_8.1.0_x86_64.replies | 82 +++++++++++-------- .../caps_8.1.0_x86_64.xml | 43 ++++++++-- .../cpu-host-model.x86_64-latest.args | 2 +- 6 files changed, 89 insertions(+), 49 deletions(-) diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml index f4a9c43340..da900d488c 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -51,7 +51,6 @@ <feature policy='require' name='stibp'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='invtsc'/> <feature policy='require' name='amd-ssbd'/> @@ -70,6 +69,7 @@ <feature policy='require' name='skip-l1dfl-vmentry'/> <feature policy='require' name='mds-no'/> <feature policy='require' name='pschange-mc-no'/> + <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> @@ -112,7 +112,7 @@ <model usable='no' vendor='Intel'>Haswell-noTSX</model> <model usable='no' vendor='Intel'>Haswell-IBRS</model> <model usable='no' vendor='Intel'>Haswell</model> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='AMD'>EPYC-Milan</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> <model usable='yes' vendor='AMD'>EPYC</model> @@ -252,7 +252,6 @@ </enum> <enum name='backendModel'> <value>builtin</value> - <value>lkcf</value> </enum> </crypto> </devices> diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml index 15ecb729a4..c36bac3fd2 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -253,7 +253,6 @@ </enum> <enum name='backendModel'> <value>builtin</value> - <value>lkcf</value> </enum> </crypto> </devices> diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml index 89f7ff5250..9183b7c937 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -50,7 +50,6 @@ <feature policy='require' name='stibp'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='ssbd'/> - <feature policy='require' name='xsaves'/> <feature policy='require' name='cmp_legacy'/> <feature policy='require' name='invtsc'/> <feature policy='require' name='amd-ssbd'/> @@ -69,6 +68,7 @@ <feature policy='require' name='skip-l1dfl-vmentry'/> <feature policy='require' name='mds-no'/> <feature policy='require' name='pschange-mc-no'/> + <feature policy='disable' name='xsaves'/> </mode> <mode name='custom' supported='yes'> <model usable='yes' vendor='unknown'>qemu64</model> @@ -111,7 +111,7 @@ <model usable='no' vendor='Intel'>Haswell-noTSX</model> <model usable='no' vendor='Intel'>Haswell-IBRS</model> <model usable='no' vendor='Intel'>Haswell</model> - <model usable='yes' vendor='AMD'>EPYC-Rome</model> + <model usable='no' vendor='AMD'>EPYC-Rome</model> <model usable='no' vendor='AMD'>EPYC-Milan</model> <model usable='yes' vendor='AMD'>EPYC-IBPB</model> <model usable='yes' vendor='AMD'>EPYC</model> @@ -252,7 +252,6 @@ </enum> <enum name='backendModel'> <value>builtin</value> - <value>lkcf</value> </enum> </crypto> </devices> diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index cf59957e98..21ce2566d3 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -21,7 +21,7 @@ "minor": 0, "major": 8 }, - "package": "v8.0.0-1619-g369081c455" + "package": "v8.0.0-1739-g5f9dd6a8ce" }, "id": "libvirt-2" } @@ -10879,6 +10879,7 @@ ], "meta-type": "object", "features": [ + "fdset" ] }, { @@ -23993,16 +23994,16 @@ "parent": "chardev-ringbuf" }, { - "name": "Haswell-v3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "i82557a", + "parent": "pci-device" }, { "name": "vhost-user-scsi-pci-non-transitional", "parent": "vhost-user-scsi-pci-base" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "vmmouse", + "parent": "isa-device" }, { "name": "chardev-udp", @@ -24021,8 +24022,8 @@ "parent": "virtio-scsi-pci-base" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "Haswell-v3-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "migration", @@ -24560,10 +24561,6 @@ "name": "Conroe-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "cryptodev-backend-lkcf", - "parent": "cryptodev-backend" - }, { "name": "apic", "parent": "apic-common" @@ -24657,11 +24654,11 @@ "parent": "usb-device" }, { - "name": "IvyBridge-x86_64-cpu", + "name": "SandyBridge-v1-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "SandyBridge-v1-x86_64-cpu", + "name": "IvyBridge-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -25284,14 +25281,14 @@ "name": "KnightsMill-v1-x86_64-cpu", "parent": "x86_64-cpu" }, - { - "name": "virtio-mmio", - "parent": "sys-bus-device" - }, { "name": "pentium2-x86_64-cpu", "parent": "x86_64-cpu" }, + { + "name": "virtio-mmio", + "parent": "sys-bus-device" + }, { "name": "Broadwell-v1-x86_64-cpu", "parent": "x86_64-cpu" @@ -25652,10 +25649,6 @@ "name": "i440FX-pcihost", "parent": "pci-host-bridge" }, - { - "name": "virtio-iommu-device", - "parent": "virtio-device" - }, { "name": "isa-debugcon", "parent": "isa-device" @@ -25689,8 +25682,8 @@ "parent": "ivshmem-common" }, { - "name": "PIIX3-xen", - "parent": "pci-piix3" + "name": "virtio-iommu-device", + "parent": "virtio-device" }, { "name": "virtio-net-pci", @@ -33543,7 +33536,8 @@ "cldemote", "movdiri", "movdir64b", - "spec-ctrl" + "spec-ctrl", + "xsaves" ], "static": false, "migration-safe": true, @@ -33560,6 +33554,7 @@ "movdir64b", "spec-ctrl", "core-capability", + "xsaves", "split-lock-detect" ], "static": false, @@ -33638,6 +33633,7 @@ "avx512vl", "pku", "spec-ctrl", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -33824,7 +33820,8 @@ "pcid", "erms", "invpcid", - "spec-ctrl" + "spec-ctrl", + "xsaves" ], "static": false, "migration-safe": true, @@ -33956,6 +33953,7 @@ "fzrm", "fsrs", "fsrc", + "xsaves", "xfd", "avx512f", "avx512f", @@ -34009,6 +34007,7 @@ "fzrm", "fsrs", "fsrc", + "xsaves", "xfd", "avx512f", "avx512f", @@ -34340,6 +34339,7 @@ "la57", "fsrm", "spec-ctrl", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -34376,6 +34376,7 @@ "la57", "fsrm", "spec-ctrl", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -34707,6 +34708,7 @@ "name": "EPYC-v4", "typename": "EPYC-v4-x86_64-cpu", "unavailable-features": [ + "xsaves" ], "static": false, "migration-safe": true, @@ -34716,6 +34718,7 @@ "name": "EPYC-v3", "typename": "EPYC-v3-x86_64-cpu", "unavailable-features": [ + "xsaves" ], "static": false, "migration-safe": true, @@ -34753,7 +34756,8 @@ "name": "EPYC-Rome-v3", "typename": "EPYC-Rome-v3-x86_64-cpu", "unavailable-features": [ - "ibrs" + "ibrs", + "xsaves" ], "static": false, "migration-safe": true, @@ -34763,7 +34767,8 @@ "name": "EPYC-Rome-v2", "typename": "EPYC-Rome-v2-x86_64-cpu", "unavailable-features": [ - "ibrs" + "ibrs", + "xsaves" ], "static": false, "migration-safe": true, @@ -34773,6 +34778,7 @@ "name": "EPYC-Rome-v1", "typename": "EPYC-Rome-v1-x86_64-cpu", "unavailable-features": [ + "xsaves" ], "static": false, "migration-safe": true, @@ -34782,6 +34788,7 @@ "name": "EPYC-Rome", "typename": "EPYC-Rome-x86_64-cpu", "unavailable-features": [ + "xsaves" ], "alias-of": "EPYC-Rome-v1", "static": false, @@ -34803,6 +34810,7 @@ "stibp-always-on", "amd-psfd", "no-nested-data-bp", + "xsaves", "pku" ], "static": false, @@ -34819,6 +34827,7 @@ "pku", "fsrm", "ibrs", + "xsaves", "pku" ], "static": false, @@ -34835,6 +34844,7 @@ "pku", "fsrm", "ibrs", + "xsaves", "pku" ], "alias-of": "EPYC-Milan-v1", @@ -34882,6 +34892,7 @@ "amd-psfd", "no-nested-data-bp", "auto-ibrs", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -34921,6 +34932,7 @@ "amd-psfd", "no-nested-data-bp", "auto-ibrs", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -34945,6 +34957,7 @@ "name": "Dhyana-v2", "typename": "Dhyana-v2-x86_64-cpu", "unavailable-features": [ + "xsaves" ], "static": false, "migration-safe": true, @@ -34974,7 +34987,8 @@ "typename": "Denverton-v3-x86_64-cpu", "unavailable-features": [ "erms", - "spec-ctrl" + "spec-ctrl", + "xsaves" ], "static": false, "migration-safe": true, @@ -35038,6 +35052,7 @@ "avx512vnni", "spec-ctrl", "avx512-bf16", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -35142,6 +35157,7 @@ "pku", "avx512vnni", "spec-ctrl", + "xsaves", "avx512f", "avx512f", "avx512f", @@ -37337,7 +37353,7 @@ "vaes": false, "serialize": false, "movdir64b": false, - "xsaves": true, + "xsaves": false, "vmx-shadow-vmcs": false, "lm": true, "vmx-exit-save-preemption-timer": false, @@ -37709,7 +37725,7 @@ "vaes": false, "serialize": false, "movdir64b": false, - "xsaves": true, + "xsaves": false, "vmx-shadow-vmcs": false, "lm": true, "vmx-exit-save-preemption-timer": false, @@ -38050,7 +38066,7 @@ "sgx-tokenkey": false, "cldemote": false, "vmx-ept": false, - "hv-tlbflush-direct": false, + "hv-tlbflush-direct": true, "xfd": false, "hv-reenlightenment": true, "kvm-mmu": false, @@ -38163,7 +38179,7 @@ "popcnt": true, "vaes": false, "serialize": false, - "xsaves": true, + "xsaves": false, "movdir64b": false, "vmx-shadow-vmcs": false, "tcg-cpuid": true, @@ -38264,7 +38280,7 @@ "vmx-entry-load-efer": false, "level-func7": 0, "vmx-mtf": false, - "hv-tlbflush-ext": false, + "hv-tlbflush-ext": true, "pause_filter": true, "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", "sha-ni": true, diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 50ed122fa4..224270d8e5 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -200,7 +200,6 @@ <flag name='machine-hpet'/> <flag name='netdev.stream'/> <flag name='virtio-crypto'/> - <flag name='cryptodev-backend-lkcf'/> <flag name='pvpanic-pci'/> <flag name='netdev.stream.reconnect'/> <flag name='virtio-gpu.blob'/> @@ -208,7 +207,7 @@ <flag name='rbd-encryption-luks-any'/> <version>8000050</version> <microcodeVersion>43100245</microcodeVersion> - <package>v8.0.0-1619-g369081c455</package> + <package>v8.0.0-1739-g5f9dd6a8ce</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='avx-ne-convert' type='boolean' value='false'/> @@ -471,7 +470,7 @@ <property name='vaes' type='boolean' value='false'/> <property name='serialize' type='boolean' value='false'/> <property name='movdir64b' type='boolean' value='false'/> - <property name='xsaves' type='boolean' value='true' migratable='yes'/> + <property name='xsaves' type='boolean' value='false'/> <property name='vmx-shadow-vmcs' type='boolean' value='false'/> <property name='lm' type='boolean' value='true' migratable='yes'/> <property name='vmx-exit-save-preemption-timer' type='boolean' value='false'/> @@ -625,6 +624,7 @@ <blocker name='movdiri'/> <blocker name='movdir64b'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> </cpu> <cpu type='kvm' name='Snowridge-v3' typename='Snowridge-v3-x86_64-cpu' usable='no'> <blocker name='erms'/> @@ -634,6 +634,7 @@ <blocker name='movdir64b'/> <blocker name='spec-ctrl'/> <blocker name='core-capability'/> + <blocker name='xsaves'/> <blocker name='split-lock-detect'/> </cpu> <cpu type='kvm' name='Snowridge-v2' typename='Snowridge-v2-x86_64-cpu' usable='no'> @@ -683,6 +684,7 @@ <blocker name='avx512vl'/> <blocker name='pku'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -811,6 +813,7 @@ <blocker name='erms'/> <blocker name='invpcid'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> </cpu> <cpu type='kvm' name='Skylake-Client-v3' typename='Skylake-Client-v3-x86_64-cpu' usable='no'> <blocker name='pcid'/> @@ -890,6 +893,7 @@ <blocker name='fzrm'/> <blocker name='fsrs'/> <blocker name='fsrc'/> + <blocker name='xsaves'/> <blocker name='xfd'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -936,6 +940,7 @@ <blocker name='fzrm'/> <blocker name='fsrs'/> <blocker name='fsrc'/> + <blocker name='xsaves'/> <blocker name='xfd'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -1052,6 +1057,7 @@ <blocker name='la57'/> <blocker name='fsrm'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -1081,6 +1087,7 @@ <blocker name='la57'/> <blocker name='fsrm'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -1300,8 +1307,12 @@ <blocker name='invpcid'/> <blocker name='rtm'/> </cpu> - <cpu type='kvm' name='EPYC-v4' typename='EPYC-v4-x86_64-cpu' usable='yes'/> - <cpu type='kvm' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='yes'/> + <cpu type='kvm' name='EPYC-v4' typename='EPYC-v4-x86_64-cpu' usable='no'> + <blocker name='xsaves'/> + </cpu> + <cpu type='kvm' name='EPYC-v3' typename='EPYC-v3-x86_64-cpu' usable='no'> + <blocker name='xsaves'/> + </cpu> <cpu type='kvm' name='EPYC-v2' typename='EPYC-v2-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='EPYC-v1' typename='EPYC-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='EPYC-Rome-v4' typename='EPYC-Rome-v4-x86_64-cpu' usable='no'> @@ -1309,12 +1320,18 @@ </cpu> <cpu type='kvm' name='EPYC-Rome-v3' typename='EPYC-Rome-v3-x86_64-cpu' usable='no'> <blocker name='ibrs'/> + <blocker name='xsaves'/> </cpu> <cpu type='kvm' name='EPYC-Rome-v2' typename='EPYC-Rome-v2-x86_64-cpu' usable='no'> <blocker name='ibrs'/> + <blocker name='xsaves'/> + </cpu> + <cpu type='kvm' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='no'> + <blocker name='xsaves'/> + </cpu> + <cpu type='kvm' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='no'> + <blocker name='xsaves'/> </cpu> - <cpu type='kvm' name='EPYC-Rome-v1' typename='EPYC-Rome-v1-x86_64-cpu' usable='yes'/> - <cpu type='kvm' name='EPYC-Rome' typename='EPYC-Rome-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='EPYC-Milan-v2' typename='EPYC-Milan-v2-x86_64-cpu' usable='no'> <blocker name='pcid'/> <blocker name='erms'/> @@ -1327,6 +1344,7 @@ <blocker name='stibp-always-on'/> <blocker name='amd-psfd'/> <blocker name='no-nested-data-bp'/> + <blocker name='xsaves'/> <blocker name='pku'/> </cpu> <cpu type='kvm' name='EPYC-Milan-v1' typename='EPYC-Milan-v1-x86_64-cpu' usable='no'> @@ -1336,6 +1354,7 @@ <blocker name='pku'/> <blocker name='fsrm'/> <blocker name='ibrs'/> + <blocker name='xsaves'/> <blocker name='pku'/> </cpu> <cpu type='kvm' name='EPYC-Milan' typename='EPYC-Milan-x86_64-cpu' usable='no'> @@ -1345,6 +1364,7 @@ <blocker name='pku'/> <blocker name='fsrm'/> <blocker name='ibrs'/> + <blocker name='xsaves'/> <blocker name='pku'/> </cpu> <cpu type='kvm' name='EPYC-IBPB' typename='EPYC-IBPB-x86_64-cpu' usable='yes'/> @@ -1375,6 +1395,7 @@ <blocker name='amd-psfd'/> <blocker name='no-nested-data-bp'/> <blocker name='auto-ibrs'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -1407,18 +1428,22 @@ <blocker name='amd-psfd'/> <blocker name='no-nested-data-bp'/> <blocker name='auto-ibrs'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='pku'/> </cpu> <cpu type='kvm' name='EPYC' typename='EPYC-x86_64-cpu' usable='yes'/> - <cpu type='kvm' name='Dhyana-v2' typename='Dhyana-v2-x86_64-cpu' usable='yes'/> + <cpu type='kvm' name='Dhyana-v2' typename='Dhyana-v2-x86_64-cpu' usable='no'> + <blocker name='xsaves'/> + </cpu> <cpu type='kvm' name='Dhyana-v1' typename='Dhyana-v1-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Dhyana' typename='Dhyana-x86_64-cpu' usable='yes'/> <cpu type='kvm' name='Denverton-v3' typename='Denverton-v3-x86_64-cpu' usable='no'> <blocker name='erms'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> </cpu> <cpu type='kvm' name='Denverton-v2' typename='Denverton-v2-x86_64-cpu' usable='no'> <blocker name='erms'/> @@ -1453,6 +1478,7 @@ <blocker name='avx512vnni'/> <blocker name='spec-ctrl'/> <blocker name='avx512-bf16'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -1518,6 +1544,7 @@ <blocker name='pku'/> <blocker name='avx512vnni'/> <blocker name='spec-ctrl'/> + <blocker name='xsaves'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index 92c260c0e6..3afc39af56 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ -machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ -accel kvm \ --cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on \ +-cpu EPYC-Rome,x2apic=on,tsc-deadline=on,hypervisor=on,tsc-adjust=on,stibp=on,arch-capabilities=on,ssbd=on,cmp-legacy=on,amd-ssbd=on,virt-ssbd=on,lbrv=on,tsc-scale=on,vmcb-clean=on,pause-filter=on,pfthreshold=on,v-vmsave-vmload=on,vgif=on,svme-addr-chk=on,lfence-always-serializing=on,null-sel-clr-base=on,rdctl-no=on,skip-l1dfl-vmentry=on,mds-no=on,pschange-mc-no=on,xsaves=off \ -m 214 \ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ -overcommit mem-lock=off \ -- 2.40.1
New storage types are not implemented in generators for -drive and the xen config. Explicitly reject them in case of a programming error. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/libxl/xen_xl.c | 4 +++- src/qemu/qemu_command.c | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 77f9f112f0..1cc42fa59f 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1525,7 +1525,9 @@ xenFormatXLDiskSrc(virStorageSource *src, char **srcstr) case VIR_STORAGE_TYPE_VHOST_USER: case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: - break; + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unsupported storage type for this code path")); + return -1; } return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a19902988c..8f5bc02459 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1638,10 +1638,11 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk, case VIR_STORAGE_TYPE_VHOST_USER: case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: - break; + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unsupported storage type for this code path")); + return -1; } - virBufferAddLit(buf, ","); if (encinfo) { -- 2.40.1
On a Friday in 2023, Peter Krempa wrote:
Peter Krempa (2): tests: qemucapabilitiesdata: Update data for qemu-8.1 dev cycle Explicitly reject unsupported storage types for legacy config generators
src/libxl/xen_xl.c | 4 +- src/qemu/qemu_command.c | 5 +- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 +- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 - tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 +- .../caps_8.1.0_x86_64.replies | 82 +++++++++++-------- .../caps_8.1.0_x86_64.xml | 43 ++++++++-- .../cpu-host-model.x86_64-latest.args | 2 +- 8 files changed, 95 insertions(+), 52 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko -
Peter Krempa