Drivers: hv: Use consolidated GUID definitions

Use the consolidated GUID definitions in the util and balloon drivers.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
K. Y. Srinivasan 2013-01-23 17:42:41 -08:00 committed by Greg Kroah-Hartman
parent 7fb96565e3
commit d13984e5c7
2 changed files with 13 additions and 15 deletions

View File

@ -1005,9 +1005,7 @@ static int balloon_remove(struct hv_device *dev)
static const struct hv_vmbus_device_id id_table[] = { static const struct hv_vmbus_device_id id_table[] = {
/* Dynamic Memory Class ID */ /* Dynamic Memory Class ID */
/* 525074DC-8985-46e2-8057-A307DC18A502 */ /* 525074DC-8985-46e2-8057-A307DC18A502 */
{ VMBUS_DEVICE(0xdc, 0x74, 0x50, 0X52, 0x85, 0x89, 0xe2, 0x46, { HV_DM_GUID, },
0x80, 0x57, 0xa3, 0x07, 0xdc, 0x18, 0xa5, 0x02)
},
{ }, { },
}; };

View File

@ -314,21 +314,21 @@ static int util_remove(struct hv_device *dev)
static const struct hv_vmbus_device_id id_table[] = { static const struct hv_vmbus_device_id id_table[] = {
/* Shutdown guid */ /* Shutdown guid */
{ VMBUS_DEVICE(0x31, 0x60, 0x0B, 0X0E, 0x13, 0x52, 0x34, 0x49, { HV_SHUTDOWN_GUID,
0x81, 0x8B, 0x38, 0XD9, 0x0C, 0xED, 0x39, 0xDB) .driver_data = (unsigned long)&util_shutdown
.driver_data = (unsigned long)&util_shutdown }, },
/* Time synch guid */ /* Time synch guid */
{ VMBUS_DEVICE(0x30, 0xe6, 0x27, 0x95, 0xae, 0xd0, 0x7b, 0x49, { HV_TS_GUID,
0xad, 0xce, 0xe8, 0x0a, 0xb0, 0x17, 0x5c, 0xaf) .driver_data = (unsigned long)&util_timesynch
.driver_data = (unsigned long)&util_timesynch }, },
/* Heartbeat guid */ /* Heartbeat guid */
{ VMBUS_DEVICE(0x39, 0x4f, 0x16, 0x57, 0x15, 0x91, 0x78, 0x4e, { HV_HEART_BEAT_GUID,
0xab, 0x55, 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d) .driver_data = (unsigned long)&util_heartbeat
.driver_data = (unsigned long)&util_heartbeat }, },
/* KVP guid */ /* KVP guid */
{ VMBUS_DEVICE(0xe7, 0xf4, 0xa0, 0xa9, 0x45, 0x5a, 0x96, 0x4d, { HV_KVP_GUID,
0xb8, 0x27, 0x8a, 0x84, 0x1e, 0x8c, 0x3, 0xe6) .driver_data = (unsigned long)&util_kvp
.driver_data = (unsigned long)&util_kvp }, },
{ }, { },
}; };