Commit 750d82f2 authored by David Binder's avatar David Binder Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: Rename #define VMCALL_IO_CONTROLVM_ADDR 



Rename #define VMCALL_IO_CONTROLVM_ADDR to VMCALL_CONTROLVM_ADDR, as this
vmcall can be used by any partition, not just the IO partition.

Signed-off-by: default avatarDavid Binder <david.binder@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf8d0e94

drivers/staging/unisys/visorbus/visorchipset.c

+1 −1
Original line number Diff line number Diff line
@@ -1321,7 +1321,7 @@ issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes) 
	u64 physaddr;



	physaddr = virt_to_phys(&params);

	ISSUE_IO_VMCALL(VMCALL_IO_CONTROLVM_ADDR, physaddr, result);

	ISSUE_IO_VMCALL(VMCALL_CONTROLVM_ADDR, physaddr, result);

	if (VMCALL_SUCCESSFUL(result)) {

		*control_addr = params.address;

		*control_bytes = params.channel_bytes;

drivers/staging/unisys/visorbus/vmcallinterface.h

+4 −4
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ __unisys_extended_vmcall_gnuc(unsigned long long tuple, 
	return result;

}



#ifdef VMCALL_IO_CONTROLVM_ADDR

#undef VMCALL_IO_CONTROLVM_ADDR

#ifdef VMCALL_CONTROLVM_ADDR

#undef VMCALL_CONTROLVM_ADDR

#endif	/*  */



/* define subsystem number for AppOS, used in uislib driver  */
@@ -72,7 +72,7 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ 
	     *   type of VMCALL

	     */

	/* used by all Guests, not just IO */

	VMCALL_IO_CONTROLVM_ADDR = 0x0501,

	VMCALL_CONTROLVM_ADDR = 0x0501,

	/* Allow caller to query virtual time offset */

	VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET = 0x0708,

	/* LOGEVENT Post Code (RDX) with specified subsystem mask */
@@ -95,7 +95,7 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples */ 


/* Structures for IO VMCALLs */



/* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */

/* Parameters to VMCALL_CONTROLVM_ADDR interface */

struct vmcall_io_controlvm_addr_params {

	/* The Guest-relative physical address of the ControlVm channel. */

	/* This VMCall fills this in with the appropriate address. */