OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: unisys: refactor UltraControlvmChannelProtocolGuid 

rename UltraControlvmChannelProtocolGuid to
spar_controlvm_channel_protocol_uuid, and change
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_GUID to
SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID to match. Update references to the
old name.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2014-10-23 14:30:14 -04:00 committed by Greg Kroah-Hartman
parent bd0d2dcc03
commit 5fbaa4b3a6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
View File

@ -27,12 +27,12 @@ enum { INVALID_GUEST_FIRMWARE, SAMPLE_GUEST_FIRMWARE,
};
/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_GUID \
#define SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID \
UUID_LE(0x2b3c2d10, 0x7ef5, 0x4ad8, \
0xb9, 0x66, 0x34, 0x48, 0xb7, 0x38, 0x6b, 0x3d)
static const uuid_le UltraControlvmChannelProtocolGuid =
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_GUID;
static const uuid_le spar_controlvm_channel_protocol_uuid =
SPAR_CONTROLVM_CHANNEL_PROTOCOL_UUID;
#define ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE \
ULTRA_CHANNEL_PROTOCOL_SIGNATURE
@ -47,13 +47,13 @@ static const uuid_le UltraControlvmChannelProtocolGuid =
#define SPAR_CONTROLVM_CHANNEL_OK_CLIENT(pChannel) \
(spar_check_channel_client(pChannel, \
UltraControlvmChannelProtocolGuid, \
spar_controlvm_channel_protocol_uuid, \
"controlvm", \
sizeof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL), \
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_VERSIONID, \
ULTRA_CONTROLVM_CHANNEL_PROTOCOL_SIGNATURE))
#define ULTRA_CONTROLVM_CHANNEL_OK_SERVER(actualBytes) \
(spar_check_channel_server(UltraControlvmChannelProtocolGuid, \
(spar_check_channel_server(spar_controlvm_channel_protocol_uuid,\
"controlvm", \
sizeof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL), \
actualBytes))

2
drivers/staging/unisys/visorchipset/visorchipset_main.c
View File

@ -2380,7 +2380,7 @@ visorchipset_init(void)
visorchannel_create_with_lock
(addr,
sizeof(ULTRA_CONTROLVM_CHANNEL_PROTOCOL),
UltraControlvmChannelProtocolGuid);
spar_controlvm_channel_protocol_uuid);
if (SPAR_CONTROLVM_CHANNEL_OK_CLIENT(
visorchannel_get_header(ControlVm_channel))) {
LOGINF("Channel %s (ControlVm) discovered",