59 lines
2.1 KiB
Diff
59 lines
2.1 KiB
Diff
|
From 15746790ca62e46aa68e8a79c51a15bbf9b3d1ab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tim Wiederhake <twiederh@redhat.com>
|
||
|
|
Date: Fri, 19 Feb 2021 10:54:00 +0100
|
||
|
|
Subject: [PATCH] qemu_validate: Allow kvm hint-dedicated on non-passthrough
|
||
|
|
VMs
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
A VM defined similar to:
|
||
|
|
...
|
||
|
|
<features><kvm><hint-dedicated state='on'/></kvm></features>
|
||
|
|
<cpu mode="host-model"/>
|
||
|
|
...
|
||
|
|
is currently invalid, as hint-dedicated is only allowed if cpu mode
|
||
|
|
is host-passthrough or maximum. This restriction is unnecessary, see
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1857671
|
||
|
|
|
||
|
|
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
|
||
|
|
Reviewed-by: J谩n Tomko <jtomko@redhat.com>
|
||
|
|
Signed-off-by: J谩n Tomko <jtomko@redhat.com>
|
||
|
|
Reviewed-by: Shaokun Wei <weishaokun@kylinos.cn>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_domain.c | 11 +----------
|
||
|
|
1 file changed, 1 insertion(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
||
|
|
index fd3e3f64c0..537411a711 100644
|
||
|
|
--- a/src/qemu/qemu_domain.c
|
||
|
|
+++ b/src/qemu/qemu_domain.c
|
||
|
|
@@ -5251,16 +5251,6 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
|
||
|
|
- case VIR_DOMAIN_FEATURE_KVM:
|
||
|
|
- if (def->kvm_features[VIR_DOMAIN_KVM_DEDICATED] == VIR_TRISTATE_SWITCH_ON &&
|
||
|
|
- (!def->cpu || def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH)) {
|
||
|
|
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||
|
|
- _("kvm-hint-dedicated=on is only applicable "
|
||
|
|
- "for cpu host-passthrough"));
|
||
|
|
- return -1;
|
||
|
|
- }
|
||
|
|
- break;
|
||
|
|
-
|
||
|
|
case VIR_DOMAIN_FEATURE_VMPORT:
|
||
|
|
if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
|
||
|
|
!virQEMUCapsSupportsVmport(qemuCaps, def)) {
|
||
|
|
@@ -5333,6 +5323,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
|
||
|
|
+ case VIR_DOMAIN_FEATURE_KVM:
|
||
|
|
case VIR_DOMAIN_FEATURE_ACPI:
|
||
|
|
case VIR_DOMAIN_FEATURE_PAE:
|
||
|
|
case VIR_DOMAIN_FEATURE_HAP:
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|