xen: rename dom0_op to platform_op

The dom0_op hypercall has been renamed to platform_op since Xen 3.2,
which is ancient, and modern upstream Linux kernels cannot run as dom0
and it anymore anyway.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
(cherry picked from commit cfafae940381207d48b11a73a211142dba5947d3)
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
index 4c20dd333412db5b367d0625e9b7cf69a7891493..3bcdcc84259d98b919a7cc455b07082660bb6393 100644 (file)
--- a/arch/x86/include/asm/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
@@ -310,10 +310,10 @@ HYPERVISOR_mca(struct xen_mc *mc_op)
 }
 
 static inline int
-HYPERVISOR_dom0_op(struct xen_platform_op *platform_op)
+HYPERVISOR_platform_op(struct xen_platform_op *op)
 {
-       platform_op->interface_version = XENPF_INTERFACE_VERSION;
-       return _hypercall1(int, dom0_op, platform_op);
+       op->interface_version = XENPF_INTERFACE_VERSION;
+       return _hypercall1(int, platform_op, op);
 }
 
 static inline int

diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c
index acda713ab5beaba2c986191012a25c875c3a267c..abf4901c917bacd58e8172b4566ad8b3eb10a467 100644 (file)
--- a/arch/x86/xen/apic.c
+++ b/arch/x86/xen/apic.c
@@ -64,7 +64,7 @@ static u32 xen_apic_read(u32 reg)
        if (reg != APIC_ID)
                return 0;
 
-       ret = HYPERVISOR_dom0_op(&op);
+       ret = HYPERVISOR_platform_op(&op);
        if (ret)
                return 0;
 

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 3bf9201933396a9c92d5eed55d7c119d91098761..8d50c7b25734adfdf4140d109dadc1b8a580d52e 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -426,7 +426,7 @@ static bool __init xen_check_mwait(void)
 
        set_xen_guest_handle(op.u.set_pminfo.pdc, buf);
 
-       if ((HYPERVISOR_dom0_op(&op) == 0) &&
+       if ((HYPERVISOR_platform_op(&op) == 0) &&
            (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) {
                cpuid_leaf5_ecx_val = cx;
                cpuid_leaf5_edx_val = dx;
@@ -1341,7 +1341,7 @@ static void __init xen_boot_params_init_edd(void)
                info->params.length = sizeof(info->params);
                set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params,
                                     &info->params);
-               ret = HYPERVISOR_dom0_op(&op);
+               ret = HYPERVISOR_platform_op(&op);
                if (ret)
                        break;
 
@@ -1359,7 +1359,7 @@ static void __init xen_boot_params_init_edd(void)
        op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE;
        for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) {
                op.u.firmware_info.index = nr;
-               ret = HYPERVISOR_dom0_op(&op);
+               ret = HYPERVISOR_platform_op(&op);
                if (ret)
                        break;
                mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature;
@@ -1665,7 +1665,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
                xen_start_info->console.domU.mfn = 0;
                xen_start_info->console.domU.evtchn = 0;
 
-               if (HYPERVISOR_dom0_op(&op) == 0)
+               if (HYPERVISOR_platform_op(&op) == 0)
                        boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags;
 
                /* Make sure ACS will be enabled */

diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 8ea547a8165bd45e3903d33c48128f44ae022515..4e99c02576ca2db07064feb572f85c8f0fe9cd6b 100644 (file)
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -139,7 +139,7 @@ static int xen_pvclock_gtod_notify(struct notifier_block *nb,
        op.u.settime.nsecs = now.tv_nsec;
        op.u.settime.system_time = xen_clocksource_read();
 
-       (void)HYPERVISOR_dom0_op(&op);
+       (void)HYPERVISOR_platform_op(&op);
 
        /*
         * Move the next drift compensation time 11 minutes

diff --git a/drivers/xen/acpi.c b/drivers/xen/acpi.c
index 90307c0b630c14b10faf01eb1b764e6578cbc72e..6893c79fd2a1ae1aa3d248adb3c860085e35f7f5 100644 (file)
--- a/drivers/xen/acpi.c
+++ b/drivers/xen/acpi.c
@@ -58,7 +58,7 @@ static int xen_acpi_notify_hypervisor_state(u8 sleep_state,
                 bits, val_a, val_b))
                return -1;
 
-       HYPERVISOR_dom0_op(&op);
+       HYPERVISOR_platform_op(&op);
        return 1;
 }
 

diff --git a/drivers/xen/efi.c b/drivers/xen/efi.c
index f745db2701719fad20d88cf2db2a935513a73465..be7e56a338e84dba95b9e42cddc7db3d15f224a8 100644 (file)
--- a/drivers/xen/efi.c
+++ b/drivers/xen/efi.c
@@ -42,7 +42,7 @@ static efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
 {
        struct xen_platform_op op = INIT_EFI_OP(get_time);
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        if (tm) {
@@ -67,7 +67,7 @@ static efi_status_t xen_efi_set_time(efi_time_t *tm)
        BUILD_BUG_ON(sizeof(*tm) != sizeof(efi_data(op).u.set_time));
        memcpy(&efi_data(op).u.set_time, tm, sizeof(*tm));
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        return efi_data(op).status;
@@ -79,7 +79,7 @@ static efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled,
 {
        struct xen_platform_op op = INIT_EFI_OP(get_wakeup_time);
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        if (tm) {
@@ -108,7 +108,7 @@ static efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
        else
                efi_data(op).misc |= XEN_EFI_SET_WAKEUP_TIME_ENABLE_ONLY;
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        return efi_data(op).status;
@@ -129,7 +129,7 @@ static efi_status_t xen_efi_get_variable(efi_char16_t *name,
        efi_data(op).u.get_variable.size = *data_size;
        set_xen_guest_handle(efi_data(op).u.get_variable.data, data);
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        *data_size = efi_data(op).u.get_variable.size;
@@ -152,7 +152,7 @@ static efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
        memcpy(&efi_data(op).u.get_next_variable_name.vendor_guid, vendor,
               sizeof(*vendor));
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        *name_size = efi_data(op).u.get_next_variable_name.size;
@@ -178,7 +178,7 @@ static efi_status_t xen_efi_set_variable(efi_char16_t *name,
        efi_data(op).u.set_variable.size = data_size;
        set_xen_guest_handle(efi_data(op).u.set_variable.data, data);
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        return efi_data(op).status;
@@ -196,7 +196,7 @@ static efi_status_t xen_efi_query_variable_info(u32 attr,
 
        efi_data(op).u.query_variable_info.attr = attr;
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        *storage_space = efi_data(op).u.query_variable_info.max_store_size;
@@ -210,7 +210,7 @@ static efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
 {
        struct xen_platform_op op = INIT_EFI_OP(get_next_high_monotonic_count);
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        *count = efi_data(op).misc;
@@ -232,7 +232,7 @@ static efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
        efi_data(op).u.update_capsule.capsule_count = count;
        efi_data(op).u.update_capsule.sg_list = sg_list;
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        return efi_data(op).status;
@@ -252,7 +252,7 @@ static efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
                                        capsules);
        efi_data(op).u.query_capsule_capabilities.capsule_count = count;
 
-       if (HYPERVISOR_dom0_op(&op) < 0)
+       if (HYPERVISOR_platform_op(&op) < 0)
                return EFI_UNSUPPORTED;
 
        *max_size = efi_data(op).u.query_capsule_capabilities.max_capsule_size;
@@ -331,7 +331,7 @@ efi_system_table_t __init *xen_efi_probe(void)
        };
        union xenpf_efi_info *info = &op.u.firmware_info.u.efi_info;
 
-       if (!xen_initial_domain() || HYPERVISOR_dom0_op(&op) < 0)
+       if (!xen_initial_domain() || HYPERVISOR_platform_op(&op) < 0)
                return NULL;
 
        /* Here we know that Xen runs on EFI platform. */
@@ -347,7 +347,7 @@ efi_system_table_t __init *xen_efi_probe(void)
        info->vendor.bufsz = sizeof(vendor);
        set_xen_guest_handle(info->vendor.name, vendor);
 
-       if (HYPERVISOR_dom0_op(&op) == 0) {
+       if (HYPERVISOR_platform_op(&op) == 0) {
                efi_systab_xen.fw_vendor = __pa_symbol(vendor);
                efi_systab_xen.fw_revision = info->vendor.revision;
        } else
@@ -357,14 +357,14 @@ efi_system_table_t __init *xen_efi_probe(void)
        op.u.firmware_info.type = XEN_FW_EFI_INFO;
        op.u.firmware_info.index = XEN_FW_EFI_VERSION;
 
-       if (HYPERVISOR_dom0_op(&op) == 0)
+       if (HYPERVISOR_platform_op(&op) == 0)
                efi_systab_xen.hdr.revision = info->version;
 
        op.cmd = XENPF_firmware_info;
        op.u.firmware_info.type = XEN_FW_EFI_INFO;
        op.u.firmware_info.index = XEN_FW_EFI_RT_VERSION;
 
-       if (HYPERVISOR_dom0_op(&op) == 0)
+       if (HYPERVISOR_platform_op(&op) == 0)
                efi.runtime_version = info->version;
 
        return &efi_systab_xen;

diff --git a/drivers/xen/pcpu.c b/drivers/xen/pcpu.c
index 49e88f2ce7a1889e43f4bf9767f4502b4909f3ed..cdc6daa7a9f66f9a534e619af244bc8843bcccef 100644 (file)
--- a/drivers/xen/pcpu.c
+++ b/drivers/xen/pcpu.c
@@ -78,7 +78,7 @@ static int xen_pcpu_down(uint32_t cpu_id)
                .u.cpu_ol.cpuid         = cpu_id,
        };
 
-       return HYPERVISOR_dom0_op(&op);
+       return HYPERVISOR_platform_op(&op);
 }
 
 static int xen_pcpu_up(uint32_t cpu_id)
@@ -89,7 +89,7 @@ static int xen_pcpu_up(uint32_t cpu_id)
                .u.cpu_ol.cpuid         = cpu_id,
        };
 
-       return HYPERVISOR_dom0_op(&op);
+       return HYPERVISOR_platform_op(&op);
 }
 
 static ssize_t show_online(struct device *dev,
@@ -277,7 +277,7 @@ static int sync_pcpu(uint32_t cpu, uint32_t *max_cpu)
                .u.pcpu_info.xen_cpuid = cpu,
        };
 
-       ret = HYPERVISOR_dom0_op(&op);
+       ret = HYPERVISOR_platform_op(&op);
        if (ret)
                return ret;
 
@@ -364,7 +364,7 @@ int xen_pcpu_id(uint32_t acpi_id)
        op.cmd = XENPF_get_cpuinfo;
        while (cpu_id <= max_id) {
                op.u.pcpu_info.xen_cpuid = cpu_id;
-               if (HYPERVISOR_dom0_op(&op)) {
+               if (HYPERVISOR_platform_op(&op)) {
                        cpu_id++;
                        continue;
                }

diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c
index 3e62ee4b3b6641208e6833b639e25e5203f75ec9..e339a85b307d41591031ba4f60ca0d7e20dc248d 100644 (file)
--- a/drivers/xen/xen-acpi-cpuhotplug.c
+++ b/drivers/xen/xen-acpi-cpuhotplug.c
@@ -212,7 +212,7 @@ static int xen_hotadd_cpu(struct acpi_processor *pr)
        op.u.cpu_add.acpi_id = pr->acpi_id;
        op.u.cpu_add.pxm = pxm;
 
-       cpu_id = HYPERVISOR_dom0_op(&op);
+       cpu_id = HYPERVISOR_platform_op(&op);
        if (cpu_id < 0)
                pr_err(PREFIX "Failed to hotadd CPU for acpi_id %d\n",
                                pr->acpi_id);

diff --git a/drivers/xen/xen-acpi-pad.c b/drivers/xen/xen-acpi-pad.c
index f83b754505f83e1f0906f7d0e4d628bf2ad16e83..23d1808fe027a45db7094bf5dd5477d776194fd1 100644 (file)
--- a/drivers/xen/xen-acpi-pad.c
+++ b/drivers/xen/xen-acpi-pad.c
@@ -36,7 +36,7 @@ static int xen_acpi_pad_idle_cpus(unsigned int idle_nums)
        op.u.core_parking.type = XEN_CORE_PARKING_SET;
        op.u.core_parking.idle_nums = idle_nums;
 
-       return HYPERVISOR_dom0_op(&op);
+       return HYPERVISOR_platform_op(&op);
 }
 
 static int xen_acpi_pad_idle_cpus_num(void)
@@ -46,7 +46,7 @@ static int xen_acpi_pad_idle_cpus_num(void)
        op.cmd = XENPF_core_parking;
        op.u.core_parking.type = XEN_CORE_PARKING_GET;
 
-       return HYPERVISOR_dom0_op(&op)
+       return HYPERVISOR_platform_op(&op)
               ?: op.u.core_parking.idle_nums;
 }
 

diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 59fc190f1e927da2edc58a536557adac9ce73a8f..df421fa2b5e9432d4c6248df4341795565647a65 100644 (file)
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -116,7 +116,7 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
        set_xen_guest_handle(op.u.set_pminfo.power.states, dst_cx_states);
 
        if (!no_hypercall)
-               ret = HYPERVISOR_dom0_op(&op);
+               ret = HYPERVISOR_platform_op(&op);
 
        if (!ret) {
                pr_debug("ACPI CPU%u - C-states uploaded.\n", _pr->acpi_id);
@@ -244,7 +244,7 @@ static int push_pxx_to_hypervisor(struct acpi_processor *_pr)
        }
 
        if (!no_hypercall)
-               ret = HYPERVISOR_dom0_op(&op);
+               ret = HYPERVISOR_platform_op(&op);
 
        if (!ret) {
                struct acpi_processor_performance *perf;
@@ -302,7 +302,7 @@ static unsigned int __init get_max_acpi_id(void)
        info = &op.u.pcpu_info;
        info->xen_cpuid = 0;
 
-       ret = HYPERVISOR_dom0_op(&op);
+       ret = HYPERVISOR_platform_op(&op);
        if (ret)
                return NR_CPUS;
 
@@ -310,7 +310,7 @@ static unsigned int __init get_max_acpi_id(void)
        last_cpu = op.u.pcpu_info.max_present;
        for (i = 0; i <= last_cpu; i++) {
                info->xen_cpuid = i;
-               ret = HYPERVISOR_dom0_op(&op);
+               ret = HYPERVISOR_platform_op(&op);
                if (ret)
                        continue;
                max_acpi_id = max(info->acpi_id, max_acpi_id);

diff --git a/drivers/xen/xenfs/xensyms.c b/drivers/xen/xenfs/xensyms.c
index f8b12856753f0c0b0358571e55082986913733dd..a03f261b12d8956ecf83ac1dad19c9a957fe0c54 100644 (file)
--- a/drivers/xen/xenfs/xensyms.c
+++ b/drivers/xen/xenfs/xensyms.c
@@ -31,7 +31,7 @@ static int xensyms_next_sym(struct xensyms *xs)
 
        symnum = symdata->symnum;
 
-       ret = HYPERVISOR_dom0_op(&xs->op);
+       ret = HYPERVISOR_platform_op(&xs->op);
        if (ret < 0)
                return ret;
 
@@ -50,7 +50,7 @@ static int xensyms_next_sym(struct xensyms *xs)
                set_xen_guest_handle(symdata->name, xs->name);
                symdata->symnum--; /* Rewind */
 
-               ret = HYPERVISOR_dom0_op(&xs->op);
+               ret = HYPERVISOR_platform_op(&xs->op);
                if (ret < 0)
                        return ret;
        }

diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h
index 167071c290b3d2afbb8fe949cf668dd19077367e..d1331121c0bd8c31a4f2b0e3e9a85b37078b30bf 100644 (file)
--- a/include/xen/interface/xen.h
+++ b/include/xen/interface/xen.h
@@ -48,7 +48,7 @@
 #define __HYPERVISOR_set_callbacks         4
 #define __HYPERVISOR_fpu_taskswitch        5
 #define __HYPERVISOR_sched_op_compat       6
-#define __HYPERVISOR_dom0_op               7
+#define __HYPERVISOR_platform_op           7
 #define __HYPERVISOR_set_debugreg          8
 #define __HYPERVISOR_get_debugreg          9
 #define __HYPERVISOR_update_descriptor    10