Commit f42aea3c authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: Fix VMCALL_IO_CONTROLVM_ADDR_PARAMS structure 



Remove the typedef from VMCALL_IO_CONTROLVM_ADDR_PARAMS and switch to
use struct vmcall_io_controlvm_addr_params. Fix the CamelCase names:

ChannelAddress => address
ChannelBytes => channel_bytes
Unused => unused

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51121ffc

drivers/staging/unisys/common-spar/include/vmcallinterface.h

+5 −5
Original line number Diff line number Diff line
@@ -113,15 +113,15 @@ typedef struct phys_info IO_DATA_STRUCTURE; 
/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */

#pragma pack(push, 1)

/* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */

typedef struct _VMCALL_IO_CONTROLVM_ADDR_PARAMS {

struct vmcall_io_controlvm_addr_params {

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

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

	u64 ChannelAddress;	/* contents provided by this VMCALL (OUT) */

	u64 address;	/* contents provided by this VMCALL (OUT) */

	    /* the size of the ControlVm channel in bytes This VMCall fills this

	    * in with the appropriate address. */

	u32 ChannelBytes;	/* contents provided by this VMCALL (OUT) */

	u8 Unused[4];		/* Unused Bytes in the 64-Bit Aligned Struct */

} VMCALL_IO_CONTROLVM_ADDR_PARAMS;

	u32 channel_bytes;	/* contents provided by this VMCALL (OUT) */

	u8 unused[4];		/* Unused Bytes in the 64-Bit Aligned Struct */

};



#pragma pack(pop)

/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */

drivers/staging/unisys/include/uisutils.h

+3 −3
Original line number Diff line number Diff line
@@ -220,15 +220,15 @@ unsigned int uisutil_copy_fragsinfo_from_skb(unsigned char *calling_ctx, 
static inline unsigned int

issue_vmcall_io_controlvm_addr(u64 *control_addr, u32 *control_bytes)

{

	VMCALL_IO_CONTROLVM_ADDR_PARAMS params;

	struct vmcall_io_controlvm_addr_params params;

	int result = VMCALL_SUCCESS;

	u64 physaddr;



	physaddr = virt_to_phys(&params);

	ISSUE_IO_VMCALL(VMCALL_IO_CONTROLVM_ADDR, physaddr, result);

	if (VMCALL_SUCCESSFUL(result)) {

		*control_addr = params.ChannelAddress;

		*control_bytes = params.ChannelBytes;

		*control_addr = params.address;

		*control_bytes = params.channel_bytes;

	}

	return result;

}