History

vmbus: Switch to use new generic UUID API

There are new types and helpers that are supposed to be used in new code. As a preparation to get rid of legacy types and API functions do the conversion here.

Andy Shevchenko committed 7 years ago

Commit 593db801 parent 8834f565 files · +79 −93Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/hyperv.h+49−49
@@ -222,8 +222,8 @@ static inline u32 hv_get_avail_to_write_percent( · 221 unmodified lines
222 * struct contains the fundamental information about an offer.222 * struct contains the fundamental information about an offer.
223 */223 */
224struct vmbus_channel_offer {224struct vmbus_channel_offer {
225 uuid_le if_type;225 guid_t if_type;
226 uuid_le if_instance;226 guid_t if_instance;
227 227
228 /*228 /*
229 * These two fields are not currently used.229 * These two fields are not currently used.
@@ -614,8 +614,8 @@ struct vmbus_channel_initiate_contact { · 384 unmodified lines
614/* Hyper-V socket: guest's connect()-ing to host */614/* Hyper-V socket: guest's connect()-ing to host */
615struct vmbus_channel_tl_connect_request {615struct vmbus_channel_tl_connect_request {
616 struct vmbus_channel_message_header header;616 struct vmbus_channel_message_header header;
617 uuid_le guest_endpoint_id;617 guid_t guest_endpoint_id;
618 uuid_le host_service_id;618 guid_t host_service_id;
619} __packed;619} __packed;
620 620
621struct vmbus_channel_version_response {621struct vmbus_channel_version_response {
@@ -714,7 +714,7 @@ enum vmbus_device_type { · 92 unmodified lines
714 714
715struct vmbus_device {715struct vmbus_device {
716 u16 dev_type;716 u16 dev_type;
717 uuid_le guid;717 guid_t guid;
718 bool perf_device;718 bool perf_device;
719};719};
720 720
@@ -1096,7 +1096,7 @@ struct hv_driver { · 375 unmodified lines
1096 bool hvsock;1096 bool hvsock;
1097 1097
1098 /* the device type supported by this driver */1098 /* the device type supported by this driver */
1099 uuid_le dev_type;1099 guid_t dev_type;
1100 const struct hv_vmbus_device_id *id_table;1100 const struct hv_vmbus_device_id *id_table;
1101 1101
1102 struct device_driver driver;1102 struct device_driver driver;
@@ -1116,10 +1116,10 @@ struct hv_driver { · 13 unmodified lines
1116/* Base device object */1116/* Base device object */
1117struct hv_device {1117struct hv_device {
1118 /* the device type id of this device */1118 /* the device type id of this device */
1119 uuid_le dev_type;1119 guid_t dev_type;
1120 1120
1121 /* the device instance id of this device */1121 /* the device instance id of this device */
1122 uuid_le dev_instance;1122 guid_t dev_instance;
1123 u16 vendor_id;1123 u16 vendor_id;
1124 u16 device_id;1124 u16 device_id;
1125 1125
@@ -1188,102 +1188,102 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size); · 62 unmodified lines
1188 * {f8615163-df3e-46c5-913f-f2d2f965ed0e}1188 * {f8615163-df3e-46c5-913f-f2d2f965ed0e}
1189 */1189 */
1190#define HV_NIC_GUID \1190#define HV_NIC_GUID \
1191 .guid = UUID_LE(0xf8615163, 0xdf3e, 0x46c5, 0x91, 0x3f, \1191 .guid = GUID_INIT(0xf8615163, 0xdf3e, 0x46c5, 0x91, 0x3f, \
1192 0xf2, 0xd2, 0xf9, 0x65, 0xed, 0x0e)1192 0xf2, 0xd2, 0xf9, 0x65, 0xed, 0x0e)
1193 1193
1194/*1194/*
1195 * IDE GUID1195 * IDE GUID
1196 * {32412632-86cb-44a2-9b5c-50d1417354f5}1196 * {32412632-86cb-44a2-9b5c-50d1417354f5}
1197 */1197 */
1198#define HV_IDE_GUID \1198#define HV_IDE_GUID \
1199 .guid = UUID_LE(0x32412632, 0x86cb, 0x44a2, 0x9b, 0x5c, \1199 .guid = GUID_INIT(0x32412632, 0x86cb, 0x44a2, 0x9b, 0x5c, \
1200 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5)1200 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5)
1201 1201
1202/*1202/*
1203 * SCSI GUID1203 * SCSI GUID
1204 * {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}1204 * {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f}
1205 */1205 */
1206#define HV_SCSI_GUID \1206#define HV_SCSI_GUID \
1207 .guid = UUID_LE(0xba6163d9, 0x04a1, 0x4d29, 0xb6, 0x05, \1207 .guid = GUID_INIT(0xba6163d9, 0x04a1, 0x4d29, 0xb6, 0x05, \
1208 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f)1208 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f)
1209 1209
1210/*1210/*
1211 * Shutdown GUID1211 * Shutdown GUID
1212 * {0e0b6031-5213-4934-818b-38d90ced39db}1212 * {0e0b6031-5213-4934-818b-38d90ced39db}
1213 */1213 */
1214#define HV_SHUTDOWN_GUID \1214#define HV_SHUTDOWN_GUID \
1215 .guid = UUID_LE(0x0e0b6031, 0x5213, 0x4934, 0x81, 0x8b, \1215 .guid = GUID_INIT(0x0e0b6031, 0x5213, 0x4934, 0x81, 0x8b, \
1216 0x38, 0xd9, 0x0c, 0xed, 0x39, 0xdb)1216 0x38, 0xd9, 0x0c, 0xed, 0x39, 0xdb)
1217 1217
1218/*1218/*
1219 * Time Synch GUID1219 * Time Synch GUID
1220 * {9527E630-D0AE-497b-ADCE-E80AB0175CAF}1220 * {9527E630-D0AE-497b-ADCE-E80AB0175CAF}
1221 */1221 */
1222#define HV_TS_GUID \1222#define HV_TS_GUID \
1223 .guid = UUID_LE(0x9527e630, 0xd0ae, 0x497b, 0xad, 0xce, \1223 .guid = GUID_INIT(0x9527e630, 0xd0ae, 0x497b, 0xad, 0xce, \
1224 0xe8, 0x0a, 0xb0, 0x17, 0x5c, 0xaf)1224 0xe8, 0x0a, 0xb0, 0x17, 0x5c, 0xaf)
1225 1225
1226/*1226/*
1227 * Heartbeat GUID1227 * Heartbeat GUID
1228 * {57164f39-9115-4e78-ab55-382f3bd5422d}1228 * {57164f39-9115-4e78-ab55-382f3bd5422d}
1229 */1229 */
1230#define HV_HEART_BEAT_GUID \1230#define HV_HEART_BEAT_GUID \
1231 .guid = UUID_LE(0x57164f39, 0x9115, 0x4e78, 0xab, 0x55, \1231 .guid = GUID_INIT(0x57164f39, 0x9115, 0x4e78, 0xab, 0x55, \
1232 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d)1232 0x38, 0x2f, 0x3b, 0xd5, 0x42, 0x2d)
1233 1233
1234/*1234/*
1235 * KVP GUID1235 * KVP GUID
1236 * {a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}1236 * {a9a0f4e7-5a45-4d96-b827-8a841e8c03e6}
1237 */1237 */
1238#define HV_KVP_GUID \1238#define HV_KVP_GUID \
1239 .guid = UUID_LE(0xa9a0f4e7, 0x5a45, 0x4d96, 0xb8, 0x27, \1239 .guid = GUID_INIT(0xa9a0f4e7, 0x5a45, 0x4d96, 0xb8, 0x27, \
1240 0x8a, 0x84, 0x1e, 0x8c, 0x03, 0xe6)1240 0x8a, 0x84, 0x1e, 0x8c, 0x03, 0xe6)
1241 1241
1242/*1242/*
1243 * Dynamic memory GUID1243 * Dynamic memory GUID
1244 * {525074dc-8985-46e2-8057-a307dc18a502}1244 * {525074dc-8985-46e2-8057-a307dc18a502}
1245 */1245 */
1246#define HV_DM_GUID \1246#define HV_DM_GUID \
1247 .guid = UUID_LE(0x525074dc, 0x8985, 0x46e2, 0x80, 0x57, \1247 .guid = GUID_INIT(0x525074dc, 0x8985, 0x46e2, 0x80, 0x57, \
1248 0xa3, 0x07, 0xdc, 0x18, 0xa5, 0x02)1248 0xa3, 0x07, 0xdc, 0x18, 0xa5, 0x02)
1249 1249
1250/*1250/*
1251 * Mouse GUID1251 * Mouse GUID
1252 * {cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}1252 * {cfa8b69e-5b4a-4cc0-b98b-8ba1a1f3f95a}
1253 */1253 */
1254#define HV_MOUSE_GUID \1254#define HV_MOUSE_GUID \
1255 .guid = UUID_LE(0xcfa8b69e, 0x5b4a, 0x4cc0, 0xb9, 0x8b, \1255 .guid = GUID_INIT(0xcfa8b69e, 0x5b4a, 0x4cc0, 0xb9, 0x8b, \
1256 0x8b, 0xa1, 0xa1, 0xf3, 0xf9, 0x5a)1256 0x8b, 0xa1, 0xa1, 0xf3, 0xf9, 0x5a)
1257 1257
1258/*1258/*
1259 * Keyboard GUID1259 * Keyboard GUID
1260 * {f912ad6d-2b17-48ea-bd65-f927a61c7684}1260 * {f912ad6d-2b17-48ea-bd65-f927a61c7684}
1261 */1261 */
1262#define HV_KBD_GUID \1262#define HV_KBD_GUID \
1263 .guid = UUID_LE(0xf912ad6d, 0x2b17, 0x48ea, 0xbd, 0x65, \1263 .guid = GUID_INIT(0xf912ad6d, 0x2b17, 0x48ea, 0xbd, 0x65, \
1264 0xf9, 0x27, 0xa6, 0x1c, 0x76, 0x84)1264 0xf9, 0x27, 0xa6, 0x1c, 0x76, 0x84)
1265 1265
1266/*1266/*
1267 * VSS (Backup/Restore) GUID1267 * VSS (Backup/Restore) GUID
1268 */1268 */
1269#define HV_VSS_GUID \1269#define HV_VSS_GUID \
1270 .guid = UUID_LE(0x35fa2e29, 0xea23, 0x4236, 0x96, 0xae, \1270 .guid = GUID_INIT(0x35fa2e29, 0xea23, 0x4236, 0x96, 0xae, \
1271 0x3a, 0x6e, 0xba, 0xcb, 0xa4, 0x40)1271 0x3a, 0x6e, 0xba, 0xcb, 0xa4, 0x40)
1272/*1272/*
1273 * Synthetic Video GUID1273 * Synthetic Video GUID
1274 * {DA0A7802-E377-4aac-8E77-0558EB1073F8}1274 * {DA0A7802-E377-4aac-8E77-0558EB1073F8}
1275 */1275 */
1276#define HV_SYNTHVID_GUID \1276#define HV_SYNTHVID_GUID \
1277 .guid = UUID_LE(0xda0a7802, 0xe377, 0x4aac, 0x8e, 0x77, \1277 .guid = GUID_INIT(0xda0a7802, 0xe377, 0x4aac, 0x8e, 0x77, \
1278 0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8)1278 0x05, 0x58, 0xeb, 0x10, 0x73, 0xf8)
1279 1279
1280/*1280/*
1281 * Synthetic FC GUID1281 * Synthetic FC GUID
1282 * {2f9bcc4a-0069-4af3-b76b-6fd0be528cda}1282 * {2f9bcc4a-0069-4af3-b76b-6fd0be528cda}
1283 */1283 */
1284#define HV_SYNTHFC_GUID \1284#define HV_SYNTHFC_GUID \
1285 .guid = UUID_LE(0x2f9bcc4a, 0x0069, 0x4af3, 0xb7, 0x6b, \1285 .guid = GUID_INIT(0x2f9bcc4a, 0x0069, 0x4af3, 0xb7, 0x6b, \
1286 0x6f, 0xd0, 0xbe, 0x52, 0x8c, 0xda)1286 0x6f, 0xd0, 0xbe, 0x52, 0x8c, 0xda)
1287 1287
1288/*1288/*
1289 * Guest File Copy Service1289 * Guest File Copy Service
@@ -1291,16 +1291,16 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size); · 1 unmodified line
1291 */1291 */
1292 1292
1293#define HV_FCOPY_GUID \1293#define HV_FCOPY_GUID \
1294 .guid = UUID_LE(0x34d14be3, 0xdee4, 0x41c8, 0x9a, 0xe7, \1294 .guid = GUID_INIT(0x34d14be3, 0xdee4, 0x41c8, 0x9a, 0xe7, \
1295 0x6b, 0x17, 0x49, 0x77, 0xc1, 0x92)1295 0x6b, 0x17, 0x49, 0x77, 0xc1, 0x92)
1296 1296
1297/*1297/*
1298 * NetworkDirect. This is the guest RDMA service.1298 * NetworkDirect. This is the guest RDMA service.
1299 * {8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}1299 * {8c2eaf3d-32a7-4b09-ab99-bd1f1c86b501}
1300 */1300 */
1301#define HV_ND_GUID \1301#define HV_ND_GUID \
1302 .guid = UUID_LE(0x8c2eaf3d, 0x32a7, 0x4b09, 0xab, 0x99, \1302 .guid = GUID_INIT(0x8c2eaf3d, 0x32a7, 0x4b09, 0xab, 0x99, \
1303 0xbd, 0x1f, 0x1c, 0x86, 0xb5, 0x01)1303 0xbd, 0x1f, 0x1c, 0x86, 0xb5, 0x01)
1304 1304
1305/*1305/*
1306 * PCI Express Pass Through1306 * PCI Express Pass Through
@@ -1308,8 +1308,8 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size); · 1 unmodified line
1308 */1308 */
1309 1309
1310#define HV_PCIE_GUID \1310#define HV_PCIE_GUID \
1311 .guid = UUID_LE(0x44c4f61d, 0x4444, 0x4400, 0x9d, 0x52, \1311 .guid = GUID_INIT(0x44c4f61d, 0x4444, 0x4400, 0x9d, 0x52, \
1312 0x80, 0x2e, 0x27, 0xed, 0xe1, 0x9f)1312 0x80, 0x2e, 0x27, 0xed, 0xe1, 0x9f)
1313 1313
1314/*1314/*
1315 * Linux doesn't support the 3 devices: the first two are for1315 * Linux doesn't support the 3 devices: the first two are for
@@ -1321,16 +1321,16 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size); · 5 unmodified lines
1321 */1321 */
1322 1322
1323#define HV_AVMA1_GUID \1323#define HV_AVMA1_GUID \
1324 .guid = UUID_LE(0xf8e65716, 0x3cb3, 0x4a06, 0x9a, 0x60, \1324 .guid = GUID_INIT(0xf8e65716, 0x3cb3, 0x4a06, 0x9a, 0x60, \
1325 0x18, 0x89, 0xc5, 0xcc, 0xca, 0xb5)1325 0x18, 0x89, 0xc5, 0xcc, 0xca, 0xb5)
1326 1326
1327#define HV_AVMA2_GUID \1327#define HV_AVMA2_GUID \
1328 .guid = UUID_LE(0x3375baf4, 0x9e15, 0x4b30, 0xb7, 0x65, \1328 .guid = GUID_INIT(0x3375baf4, 0x9e15, 0x4b30, 0xb7, 0x65, \
1329 0x67, 0xac, 0xb1, 0x0d, 0x60, 0x7b)1329 0x67, 0xac, 0xb1, 0x0d, 0x60, 0x7b)
1330 1330
1331#define HV_RDV_GUID \1331#define HV_RDV_GUID \
1332 .guid = UUID_LE(0x276aacf4, 0xac15, 0x426c, 0x98, 0xdd, \1332 .guid = GUID_INIT(0x276aacf4, 0xac15, 0x426c, 0x98, 0xdd, \
1333 0x75, 0x21, 0xad, 0x3f, 0x01, 0xfe)1333 0x75, 0x21, 0xad, 0x3f, 0x01, 0xfe)
1334 1334
1335/*1335/*
1336 * Common header for Hyper-V ICs1336 * Common header for Hyper-V ICs
@@ -1432,7 +1432,7 @@ struct ictimesync_ref_data { · 95 unmodified lines
1432struct hyperv_service_callback {1432struct hyperv_service_callback {
1433 u8 msg_type;1433 u8 msg_type;
1434 char *log_msg;1434 char *log_msg;
1435 uuid_le data;1435 guid_t data;
1436 struct vmbus_channel *channel;1436 struct vmbus_channel *channel;
1437 void (*callback)(void *context);1437 void (*callback)(void *context);
1438};1438};
@@ -1452,8 +1452,8 @@ void vmbus_setevent(struct vmbus_channel *channel); · 13 unmodified lines
1452 1452
1453extern __u32 vmbus_proto_version;1453extern __u32 vmbus_proto_version;
1454 1454
1455int vmbus_send_tl_connect_request(const uuid_le *shv_guest_servie_id,1455int vmbus_send_tl_connect_request(const guid_t *shv_guest_servie_id,
1456 const uuid_le *shv_host_servie_id);1456 const guid_t *shv_host_servie_id);
1457void vmbus_set_event(struct vmbus_channel *channel);1457void vmbus_set_event(struct vmbus_channel *channel);
1458 1458
1459/* Get the start of the ring buffer. */1459/* Get the start of the ring buffer. */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t