forked from rpms/libvirt
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
|
From cc56efa7f1681ae29b8a5de14bd31d35029a249a Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <cc56efa7f1681ae29b8a5de14bd31d35029a249a@dist-git>
|
||
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
||
|
|
Date: Tue, 4 Dec 2018 16:46:16 +0100
|
||
|
|
Subject: [PATCH] qemu: Drop duplicated code from
|
||
|
|
qemuDomainDefValidateFeatures()
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Both VIR_DOMAIN_FEATURE_HPT and VIR_DOMAIN_FEATURE_HTM are
|
||
|
|
handled in the exact same way, so we can remove some duplicated
|
||
|
|
code without losing any functionality.
|
||
|
|
|
||
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
||
|
|
(cherry picked from commit 094c97ffadda41bb2ce2dfe699710630218975f2)
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1647822
|
||
|
|
|
||
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_domain.c | 14 +-------------
|
||
|
|
1 file changed, 1 insertion(+), 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
||
|
|
index 08f479fa1d..4fcca1e05a 100644
|
||
|
|
--- a/src/qemu/qemu_domain.c
|
||
|
|
+++ b/src/qemu/qemu_domain.c
|
||
|
|
@@ -3818,6 +3818,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
|
||
|
|
break;
|
||
|
|
|
||
|
|
case VIR_DOMAIN_FEATURE_HPT:
|
||
|
|
+ case VIR_DOMAIN_FEATURE_HTM:
|
||
|
|
if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
|
||
|
|
!qemuDomainIsPSeries(def)) {
|
||
|
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||
|
|
@@ -3852,19 +3853,6 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
|
||
|
|
- case VIR_DOMAIN_FEATURE_HTM:
|
||
|
|
- if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT &&
|
||
|
|
- !qemuDomainIsPSeries(def)) {
|
||
|
|
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||
|
|
- _("The '%s' feature is not supported for "
|
||
|
|
- "architecture '%s' or machine type '%s'"),
|
||
|
|
- featureName,
|
||
|
|
- virArchToString(def->os.arch),
|
||
|
|
- def->os.machine);
|
||
|
|
- return -1;
|
||
|
|
- }
|
||
|
|
- break;
|
||
|
|
-
|
||
|
|
case VIR_DOMAIN_FEATURE_ACPI:
|
||
|
|
case VIR_DOMAIN_FEATURE_APIC:
|
||
|
|
case VIR_DOMAIN_FEATURE_PAE:
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|