From: Metin Kaya <metikaya@xxxxxxxxxx>
- synic_supported() is renamed to hv_synic_supported().
- stimer_supported() is renamed to hv_stimer_supported().
Signed-off-by: Metin Kaya <metikaya@xxxxxxxxxx>
Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
---
x86/hyperv.h | 4 ++--
x86/hyperv_connections.c | 2 +-
x86/hyperv_stimer.c | 4 ++--
x86/hyperv_synic.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/x86/hyperv.h b/x86/hyperv.h
index bc165c344a11..3e1723ee9609 100644
--- a/x86/hyperv.h
+++ b/x86/hyperv.h
@@ -183,12 +183,12 @@ struct hv_input_post_message {
u64 payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
};
-static inline bool synic_supported(void)
+static inline bool hv_synic_supported(void)
{
return cpuid(HYPERV_CPUID_FEATURES).a & HV_X64_MSR_SYNIC_AVAILABLE;
}
-static inline bool stimer_supported(void)
+static inline bool hv_stimer_supported(void)
{
return cpuid(HYPERV_CPUID_FEATURES).a & HV_X64_MSR_SYNTIMER_AVAILABLE;
}
diff --git a/x86/hyperv_connections.c b/x86/hyperv_connections.c
index cf043664b329..2c6841553ee4 100644
--- a/x86/hyperv_connections.c
+++ b/x86/hyperv_connections.c
@@ -266,7 +266,7 @@ int main(int ac, char **av)
{
int ncpus, ncpus_ok, i;
- if (!synic_supported()) {
+ if (!hv_synic_supported()) {
report_skip("Hyper-V SynIC is not supported");
goto summary;
}
diff --git a/x86/hyperv_stimer.c b/x86/hyperv_stimer.c
index f7c679160bdf..2344eaf56f11 100644
--- a/x86/hyperv_stimer.c
+++ b/x86/hyperv_stimer.c
@@ -352,12 +352,12 @@ static void stimer_test_all(void)
int main(int ac, char **av)
{
- if (!synic_supported()) {
+ if (!hv_synic_supported()) {
report_pass("Hyper-V SynIC is not supported");
goto done;
}
- if (!stimer_supported()) {
+ if (!hv_stimer_supported()) {
report_pass("Hyper-V SynIC timers are not supported");
goto done;
}
diff --git a/x86/hyperv_synic.c b/x86/hyperv_synic.c
index 9d61d8362ebd..00655db10131 100644
--- a/x86/hyperv_synic.c
+++ b/x86/hyperv_synic.c
@@ -142,7 +142,7 @@ static void synic_test_cleanup(void *ctx)
int main(int ac, char **av)
{
- if (synic_supported()) {
+ if (hv_synic_supported()) {
int ncpus, i;
bool ok;
--
2.44.0
