[Xen-changelog] [xen master] x86: don't report PV support when !CONFIG_PV

[p***@xen.org]

commit c49894090c22473c5477e780a829b0931a90b4f9
Author: Wei Liu <***@citrix.com>
AuthorDate: Thu Oct 4 16:43:33 2018 +0100
Commit: Wei Liu <***@citrix.com>
CommitDate: Sun Oct 14 20:23:58 2018 +0100

x86: don't report PV support when !CONFIG_PV

Signed-off-by: Wei Liu <***@citrix.com>
Acked-by: Jan Beulich <***@suse.com>
---
xen/arch/x86/setup.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 6a449024c2..93b79c7c0c 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1817,10 +1817,13 @@ void arch_get_xen_caps(xen_capabilities_info_t *info)

(*info)[0] = '\0';

- snprintf(s, sizeof(s), "xen-%d.%d-x86_64 ", major, minor);
- safe_strcat(*info, s);
- snprintf(s, sizeof(s), "xen-%d.%d-x86_32p ", major, minor);
- safe_strcat(*info, s);
+ if ( IS_ENABLED(CONFIG_PV) )
+ {
+ snprintf(s, sizeof(s), "xen-%d.%d-x86_64 ", major, minor);
+ safe_strcat(*info, s);
+ snprintf(s, sizeof(s), "xen-%d.%d-x86_32p ", major, minor);
+ safe_strcat(*info, s);
+ }
if ( hvm_enabled )
{
snprintf(s, sizeof(s), "hvm-%d.%d-x86_32 ", major, minor);
--
generated by git-patchbot for /home/xen/git/xen.git#master