@@ -197,17 +197,6 @@ extern struct { char _entry[32]; } hypercall_page[];
197
197
(type)__res; \
198
198
})
199
199
200
- #define _hypercall5 (type , name , a1 , a2 , a3 , a4 , a5 ) \
201
- ({ \
202
- __HYPERCALL_DECLS; \
203
- __HYPERCALL_5ARG(a1, a2, a3, a4, a5); \
204
- asm volatile (__HYPERCALL \
205
- : __HYPERCALL_5PARAM \
206
- : __HYPERCALL_ENTRY(name) \
207
- : __HYPERCALL_CLOBBER5); \
208
- (type)__res; \
209
- })
210
-
211
200
static inline long
212
201
xen_single_call (unsigned int call ,
213
202
unsigned long a1 , unsigned long a2 ,
@@ -266,47 +255,12 @@ HYPERVISOR_set_gdt(unsigned long *frame_list, int entries)
266
255
return _hypercall2 (int , set_gdt , frame_list , entries );
267
256
}
268
257
269
- static inline int
270
- HYPERVISOR_stack_switch (unsigned long ss , unsigned long esp )
271
- {
272
- return _hypercall2 (int , stack_switch , ss , esp );
273
- }
274
-
275
- #ifdef CONFIG_X86_32
276
- static inline int
277
- HYPERVISOR_set_callbacks (unsigned long event_selector ,
278
- unsigned long event_address ,
279
- unsigned long failsafe_selector ,
280
- unsigned long failsafe_address )
281
- {
282
- return _hypercall4 (int , set_callbacks ,
283
- event_selector , event_address ,
284
- failsafe_selector , failsafe_address );
285
- }
286
- #else /* CONFIG_X86_64 */
287
- static inline int
288
- HYPERVISOR_set_callbacks (unsigned long event_address ,
289
- unsigned long failsafe_address ,
290
- unsigned long syscall_address )
291
- {
292
- return _hypercall3 (int , set_callbacks ,
293
- event_address , failsafe_address ,
294
- syscall_address );
295
- }
296
- #endif /* CONFIG_X86_{32,64} */
297
-
298
258
static inline int
299
259
HYPERVISOR_callback_op (int cmd , void * arg )
300
260
{
301
261
return _hypercall2 (int , callback_op , cmd , arg );
302
262
}
303
263
304
- static inline int
305
- HYPERVISOR_fpu_taskswitch (int set )
306
- {
307
- return _hypercall1 (int , fpu_taskswitch , set );
308
- }
309
-
310
264
static inline int
311
265
HYPERVISOR_sched_op (int cmd , void * arg )
312
266
{
@@ -418,19 +372,6 @@ HYPERVISOR_grant_table_op(unsigned int cmd, void *uop, unsigned int count)
418
372
return _hypercall3 (int , grant_table_op , cmd , uop , count );
419
373
}
420
374
421
- static inline int
422
- HYPERVISOR_update_va_mapping_otherdomain (unsigned long va , pte_t new_val ,
423
- unsigned long flags , domid_t domid )
424
- {
425
- if (sizeof (new_val ) == sizeof (long ))
426
- return _hypercall4 (int , update_va_mapping_otherdomain , va ,
427
- new_val .pte , flags , domid );
428
- else
429
- return _hypercall5 (int , update_va_mapping_otherdomain , va ,
430
- new_val .pte , new_val .pte >> 32 ,
431
- flags , domid );
432
- }
433
-
434
375
static inline int
435
376
HYPERVISOR_vm_assist (unsigned int cmd , unsigned int type )
436
377
{
@@ -465,12 +406,6 @@ HYPERVISOR_suspend(unsigned long start_info_mfn)
465
406
return _hypercall3 (int , sched_op , SCHEDOP_shutdown , & r , start_info_mfn );
466
407
}
467
408
468
- static inline int
469
- HYPERVISOR_nmi_op (unsigned long op , unsigned long arg )
470
- {
471
- return _hypercall2 (int , nmi_op , op , arg );
472
- }
473
-
474
409
static inline unsigned long __must_check
475
410
HYPERVISOR_hvm_op (int op , void * arg )
476
411
{
@@ -528,39 +463,6 @@ MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va,
528
463
trace_xen_mc_entry (mcl , sizeof (new_val ) == sizeof (long ) ? 3 : 4 );
529
464
}
530
465
531
- static inline void
532
- MULTI_grant_table_op (struct multicall_entry * mcl , unsigned int cmd ,
533
- void * uop , unsigned int count )
534
- {
535
- mcl -> op = __HYPERVISOR_grant_table_op ;
536
- mcl -> args [0 ] = cmd ;
537
- mcl -> args [1 ] = (unsigned long )uop ;
538
- mcl -> args [2 ] = count ;
539
-
540
- trace_xen_mc_entry (mcl , 3 );
541
- }
542
-
543
- static inline void
544
- MULTI_update_va_mapping_otherdomain (struct multicall_entry * mcl , unsigned long va ,
545
- pte_t new_val , unsigned long flags ,
546
- domid_t domid )
547
- {
548
- mcl -> op = __HYPERVISOR_update_va_mapping_otherdomain ;
549
- mcl -> args [0 ] = va ;
550
- if (sizeof (new_val ) == sizeof (long )) {
551
- mcl -> args [1 ] = new_val .pte ;
552
- mcl -> args [2 ] = flags ;
553
- mcl -> args [3 ] = domid ;
554
- } else {
555
- mcl -> args [1 ] = new_val .pte ;
556
- mcl -> args [2 ] = new_val .pte >> 32 ;
557
- mcl -> args [3 ] = flags ;
558
- mcl -> args [4 ] = domid ;
559
- }
560
-
561
- trace_xen_mc_entry (mcl , sizeof (new_val ) == sizeof (long ) ? 4 : 5 );
562
- }
563
-
564
466
static inline void
565
467
MULTI_update_descriptor (struct multicall_entry * mcl , u64 maddr ,
566
468
struct desc_struct desc )
@@ -581,16 +483,6 @@ MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr,
581
483
trace_xen_mc_entry (mcl , sizeof (maddr ) == sizeof (long ) ? 2 : 4 );
582
484
}
583
485
584
- static inline void
585
- MULTI_memory_op (struct multicall_entry * mcl , unsigned int cmd , void * arg )
586
- {
587
- mcl -> op = __HYPERVISOR_memory_op ;
588
- mcl -> args [0 ] = cmd ;
589
- mcl -> args [1 ] = (unsigned long )arg ;
590
-
591
- trace_xen_mc_entry (mcl , 2 );
592
- }
593
-
594
486
static inline void
595
487
MULTI_mmu_update (struct multicall_entry * mcl , struct mmu_update * req ,
596
488
int count , int * success_count , domid_t domid )
@@ -617,16 +509,6 @@ MULTI_mmuext_op(struct multicall_entry *mcl, struct mmuext_op *op, int count,
617
509
trace_xen_mc_entry (mcl , 4 );
618
510
}
619
511
620
- static inline void
621
- MULTI_set_gdt (struct multicall_entry * mcl , unsigned long * frames , int entries )
622
- {
623
- mcl -> op = __HYPERVISOR_set_gdt ;
624
- mcl -> args [0 ] = (unsigned long )frames ;
625
- mcl -> args [1 ] = entries ;
626
-
627
- trace_xen_mc_entry (mcl , 2 );
628
- }
629
-
630
512
static inline void
631
513
MULTI_stack_switch (struct multicall_entry * mcl ,
632
514
unsigned long ss , unsigned long esp )
0 commit comments