806516057f
- conf, docs: Add support for direct and extended tlbflush features (RHEL-7122) - qemu: Add support for direct and extended tlbflush features (RHEL-7122) - conf: refactor hyperv features formatting (RHEL-7122) - conf: Adjust hyperv tlbflush formatting (RHEL-7122) - qemu_migration: Do not consider post-copy active in postcopy-recover (RHEL-73085) Resolves: RHEL-7122, RHEL-73085
73 lines
2.9 KiB
Diff
73 lines
2.9 KiB
Diff
From e34ac564b018b166a7d6f955f2abe80a9e62f07e Mon Sep 17 00:00:00 2001
|
|
Message-ID: <e34ac564b018b166a7d6f955f2abe80a9e62f07e.1737030652.git.jdenemar@redhat.com>
|
|
From: Martin Kletzander <mkletzan@redhat.com>
|
|
Date: Mon, 6 Jan 2025 16:11:01 +0100
|
|
Subject: [PATCH] conf: Adjust hyperv tlbflush formatting
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 247357cc292a added support for direct and extended modes for
|
|
tlbflush, but forgot to do the formatting as well.
|
|
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
|
|
(cherry picked from commit 9df14f51735eeb4221a25ccd408a2dccf0a35b59)
|
|
|
|
https://issues.redhat.com/browse/RHEL-7122
|
|
|
|
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
---
|
|
src/conf/domain_conf.c | 11 ++++++++++-
|
|
tests/qemuxmlconfdata/hyperv.x86_64-latest.xml | 5 ++++-
|
|
2 files changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
index c8254d2146..1f0b67ca28 100644
|
|
--- a/src/conf/domain_conf.c
|
|
+++ b/src/conf/domain_conf.c
|
|
@@ -27974,7 +27974,6 @@ virDomainDefFormatFeatures(virBuffer *buf,
|
|
case VIR_DOMAIN_HYPERV_RESET:
|
|
case VIR_DOMAIN_HYPERV_FREQUENCIES:
|
|
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
|
|
- case VIR_DOMAIN_HYPERV_TLBFLUSH:
|
|
case VIR_DOMAIN_HYPERV_IPI:
|
|
case VIR_DOMAIN_HYPERV_EVMCS:
|
|
case VIR_DOMAIN_HYPERV_AVIC:
|
|
@@ -28004,6 +28003,16 @@ virDomainDefFormatFeatures(virBuffer *buf,
|
|
}
|
|
break;
|
|
|
|
+ case VIR_DOMAIN_HYPERV_TLBFLUSH:
|
|
+ if (def->hyperv_features[j] != VIR_TRISTATE_SWITCH_ON)
|
|
+ break;
|
|
+
|
|
+ if (def->hyperv_tlbflush_direct == VIR_TRISTATE_SWITCH_ON)
|
|
+ virBufferAddLit(&hypervChildBuf, "<direct state='on'/>\n");
|
|
+ if (def->hyperv_tlbflush_extended == VIR_TRISTATE_SWITCH_ON)
|
|
+ virBufferAddLit(&hypervChildBuf, "<extended state='on'/>\n");
|
|
+ break;
|
|
+
|
|
case VIR_DOMAIN_HYPERV_LAST:
|
|
break;
|
|
}
|
|
diff --git a/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
|
|
index 36d9161fa8..49537188af 100644
|
|
--- a/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
|
|
+++ b/tests/qemuxmlconfdata/hyperv.x86_64-latest.xml
|
|
@@ -22,7 +22,10 @@
|
|
<vendor_id state='on' value='KVM Hv'/>
|
|
<frequencies state='on'/>
|
|
<reenlightenment state='on'/>
|
|
- <tlbflush state='on'/>
|
|
+ <tlbflush state='on'>
|
|
+ <direct state='on'/>
|
|
+ <extended state='on'/>
|
|
+ </tlbflush>
|
|
<ipi state='on'/>
|
|
<evmcs state='on'/>
|
|
<avic state='on'/>
|
|
--
|
|
2.47.1
|