Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stefano Stabellini and committed by
David Vrabel
cfafae94 34e38523

+39 -39
+3 -3
arch/x86/include/asm/xen/hypercall.h
··· 310 310 } 311 311 312 312 static inline int 313 - HYPERVISOR_dom0_op(struct xen_platform_op *platform_op) 313 + HYPERVISOR_platform_op(struct xen_platform_op *op) 314 314 { 315 - platform_op->interface_version = XENPF_INTERFACE_VERSION; 316 - return _hypercall1(int, dom0_op, platform_op); 315 + op->interface_version = XENPF_INTERFACE_VERSION; 316 + return _hypercall1(int, platform_op, op); 317 317 } 318 318 319 319 static inline int
+1 -1
arch/x86/xen/apic.c
··· 64 64 if (reg != APIC_ID) 65 65 return 0; 66 66 67 - ret = HYPERVISOR_dom0_op(&op); 67 + ret = HYPERVISOR_platform_op(&op); 68 68 if (ret) 69 69 return 0; 70 70
+4 -4
arch/x86/xen/enlighten.c
··· 415 415 416 416 set_xen_guest_handle(op.u.set_pminfo.pdc, buf); 417 417 418 - if ((HYPERVISOR_dom0_op(&op) == 0) && 418 + if ((HYPERVISOR_platform_op(&op) == 0) && 419 419 (buf[2] & (ACPI_PDC_C_C1_FFH | ACPI_PDC_C_C2C3_FFH))) { 420 420 cpuid_leaf5_ecx_val = cx; 421 421 cpuid_leaf5_edx_val = dx; ··· 1374 1374 info->params.length = sizeof(info->params); 1375 1375 set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params, 1376 1376 &info->params); 1377 - ret = HYPERVISOR_dom0_op(&op); 1377 + ret = HYPERVISOR_platform_op(&op); 1378 1378 if (ret) 1379 1379 break; 1380 1380 ··· 1392 1392 op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE; 1393 1393 for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) { 1394 1394 op.u.firmware_info.index = nr; 1395 - ret = HYPERVISOR_dom0_op(&op); 1395 + ret = HYPERVISOR_platform_op(&op); 1396 1396 if (ret) 1397 1397 break; 1398 1398 mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature; ··· 1698 1698 xen_start_info->console.domU.mfn = 0; 1699 1699 xen_start_info->console.domU.evtchn = 0; 1700 1700 1701 - if (HYPERVISOR_dom0_op(&op) == 0) 1701 + if (HYPERVISOR_platform_op(&op) == 0) 1702 1702 boot_params.kbd_status = op.u.firmware_info.u.kbd_shift_flags; 1703 1703 1704 1704 /* Make sure ACS will be enabled */
+1 -1
arch/x86/xen/time.c
··· 139 139 op.u.settime.nsecs = now.tv_nsec; 140 140 op.u.settime.system_time = xen_clocksource_read(); 141 141 142 - (void)HYPERVISOR_dom0_op(&op); 142 + (void)HYPERVISOR_platform_op(&op); 143 143 144 144 /* 145 145 * Move the next drift compensation time 11 minutes
+1 -1
drivers/xen/acpi.c
··· 58 58 bits, val_a, val_b)) 59 59 return -1; 60 60 61 - HYPERVISOR_dom0_op(&op); 61 + HYPERVISOR_platform_op(&op); 62 62 return 1; 63 63 } 64 64
+15 -15
drivers/xen/efi.c
··· 42 42 { 43 43 struct xen_platform_op op = INIT_EFI_OP(get_time); 44 44 45 - if (HYPERVISOR_dom0_op(&op) < 0) 45 + if (HYPERVISOR_platform_op(&op) < 0) 46 46 return EFI_UNSUPPORTED; 47 47 48 48 if (tm) { ··· 67 67 BUILD_BUG_ON(sizeof(*tm) != sizeof(efi_data(op).u.set_time)); 68 68 memcpy(&efi_data(op).u.set_time, tm, sizeof(*tm)); 69 69 70 - if (HYPERVISOR_dom0_op(&op) < 0) 70 + if (HYPERVISOR_platform_op(&op) < 0) 71 71 return EFI_UNSUPPORTED; 72 72 73 73 return efi_data(op).status; ··· 79 79 { 80 80 struct xen_platform_op op = INIT_EFI_OP(get_wakeup_time); 81 81 82 - if (HYPERVISOR_dom0_op(&op) < 0) 82 + if (HYPERVISOR_platform_op(&op) < 0) 83 83 return EFI_UNSUPPORTED; 84 84 85 85 if (tm) { ··· 108 108 else 109 109 efi_data(op).misc |= XEN_EFI_SET_WAKEUP_TIME_ENABLE_ONLY; 110 110 111 - if (HYPERVISOR_dom0_op(&op) < 0) 111 + if (HYPERVISOR_platform_op(&op) < 0) 112 112 return EFI_UNSUPPORTED; 113 113 114 114 return efi_data(op).status; ··· 129 129 efi_data(op).u.get_variable.size = *data_size; 130 130 set_xen_guest_handle(efi_data(op).u.get_variable.data, data); 131 131 132 - if (HYPERVISOR_dom0_op(&op) < 0) 132 + if (HYPERVISOR_platform_op(&op) < 0) 133 133 return EFI_UNSUPPORTED; 134 134 135 135 *data_size = efi_data(op).u.get_variable.size; ··· 152 152 memcpy(&efi_data(op).u.get_next_variable_name.vendor_guid, vendor, 153 153 sizeof(*vendor)); 154 154 155 - if (HYPERVISOR_dom0_op(&op) < 0) 155 + if (HYPERVISOR_platform_op(&op) < 0) 156 156 return EFI_UNSUPPORTED; 157 157 158 158 *name_size = efi_data(op).u.get_next_variable_name.size; ··· 178 178 efi_data(op).u.set_variable.size = data_size; 179 179 set_xen_guest_handle(efi_data(op).u.set_variable.data, data); 180 180 181 - if (HYPERVISOR_dom0_op(&op) < 0) 181 + if (HYPERVISOR_platform_op(&op) < 0) 182 182 return EFI_UNSUPPORTED; 183 183 184 184 return efi_data(op).status; ··· 196 196 197 197 efi_data(op).u.query_variable_info.attr = attr; 198 198 199 - if (HYPERVISOR_dom0_op(&op) < 0) 199 + if (HYPERVISOR_platform_op(&op) < 0) 200 200 return EFI_UNSUPPORTED; 201 201 202 202 *storage_space = efi_data(op).u.query_variable_info.max_store_size; ··· 210 210 { 211 211 struct xen_platform_op op = INIT_EFI_OP(get_next_high_monotonic_count); 212 212 213 - if (HYPERVISOR_dom0_op(&op) < 0) 213 + if (HYPERVISOR_platform_op(&op) < 0) 214 214 return EFI_UNSUPPORTED; 215 215 216 216 *count = efi_data(op).misc; ··· 232 232 efi_data(op).u.update_capsule.capsule_count = count; 233 233 efi_data(op).u.update_capsule.sg_list = sg_list; 234 234 235 - if (HYPERVISOR_dom0_op(&op) < 0) 235 + if (HYPERVISOR_platform_op(&op) < 0) 236 236 return EFI_UNSUPPORTED; 237 237 238 238 return efi_data(op).status; ··· 252 252 capsules); 253 253 efi_data(op).u.query_capsule_capabilities.capsule_count = count; 254 254 255 - if (HYPERVISOR_dom0_op(&op) < 0) 255 + if (HYPERVISOR_platform_op(&op) < 0) 256 256 return EFI_UNSUPPORTED; 257 257 258 258 *max_size = efi_data(op).u.query_capsule_capabilities.max_capsule_size; ··· 331 331 }; 332 332 union xenpf_efi_info *info = &op.u.firmware_info.u.efi_info; 333 333 334 - if (!xen_initial_domain() || HYPERVISOR_dom0_op(&op) < 0) 334 + if (!xen_initial_domain() || HYPERVISOR_platform_op(&op) < 0) 335 335 return NULL; 336 336 337 337 /* Here we know that Xen runs on EFI platform. */ ··· 347 347 info->vendor.bufsz = sizeof(vendor); 348 348 set_xen_guest_handle(info->vendor.name, vendor); 349 349 350 - if (HYPERVISOR_dom0_op(&op) == 0) { 350 + if (HYPERVISOR_platform_op(&op) == 0) { 351 351 efi_systab_xen.fw_vendor = __pa_symbol(vendor); 352 352 efi_systab_xen.fw_revision = info->vendor.revision; 353 353 } else ··· 357 357 op.u.firmware_info.type = XEN_FW_EFI_INFO; 358 358 op.u.firmware_info.index = XEN_FW_EFI_VERSION; 359 359 360 - if (HYPERVISOR_dom0_op(&op) == 0) 360 + if (HYPERVISOR_platform_op(&op) == 0) 361 361 efi_systab_xen.hdr.revision = info->version; 362 362 363 363 op.cmd = XENPF_firmware_info; 364 364 op.u.firmware_info.type = XEN_FW_EFI_INFO; 365 365 op.u.firmware_info.index = XEN_FW_EFI_RT_VERSION; 366 366 367 - if (HYPERVISOR_dom0_op(&op) == 0) 367 + if (HYPERVISOR_platform_op(&op) == 0) 368 368 efi.runtime_version = info->version; 369 369 370 370 return &efi_systab_xen;
+4 -4
drivers/xen/pcpu.c
··· 78 78 .u.cpu_ol.cpuid = cpu_id, 79 79 }; 80 80 81 - return HYPERVISOR_dom0_op(&op); 81 + return HYPERVISOR_platform_op(&op); 82 82 } 83 83 84 84 static int xen_pcpu_up(uint32_t cpu_id) ··· 89 89 .u.cpu_ol.cpuid = cpu_id, 90 90 }; 91 91 92 - return HYPERVISOR_dom0_op(&op); 92 + return HYPERVISOR_platform_op(&op); 93 93 } 94 94 95 95 static ssize_t show_online(struct device *dev, ··· 277 277 .u.pcpu_info.xen_cpuid = cpu, 278 278 }; 279 279 280 - ret = HYPERVISOR_dom0_op(&op); 280 + ret = HYPERVISOR_platform_op(&op); 281 281 if (ret) 282 282 return ret; 283 283 ··· 364 364 op.cmd = XENPF_get_cpuinfo; 365 365 while (cpu_id <= max_id) { 366 366 op.u.pcpu_info.xen_cpuid = cpu_id; 367 - if (HYPERVISOR_dom0_op(&op)) { 367 + if (HYPERVISOR_platform_op(&op)) { 368 368 cpu_id++; 369 369 continue; 370 370 }
+1 -1
drivers/xen/xen-acpi-cpuhotplug.c
··· 206 206 op.u.cpu_add.acpi_id = pr->acpi_id; 207 207 op.u.cpu_add.pxm = pxm; 208 208 209 - cpu_id = HYPERVISOR_dom0_op(&op); 209 + cpu_id = HYPERVISOR_platform_op(&op); 210 210 if (cpu_id < 0) 211 211 pr_err(PREFIX "Failed to hotadd CPU for acpi_id %d\n", 212 212 pr->acpi_id);
+2 -2
drivers/xen/xen-acpi-pad.c
··· 36 36 op.u.core_parking.type = XEN_CORE_PARKING_SET; 37 37 op.u.core_parking.idle_nums = idle_nums; 38 38 39 - return HYPERVISOR_dom0_op(&op); 39 + return HYPERVISOR_platform_op(&op); 40 40 } 41 41 42 42 static int xen_acpi_pad_idle_cpus_num(void) ··· 46 46 op.cmd = XENPF_core_parking; 47 47 op.u.core_parking.type = XEN_CORE_PARKING_GET; 48 48 49 - return HYPERVISOR_dom0_op(&op) 49 + return HYPERVISOR_platform_op(&op) 50 50 ?: op.u.core_parking.idle_nums; 51 51 } 52 52
+4 -4
drivers/xen/xen-acpi-processor.c
··· 116 116 set_xen_guest_handle(op.u.set_pminfo.power.states, dst_cx_states); 117 117 118 118 if (!no_hypercall) 119 - ret = HYPERVISOR_dom0_op(&op); 119 + ret = HYPERVISOR_platform_op(&op); 120 120 121 121 if (!ret) { 122 122 pr_debug("ACPI CPU%u - C-states uploaded.\n", _pr->acpi_id); ··· 244 244 } 245 245 246 246 if (!no_hypercall) 247 - ret = HYPERVISOR_dom0_op(&op); 247 + ret = HYPERVISOR_platform_op(&op); 248 248 249 249 if (!ret) { 250 250 struct acpi_processor_performance *perf; ··· 302 302 info = &op.u.pcpu_info; 303 303 info->xen_cpuid = 0; 304 304 305 - ret = HYPERVISOR_dom0_op(&op); 305 + ret = HYPERVISOR_platform_op(&op); 306 306 if (ret) 307 307 return NR_CPUS; 308 308 ··· 310 310 last_cpu = op.u.pcpu_info.max_present; 311 311 for (i = 0; i <= last_cpu; i++) { 312 312 info->xen_cpuid = i; 313 - ret = HYPERVISOR_dom0_op(&op); 313 + ret = HYPERVISOR_platform_op(&op); 314 314 if (ret) 315 315 continue; 316 316 max_acpi_id = max(info->acpi_id, max_acpi_id);
+2 -2
drivers/xen/xenfs/xensyms.c
··· 31 31 32 32 symnum = symdata->symnum; 33 33 34 - ret = HYPERVISOR_dom0_op(&xs->op); 34 + ret = HYPERVISOR_platform_op(&xs->op); 35 35 if (ret < 0) 36 36 return ret; 37 37 ··· 50 50 set_xen_guest_handle(symdata->name, xs->name); 51 51 symdata->symnum--; /* Rewind */ 52 52 53 - ret = HYPERVISOR_dom0_op(&xs->op); 53 + ret = HYPERVISOR_platform_op(&xs->op); 54 54 if (ret < 0) 55 55 return ret; 56 56 }
+1 -1
include/xen/interface/xen.h
··· 48 48 #define __HYPERVISOR_set_callbacks 4 49 49 #define __HYPERVISOR_fpu_taskswitch 5 50 50 #define __HYPERVISOR_sched_op_compat 6 51 - #define __HYPERVISOR_dom0_op 7 51 + #define __HYPERVISOR_platform_op 7 52 52 #define __HYPERVISOR_set_debugreg 8 53 53 #define __HYPERVISOR_get_debugreg 9 54 54 #define __HYPERVISOR_update_descriptor 10