---

yaml --- r: 162241 b: refs/heads/master c: 8dc0a06 h: refs/heads/master i: 162239: 25bb782 v: v3
git-mirror · Sep 15, 2009 · df31c4b · df31c4b
1 parent 9eec2ca
commit df31c4b
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 88 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bedd6be8b9e9a24f48792c1bef82f521a01db2a
+refs/heads/master: 8dc0a06ad1f192ea0c8dbe4d2090206c7d880281
diff --git a/trunk/drivers/staging/hv/Channel.c b/trunk/drivers/staging/hv/Channel.c
@@ -395,21 +395,21 @@ VmbusChannelCreateGpadlHeader(
 	pfn = virt_to_phys(Kbuffer) >> PAGE_SHIFT;
 
 	/* do we need a gpadl body msg */
-	pfnSize = MAX_SIZE_CHANNEL_MESSAGE - sizeof(struct vmbus_channel_gpadl_header) - sizeof(GPA_RANGE);
+	pfnSize = MAX_SIZE_CHANNEL_MESSAGE - sizeof(struct vmbus_channel_gpadl_header) - sizeof(struct gpa_range);
 	pfnCount = pfnSize / sizeof(u64);
 
 	if (pageCount > pfnCount) /* we need a gpadl body */
 	{
 		/* fill in the header */
-		msgSize = sizeof(struct vmbus_channel_msginfo) + sizeof(struct vmbus_channel_gpadl_header) + sizeof(GPA_RANGE) + pfnCount*sizeof(u64);
+		msgSize = sizeof(struct vmbus_channel_msginfo) + sizeof(struct vmbus_channel_gpadl_header) + sizeof(struct gpa_range) + pfnCount*sizeof(u64);
 		msgHeader =  kzalloc(msgSize, GFP_KERNEL);
 
 		INITIALIZE_LIST_HEAD(&msgHeader->SubMsgList);
 		msgHeader->MessageSize=msgSize;
 
 		gpaHeader = (struct vmbus_channel_gpadl_header *)msgHeader->Msg;
 		gpaHeader->RangeCount = 1;
-		gpaHeader->RangeBufLen = sizeof(GPA_RANGE) + pageCount*sizeof(u64);
+		gpaHeader->RangeBufLen = sizeof(struct gpa_range) + pageCount*sizeof(u64);
 		gpaHeader->Range[0].ByteOffset = 0;
 		gpaHeader->Range[0].ByteCount = Size;
 		for (i=0; i<pfnCount; i++)
@@ -461,13 +461,13 @@ VmbusChannelCreateGpadlHeader(
 	else
 	{
 		/* everything fits in a header */
-		msgSize = sizeof(struct vmbus_channel_msginfo) + sizeof(struct vmbus_channel_gpadl_header) + sizeof(GPA_RANGE) + pageCount*sizeof(u64);
+		msgSize = sizeof(struct vmbus_channel_msginfo) + sizeof(struct vmbus_channel_gpadl_header) + sizeof(struct gpa_range) + pageCount*sizeof(u64);
 		msgHeader = kzalloc(msgSize, GFP_KERNEL);
 		msgHeader->MessageSize=msgSize;
 
 		gpaHeader = (struct vmbus_channel_gpadl_header *)msgHeader->Msg;
 		gpaHeader->RangeCount = 1;
-		gpaHeader->RangeBufLen = sizeof(GPA_RANGE) + pageCount*sizeof(u64);
+		gpaHeader->RangeBufLen = sizeof(struct gpa_range) + pageCount*sizeof(u64);
 		gpaHeader->Range[0].ByteOffset = 0;
 		gpaHeader->Range[0].ByteCount = Size;
 		for (i=0; i<pageCount; i++)
@@ -730,13 +730,13 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel,
 	const void *			Buffer,
 	u32				BufferLen,
 	u64				RequestId,
-	VMBUS_PACKET_TYPE	Type,
+	enum vmbus_packet_type Type,
 	u32				Flags
 )
 {
 	int ret=0;
-	VMPACKET_DESCRIPTOR desc;
-	u32 packetLen = sizeof(VMPACKET_DESCRIPTOR) + BufferLen;
+	struct vmpacket_descriptor desc;
+	u32 packetLen = sizeof(struct vmpacket_descriptor) + BufferLen;
 	u32 packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
 	struct scatterlist bufferList[3];
 	u64 alignedData=0;
@@ -751,12 +751,12 @@ int VmbusChannelSendPacket(struct vmbus_channel *Channel,
 	/* Setup the descriptor */
 	desc.Type = Type; /* VmbusPacketTypeDataInBand; */
 	desc.Flags = Flags; /* VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; */
-	desc.DataOffset8 = sizeof(VMPACKET_DESCRIPTOR) >> 3; /* in 8-bytes granularity */
+	desc.DataOffset8 = sizeof(struct vmpacket_descriptor) >> 3; /* in 8-bytes granularity */
 	desc.Length8 = (u16)(packetLenAligned >> 3);
 	desc.TransactionId = RequestId;
 
 	sg_init_table(bufferList,3);
-	sg_set_buf(&bufferList[0], &desc, sizeof(VMPACKET_DESCRIPTOR));
+	sg_set_buf(&bufferList[0], &desc, sizeof(struct vmpacket_descriptor));
 	sg_set_buf(&bufferList[1], Buffer, BufferLen);
 	sg_set_buf(&bufferList[2], &alignedData, packetLenAligned - packetLen);
 
@@ -946,7 +946,7 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel,
 			   u32 *BufferActualLen,
 			   u64 *RequestId)
 {
-	VMPACKET_DESCRIPTOR desc;
+	struct vmpacket_descriptor desc;
 	u32 packetLen;
 	u32 userLen;
 	int ret;
@@ -959,7 +959,7 @@ int VmbusChannelRecvPacket(struct vmbus_channel *Channel,
 
 	spin_lock_irqsave(&Channel->inbound_lock, flags);
 
-	ret = RingBufferPeek(&Channel->Inbound, &desc, sizeof(VMPACKET_DESCRIPTOR));
+	ret = RingBufferPeek(&Channel->Inbound, &desc, sizeof(struct vmpacket_descriptor));
 	if (ret != 0)
 	{
 		spin_unlock_irqrestore(&Channel->inbound_lock, flags);
@@ -1022,7 +1022,7 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel,
 	u64*				RequestId
 	)
 {
-	VMPACKET_DESCRIPTOR desc;
+	struct vmpacket_descriptor desc;
 	u32 packetLen;
 	u32 userLen;
 	int ret;
@@ -1035,7 +1035,7 @@ int VmbusChannelRecvPacketRaw(struct vmbus_channel *Channel,
 
 	spin_lock_irqsave(&Channel->inbound_lock, flags);
 
-	ret = RingBufferPeek(&Channel->Inbound, &desc, sizeof(VMPACKET_DESCRIPTOR));
+	ret = RingBufferPeek(&Channel->Inbound, &desc, sizeof(struct vmpacket_descriptor));
 	if (ret != 0)
 	{
 		spin_unlock_irqrestore(&Channel->inbound_lock, flags);

diff --git a/trunk/drivers/staging/hv/Channel.h b/trunk/drivers/staging/hv/Channel.h
@@ -27,7 +27,7 @@
 
 #include "ChannelMgmt.h"
 
-/* The format must be the same as VMDATA_GPA_DIRECT */
+/* The format must be the same as struct vmdata_gpa_direct */
 struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
 	u16 Type;
 	u16 DataOffset8;
@@ -39,7 +39,7 @@ struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
 	struct hv_page_buffer Range[MAX_PAGE_BUFFER_COUNT];
 } __attribute__((packed));
 
-/* The format must be the same as VMDATA_GPA_DIRECT */
+/* The format must be the same as struct vmdata_gpa_direct */
 struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
 	u16 Type;
 	u16 DataOffset8;
@@ -66,7 +66,7 @@ extern int VmbusChannelSendPacket(struct vmbus_channel *channel,
 				  const void *Buffer,
 				  u32 BufferLen,
 				  u64 RequestId,
-				  VMBUS_PACKET_TYPE Type,
+				  enum vmbus_packet_type Type,
 				  u32 Flags);
 
 extern int VmbusChannelSendPacketPageBuffer(struct vmbus_channel *channel,

diff --git a/trunk/drivers/staging/hv/NetVsc.c b/trunk/drivers/staging/hv/NetVsc.c
@@ -92,7 +92,7 @@ NetVscConnectToVsp(
 static void
 NetVscOnSendCompletion(
 	struct hv_device *Device,
-	VMPACKET_DESCRIPTOR *Packet
+	struct vmpacket_descriptor *Packet
 	);
 
 static int
@@ -104,7 +104,7 @@ NetVscOnSend(
 static void
 NetVscOnReceive(
 	struct hv_device *Device,
-	VMPACKET_DESCRIPTOR *Packet
+	struct vmpacket_descriptor *Packet
 	);
 
 static void
@@ -236,8 +236,8 @@ NetVscInitialize(
 
 	DPRINT_ENTER(NETVSC);
 
-	DPRINT_DBG(NETVSC, "sizeof(struct hv_netvsc_packet)=%zd, sizeof(NVSP_MESSAGE)=%zd, sizeof(VMTRANSFER_PAGE_PACKET_HEADER)=%zd",
-		sizeof(struct hv_netvsc_packet), sizeof(NVSP_MESSAGE), sizeof(VMTRANSFER_PAGE_PACKET_HEADER));
+	DPRINT_DBG(NETVSC, "sizeof(struct hv_netvsc_packet)=%zd, sizeof(NVSP_MESSAGE)=%zd, sizeof(struct vmtransfer_page_packet_header)=%zd",
+		sizeof(struct hv_netvsc_packet), sizeof(NVSP_MESSAGE), sizeof(struct vmtransfer_page_packet_header));
 
 	/* Make sure we are at least 2 pages since 1 page is used for control */
 	ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1));
@@ -991,7 +991,7 @@ NetVscOnCleanup(
 static void
 NetVscOnSendCompletion(
 	struct hv_device *Device,
-	VMPACKET_DESCRIPTOR *Packet
+	struct vmpacket_descriptor *Packet
 	)
 {
 	struct NETVSC_DEVICE *netDevice;
@@ -1109,11 +1109,11 @@ NetVscOnSend(
 static void
 NetVscOnReceive(
 	struct hv_device *Device,
-	VMPACKET_DESCRIPTOR *Packet
+	struct vmpacket_descriptor *Packet
 	)
 {
 	struct NETVSC_DEVICE *netDevice;
-	VMTRANSFER_PAGE_PACKET_HEADER *vmxferpagePacket;
+	struct vmtransfer_page_packet_header *vmxferpagePacket;
 	NVSP_MESSAGE *nvspPacket;
 	struct hv_netvsc_packet *netvscPacket=NULL;
 	LIST_ENTRY* entry;
@@ -1157,7 +1157,7 @@ NetVscOnReceive(
 
 	DPRINT_DBG(NETVSC, "NVSP packet received - type %d", nvspPacket->Header.MessageType);
 
-	vmxferpagePacket = (VMTRANSFER_PAGE_PACKET_HEADER*)Packet;
+	vmxferpagePacket = (struct vmtransfer_page_packet_header *)Packet;
 
 	if (vmxferpagePacket->TransferPageSetId != NETVSC_RECEIVE_BUFFER_ID)
 	{
@@ -1420,7 +1420,7 @@ NetVscOnChannelCallback(
 	u32 bytesRecvd;
 	u64 requestId;
 	unsigned char packet[netPacketSize];
-	VMPACKET_DESCRIPTOR *desc;
+	struct vmpacket_descriptor *desc;
 	unsigned char	*buffer=packet;
 	int		bufferlen=netPacketSize;
 
@@ -1451,7 +1451,7 @@ NetVscOnChannelCallback(
 			{
 				DPRINT_DBG(NETVSC, "receive %d bytes, tid %llx", bytesRecvd, requestId);
 
-				desc = (VMPACKET_DESCRIPTOR*)buffer;
+				desc = (struct vmpacket_descriptor*)buffer;
 				switch (desc->Type)
 				{
 					case VmbusPacketTypeCompletion:

diff --git a/trunk/drivers/staging/hv/include/ChannelMessages.h b/trunk/drivers/staging/hv/include/ChannelMessages.h
@@ -151,7 +151,7 @@ struct vmbus_channel_gpadl_header {
 	u32 Gpadl;
 	u16 RangeBufLen;
 	u16 RangeCount;
-	GPA_RANGE Range[0];
+	struct gpa_range Range[0];
 } __attribute__((packed));
 
 /* This is the followup packet that contains more PFNs. */