Such helpers is just a wrapper to the existing
x86_cpu_policies_are_compatible function. This requires building
policy.c from libx86 on user land also.
No user of the interface introduced.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
tools/include/xenctrl.h | 4 ++++
tools/libs/guest/Makefile | 2 +-
tools/libs/guest/xg_cpuid_x86.c | 17 +++++++++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/tools/include/xenctrl.h b/tools/include/xenctrl.h
index 164a287b367..165beff330f 100644
--- a/tools/include/xenctrl.h
+++ b/tools/include/xenctrl.h
@@ -2619,6 +2619,10 @@ int xc_cpu_policy_update_cpuid(xc_interface *xch,
xc_cpu_policy_t policy,
int xc_cpu_policy_update_msrs(xc_interface *xch, xc_cpu_policy_t policy,
const xen_msr_entry_t *msrs, uint32_t nr);
+/* Compatibility calculations. */
+bool xc_cpu_policy_is_compatible(xc_interface *xch, const xc_cpu_policy_t p1,
+ const xc_cpu_policy_t p2);
+
int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps);
int xc_get_cpu_featureset(xc_interface *xch, uint32_t index,
uint32_t *nr_features, uint32_t *featureset);
diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile
index 604e1695d6a..6d2a1d5bbc0 100644
--- a/tools/libs/guest/Makefile
+++ b/tools/libs/guest/Makefile
@@ -40,7 +40,7 @@ $(patsubst %.c,%.opic,$(ELF_SRCS-y)): CFLAGS +=
-Wno-pointer-sign
ifeq ($(CONFIG_X86),y) # Add libx86 to the build
vpath %.c ../../../xen/lib/x86
-SRCS-y += cpuid.c msr.c
+SRCS-y += cpuid.c msr.c policy.c
endif
# new domain builder
diff --git a/tools/libs/guest/xg_cpuid_x86.c b/tools/libs/guest/xg_cpuid_x86.c
index f7b662f31aa..30ea02a0f31 100644
--- a/tools/libs/guest/xg_cpuid_x86.c
+++ b/tools/libs/guest/xg_cpuid_x86.c
@@ -1098,3 +1098,20 @@ int xc_cpu_policy_update_msrs(xc_interface *xch,
xc_cpu_policy_t policy,
return rc;
}
+
+bool xc_cpu_policy_is_compatible(xc_interface *xch, const xc_cpu_policy_t p1,
+ const xc_cpu_policy_t p2)
+{
+ struct cpu_policy_errors err;
+ int rc = x86_cpu_policies_are_compatible(p1, p2, &err);
+
+ if ( !rc )
+ return true;
+
+ if ( err.leaf != -1 )
+ ERROR("Leaf %#x subleaf %#x is not compatible", err.leaf, err.subleaf);
+ if ( err.msr != -1 )
+ ERROR("MSR index %#x is not compatible", err.msr);
+
+ return false;
+}
--
2.30.1
