Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 235731
b: refs/heads/master
c: 415f228
h: refs/heads/master
i:
  235729: c694f73
  235727: 5b4f953
v: v3
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Jan 31, 2011
1 parent 7f10ae1 commit e7f6e0b
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 135 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 767dff6853ae0f68438e623199cc7137441a286d
refs/heads/master: 415f228712d86dd5598f809e8e379ff5ad729652
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/blkvsc_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - "
"req %p pfn[%d] %llx\n",
blkvsc_req, i,
blkvsc_req->request.data_buffer.PfnArray[i]);
blkvsc_req->request.data_buffer.pfn_array[i]);
}
#endif

Expand Down
56 changes: 28 additions & 28 deletions trunk/drivers/staging/hv/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,16 @@ static void dump_gpadl_header(struct vmbus_channel_gpadl_header *gpadl)
"gpadl header - relid %d, range count %d, range buflen %d",
gpadl->child_relid, gpadl->rangecount, gpadl->range_buflen);
for (i = 0; i < gpadl->rangecount; i++) {
pagecount = gpadl->range[i].ByteCount >> PAGE_SHIFT;
pagecount = gpadl->range[i].byte_count >> PAGE_SHIFT;
pagecount = (pagecount > 26) ? 26 : pagecount;

DPRINT_DBG(VMBUS, "gpadl range %d - len %d offset %d "
"page count %d", i, gpadl->range[i].ByteCount,
gpadl->range[i].ByteOffset, pagecount);
"page count %d", i, gpadl->range[i].byte_count,
gpadl->range[i].byte_offset, pagecount);

for (j = 0; j < pagecount; j++)
DPRINT_DBG(VMBUS, "%d) pfn %llu", j,
gpadl->range[i].PfnArray[j]);
gpadl->range[i].pfn_array[j]);
}
}

Expand Down Expand Up @@ -399,10 +399,10 @@ static int create_gpadl_header(void *kbuffer, u32 size,
gpadl_header->rangecount = 1;
gpadl_header->range_buflen = sizeof(struct gpa_range) +
pagecount * sizeof(u64);
gpadl_header->range[0].ByteOffset = 0;
gpadl_header->range[0].ByteCount = size;
gpadl_header->range[0].byte_offset = 0;
gpadl_header->range[0].byte_count = size;
for (i = 0; i < pfncount; i++)
gpadl_header->range[0].PfnArray[i] = pfn+i;
gpadl_header->range[0].pfn_array[i] = pfn+i;
*msginfo = msgheader;
*messagecount = 1;

Expand Down Expand Up @@ -463,10 +463,10 @@ static int create_gpadl_header(void *kbuffer, u32 size,
gpadl_header->rangecount = 1;
gpadl_header->range_buflen = sizeof(struct gpa_range) +
pagecount * sizeof(u64);
gpadl_header->range[0].ByteOffset = 0;
gpadl_header->range[0].ByteCount = size;
gpadl_header->range[0].byte_offset = 0;
gpadl_header->range[0].byte_count = size;
for (i = 0; i < pagecount; i++)
gpadl_header->range[0].PfnArray[i] = pfn+i;
gpadl_header->range[0].pfn_array[i] = pfn+i;

*msginfo = msgheader;
*messagecount = 1;
Expand Down Expand Up @@ -739,12 +739,12 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer,
/* ASSERT((packetLenAligned - packetLen) < sizeof(u64)); */

/* Setup the descriptor */
desc.Type = type; /* VmbusPacketTypeDataInBand; */
desc.Flags = flags; /* VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; */
desc.type = type; /* VmbusPacketTypeDataInBand; */
desc.flags = flags; /* VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; */
/* in 8-bytes granularity */
desc.DataOffset8 = sizeof(struct vmpacket_descriptor) >> 3;
desc.Length8 = (u16)(packetlen_aligned >> 3);
desc.TransactionId = requestid;
desc.offset8 = sizeof(struct vmpacket_descriptor) >> 3;
desc.len8 = (u16)(packetlen_aligned >> 3);
desc.trans_id = requestid;

sg_init_table(bufferlist, 3);
sg_set_buf(&bufferlist[0], &desc, sizeof(struct vmpacket_descriptor));
Expand Down Expand Up @@ -798,7 +798,7 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
/* ASSERT((packetLenAligned - packetLen) < sizeof(u64)); */

/* Setup the descriptor */
desc.type = VmbusPacketTypeDataUsingGpaDirect;
desc.type = VM_PKT_DATA_USING_GPA_DIRECT;
desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
desc.dataoffset8 = descsize >> 3; /* in 8-bytes grandularity */
desc.length8 = (u16)(packetlen_aligned >> 3);
Expand Down Expand Up @@ -867,7 +867,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
/* ASSERT((packetLenAligned - packetLen) < sizeof(u64)); */

/* Setup the descriptor */
desc.type = VmbusPacketTypeDataUsingGpaDirect;
desc.type = VM_PKT_DATA_USING_GPA_DIRECT;
desc.flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
desc.dataoffset8 = descsize >> 3; /* in 8-bytes grandularity */
desc.length8 = (u16)(packetlen_aligned >> 3);
Expand Down Expand Up @@ -934,14 +934,14 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,

/* VmbusChannelClearEvent(Channel); */

packetlen = desc.Length8 << 3;
userlen = packetlen - (desc.DataOffset8 << 3);
packetlen = desc.len8 << 3;
userlen = packetlen - (desc.offset8 << 3);
/* ASSERT(userLen > 0); */

DPRINT_DBG(VMBUS, "packet received on channel %p relid %d <type %d "
"flag %d tid %llx pktlen %d datalen %d> ",
channel, channel->offermsg.child_relid, desc.Type,
desc.Flags, desc.TransactionId, packetlen, userlen);
channel, channel->offermsg.child_relid, desc.type,
desc.flags, desc.trans_id, packetlen, userlen);

*buffer_actual_len = userlen;

Expand All @@ -953,11 +953,11 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
return -1;
}

*requestid = desc.TransactionId;
*requestid = desc.trans_id;

/* Copy over the packet to the user buffer */
ret = ringbuffer_read(&channel->inbound, buffer, userlen,
(desc.DataOffset8 << 3));
(desc.offset8 << 3));

spin_unlock_irqrestore(&channel->inbound_lock, flags);

Expand Down Expand Up @@ -994,13 +994,13 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,

/* VmbusChannelClearEvent(Channel); */

packetlen = desc.Length8 << 3;
userlen = packetlen - (desc.DataOffset8 << 3);
packetlen = desc.len8 << 3;
userlen = packetlen - (desc.offset8 << 3);

DPRINT_DBG(VMBUS, "packet received on channel %p relid %d <type %d "
"flag %d tid %llx pktlen %d datalen %d> ",
channel, channel->offermsg.child_relid, desc.Type,
desc.Flags, desc.TransactionId, packetlen, userlen);
channel, channel->offermsg.child_relid, desc.type,
desc.flags, desc.trans_id, packetlen, userlen);

*buffer_actual_len = packetlen;

Expand All @@ -1012,7 +1012,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
return -2;
}

*requestid = desc.TransactionId;
*requestid = desc.trans_id;

/* Copy over the entire packet to the user buffer */
ret = ringbuffer_read(&channel->inbound, buffer, packetlen, 0);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/channel_mgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void chn_cb_negotiate(void *context)

vmbus_sendpacket(channel, buf,
recvlen, requestid,
VmbusPacketTypeDataInBand, 0);
VM_PKT_DATA_INBAND, 0);
}

kfree(buf);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/hv/hv_kvp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ kvp_respond_to_host(char *key, char *value, int error)
icmsghdrp->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE;

vmbus_sendpacket(channel, recv_buffer, buf_len, req_id,
VmbusPacketTypeDataInBand, 0);
VM_PKT_DATA_INBAND, 0);

kvp_transaction.active = false;
}
Expand Down Expand Up @@ -318,7 +318,7 @@ void hv_kvp_onchannelcallback(void *context)

vmbus_sendpacket(channel, recv_buffer,
recvlen, requestid,
VmbusPacketTypeDataInBand, 0);
VM_PKT_DATA_INBAND, 0);
}

}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/hv/hv_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static void shutdown_onchannelcallback(void *context)

vmbus_sendpacket(channel, shut_txf_buf,
recvlen, requestid,
VmbusPacketTypeDataInBand, 0);
VM_PKT_DATA_INBAND, 0);
}

if (execute_shutdown == true)
Expand Down Expand Up @@ -179,7 +179,7 @@ static void timesync_onchannelcallback(void *context)

vmbus_sendpacket(channel, time_txf_buf,
recvlen, requestid,
VmbusPacketTypeDataInBand, 0);
VM_PKT_DATA_INBAND, 0);
}
}

Expand Down Expand Up @@ -225,7 +225,7 @@ static void heartbeat_onchannelcallback(void *context)

vmbus_sendpacket(channel, hbeat_txf_buf,
recvlen, requestid,
VmbusPacketTypeDataInBand, 0);
VM_PKT_DATA_INBAND, 0);
}
}

Expand Down
Loading

0 comments on commit e7f6e0b

Please sign in to comment.