* [PATCH 143/206] Staging: hv: Make storvsc_drv an instance of hv_driver
From: K. Y. Srinivasan @ 2011-05-09 21:57 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
In preparation for eliminating struct storvsc_driver,
make the variable storvsc_drv an instance of struct hv_driver.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index de6984f..907d855 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -751,9 +751,9 @@ static int storvsc_probe(struct hv_device *device)
/* The one and only one */
-static struct storvsc_driver storvsc_drv = {
- .base.probe = storvsc_probe,
- .base.remove = storvsc_remove,
+static struct hv_driver storvsc_drv = {
+ .probe = storvsc_probe,
+ .remove = storvsc_remove,
};
@@ -763,7 +763,7 @@ static struct storvsc_driver storvsc_drv = {
static int storvsc_drv_init(void)
{
int ret;
- struct hv_driver *drv = &storvsc_drv.base;
+ struct hv_driver *drv = &storvsc_drv;
u32 max_outstanding_req_per_channel;
/*
@@ -805,7 +805,7 @@ static int storvsc_drv_exit_cb(struct device *dev, void *data)
static void storvsc_drv_exit(void)
{
- struct hv_driver *drv = &storvsc_drv.base;
+ struct hv_driver *drv = &storvsc_drv;
struct device *current_dev = NULL;
int ret;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 142/206] Staging: hv: Get rid of some unused functions
From: K. Y. Srinivasan @ 2011-05-09 21:57 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Now get rid of unused functions.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_api.h | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index d2917eb..4db913f 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -144,18 +144,6 @@ static inline void put_stor_device(struct hv_device *device)
atomic_dec(&stor_device->ref_count);
}
-static inline struct storvsc_driver *hvdr_to_stordr(struct hv_driver *d)
-{
- return container_of(d, struct storvsc_driver, base);
-}
-
-static inline
-struct storvsc_driver *drv_to_stordrv(struct device_driver *d)
-{
- struct hv_driver *hvdrv = drv_to_hv_drv(d);
- return hvdr_to_stordr(hvdrv);
-}
-
static inline void storvsc_wait_to_drain(struct storvsc_device *dev)
{
dev->drain_notify = true;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 141/206] Staging: hv: Now get rid of an empty function
From: K. Y. Srinivasan @ 2011-05-09 21:57 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
The subject line says it all.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 3be4f1a..de6984f 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -74,18 +74,6 @@ struct storvsc_cmd_request {
};
-/*
- * storvsc_initialize - Main entry point
- */
-static int storvsc_initialize(struct hv_driver *driver)
-{
- struct storvsc_driver *stor_driver;
-
- stor_driver = hvdr_to_stordr(driver);
-
- return 0;
-}
-
static int storvsc_device_alloc(struct scsi_device *sdevice)
{
/*
@@ -775,7 +763,6 @@ static struct storvsc_driver storvsc_drv = {
static int storvsc_drv_init(void)
{
int ret;
- struct storvsc_driver *storvsc_drv_obj = &storvsc_drv;
struct hv_driver *drv = &storvsc_drv.base;
u32 max_outstanding_req_per_channel;
@@ -792,9 +779,6 @@ static int storvsc_drv_init(void)
sizeof(struct vstor_packet) + sizeof(u64),
sizeof(u64)));
- /* Callback to client driver to complete the initialization */
- storvsc_initialize(&storvsc_drv_obj->base);
-
memcpy(&drv->dev_type, &gStorVscDeviceType,
sizeof(struct hv_guid));
--
1.7.4.1
^ permalink raw reply related
* [PATCH 140/206] Staging: hv: Inline the copying of the dev_type information
From: K. Y. Srinivasan @ 2011-05-09 21:57 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
In preperation to eliminate the function storvsc_initialize()
move the copying of dev_type info.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 9447130..3be4f1a 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -83,12 +83,6 @@ static int storvsc_initialize(struct hv_driver *driver)
stor_driver = hvdr_to_stordr(driver);
-
- /* Make sure we are at least 2 pages since 1 page is used for control */
-
- memcpy(&driver->dev_type, &gStorVscDeviceType,
- sizeof(struct hv_guid));
-
return 0;
}
@@ -801,6 +795,9 @@ static int storvsc_drv_init(void)
/* Callback to client driver to complete the initialization */
storvsc_initialize(&storvsc_drv_obj->base);
+ memcpy(&drv->dev_type, &gStorVscDeviceType,
+ sizeof(struct hv_guid));
+
if (max_outstanding_req_per_channel <
STORVSC_MAX_IO_REQUESTS)
return -1;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 139/206] Staging: hv: Move the assignment of name to the hv_driver
From: K. Y. Srinivasan @ 2011-05-09 21:57 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
In preperation to eliminate the function storvsc_initialize()
move the name assignment.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index e342bcc..9447130 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -86,7 +86,6 @@ static int storvsc_initialize(struct hv_driver *driver)
/* Make sure we are at least 2 pages since 1 page is used for control */
- driver->name = driver_name;
memcpy(&driver->dev_type, &gStorVscDeviceType,
sizeof(struct hv_guid));
@@ -806,6 +805,7 @@ static int storvsc_drv_init(void)
STORVSC_MAX_IO_REQUESTS)
return -1;
+ drv->name = driver_name;
drv->driver.name = driver_name;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 138/206] Staging: hv: Directly assign the driver name
From: K. Y. Srinivasan @ 2011-05-09 21:57 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
The subject line says it all.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index f37c836..e342bcc 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -806,7 +806,7 @@ static int storvsc_drv_init(void)
STORVSC_MAX_IO_REQUESTS)
return -1;
- drv->driver.name = storvsc_drv_obj->base.name;
+ drv->driver.name = driver_name;
/* The driver belongs to vmbus */
--
1.7.4.1
^ permalink raw reply related
* [PATCH 137/206] Staging: hv: Get rid of the ring size state from struct storvsc_driver
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Now, get rid of the ring size state from struct storvsc_driver.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_api.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index fac607c..d2917eb 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -76,9 +76,6 @@ struct hv_storvsc_request {
/* Represents the block vsc driver */
struct storvsc_driver {
struct hv_driver base;
-
- /* Set by caller (in bytes) */
- u32 ring_buffer_size;
};
struct storvsc_device_info {
--
1.7.4.1
^ permalink raw reply related
* [PATCH 136/206] Staging: hv: Get rid of the unnecessary assignment of ring size
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Now, get rid of the unnecessary assignment of ring size.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 1fb0521..f37c836 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -799,8 +799,6 @@ static int storvsc_drv_init(void)
sizeof(struct vstor_packet) + sizeof(u64),
sizeof(u64)));
- storvsc_drv_obj->ring_buffer_size = storvsc_ringbuffer_size;
-
/* Callback to client driver to complete the initialization */
storvsc_initialize(&storvsc_drv_obj->base);
--
1.7.4.1
^ permalink raw reply related
* [PATCH 135/206] Staging: hv: Use the rinbuffer size info in struct storvsc_device_info
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Use the rinbuffer size info in struct storvsc_device_info.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 5 ++---
drivers/staging/hv/storvsc.c | 10 ++++------
drivers/staging/hv/storvsc_drv.c | 1 +
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index eebaaee..c04aaa3 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -146,6 +146,8 @@ static int blkvsc_device_add(struct hv_device *device,
device_info = (struct storvsc_device_info *)additional_info;
+ device_info->ring_buffer_size = blkvsc_ringbuffer_size;
+
ret = storvsc_dev_add(device, additional_info);
if (ret != 0)
return ret;
@@ -818,14 +820,11 @@ static const struct block_device_operations block_ops = {
*/
static int blkvsc_drv_init(void)
{
- struct storvsc_driver *storvsc_drv = &blkvsc_drv;
struct hv_driver *drv = &blkvsc_drv.base;
int ret;
BUILD_BUG_ON(sizeof(sector_t) != 8);
- storvsc_drv->ring_buffer_size = blkvsc_ringbuffer_size;
-
memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid));
drv->name = drv_name;
drv->driver.name = drv_name;
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 41361f5..8d7a490 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -363,19 +363,17 @@ static void storvsc_on_channel_callback(void *context)
return;
}
-static int storvsc_connect_to_vsp(struct hv_device *device)
+static int storvsc_connect_to_vsp(struct hv_device *device, u32 ring_size)
{
struct vmstorage_channel_properties props;
- struct storvsc_driver *stor_driver;
int ret;
- stor_driver = drv_to_stordrv(device->device.driver);
memset(&props, 0, sizeof(struct vmstorage_channel_properties));
/* Open the channel */
ret = vmbus_open(device->channel,
- stor_driver->ring_buffer_size,
- stor_driver->ring_buffer_size,
+ ring_size,
+ ring_size,
(void *)&props,
sizeof(struct vmstorage_channel_properties),
storvsc_on_channel_callback, device);
@@ -413,7 +411,7 @@ int storvsc_dev_add(struct hv_device *device,
stor_device->port_number = device_info->port_number;
/* Send it back up */
- ret = storvsc_connect_to_vsp(device);
+ ret = storvsc_connect_to_vsp(device, device_info->ring_buffer_size);
device_info->path_id = stor_device->path_id;
device_info->target_id = stor_device->target_id;
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 7d8b8f9..1fb0521 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -733,6 +733,7 @@ static int storvsc_probe(struct hv_device *device)
}
device_info.port_number = host->host_no;
+ device_info.ring_buffer_size = storvsc_ringbuffer_size;
/* Call to the vsc driver to add the device */
ret = storvsc_dev_add(device, (void *)&device_info);
--
1.7.4.1
^ permalink raw reply related
* [PATCH 134/206] Staging: hv: Add ring_buffer_size to struct storvsc_device_info
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Add ring_buffer_size to struct storvsc_device_info
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_api.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 99d878a..fac607c 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -82,6 +82,7 @@ struct storvsc_driver {
};
struct storvsc_device_info {
+ u32 ring_buffer_size;
unsigned int port_number;
unsigned char path_id;
unsigned char target_id;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 133/206] Staging: hv: Get rid of max_outstanding_req_per_channel from struct storvsc_driver
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Now, Get rid of max_outstanding_req_per_channel from struct storvsc_driver.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_api.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 055902b..99d878a 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -79,10 +79,6 @@ struct storvsc_driver {
/* Set by caller (in bytes) */
u32 ring_buffer_size;
-
- /* Maximum # of requests in flight per channel/device */
- u32 max_outstanding_req_per_channel;
-
};
struct storvsc_device_info {
--
1.7.4.1
^ permalink raw reply related
* [PATCH 132/206] Staging: hv: Compute max_outstanding_req_per_channel where it is needed
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Compute max_outstanding_req_per_channel where it is needed.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 07db877..7d8b8f9 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -90,20 +90,6 @@ static int storvsc_initialize(struct hv_driver *driver)
memcpy(&driver->dev_type, &gStorVscDeviceType,
sizeof(struct hv_guid));
-
- /*
- * Divide the ring buffer data size (which is 1 page less
- * than the ring buffer size since that page is reserved for
- * the ring buffer indices) by the max request size (which is
- * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
- */
- stor_driver->max_outstanding_req_per_channel =
- ((stor_driver->ring_buffer_size - PAGE_SIZE) /
- ALIGN(MAX_MULTIPAGE_BUFFER_PACKET +
- sizeof(struct vstor_packet) + sizeof(u64),
- sizeof(u64)));
-
-
return 0;
}
@@ -797,13 +783,27 @@ static int storvsc_drv_init(void)
int ret;
struct storvsc_driver *storvsc_drv_obj = &storvsc_drv;
struct hv_driver *drv = &storvsc_drv.base;
+ u32 max_outstanding_req_per_channel;
+
+ /*
+ * Divide the ring buffer data size (which is 1 page less
+ * than the ring buffer size since that page is reserved for
+ * the ring buffer indices) by the max request size (which is
+ * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
+ */
+
+ max_outstanding_req_per_channel =
+ ((storvsc_ringbuffer_size - PAGE_SIZE) /
+ ALIGN(MAX_MULTIPAGE_BUFFER_PACKET +
+ sizeof(struct vstor_packet) + sizeof(u64),
+ sizeof(u64)));
storvsc_drv_obj->ring_buffer_size = storvsc_ringbuffer_size;
/* Callback to client driver to complete the initialization */
storvsc_initialize(&storvsc_drv_obj->base);
- if (storvsc_drv_obj->max_outstanding_req_per_channel <
+ if (max_outstanding_req_per_channel <
STORVSC_MAX_IO_REQUESTS)
return -1;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 131/206] Staging: hv: Get rid of some unnecessary DPRINTs
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
The subject line says it all.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_drv.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 0d7e43b..07db877 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -103,10 +103,6 @@ static int storvsc_initialize(struct hv_driver *driver)
sizeof(struct vstor_packet) + sizeof(u64),
sizeof(u64)));
- DPRINT_INFO(STORVSC, "max io %u, currently %u\n",
- stor_driver->max_outstanding_req_per_channel,
- STORVSC_MAX_IO_REQUESTS);
-
return 0;
}
@@ -807,10 +803,6 @@ static int storvsc_drv_init(void)
/* Callback to client driver to complete the initialization */
storvsc_initialize(&storvsc_drv_obj->base);
- DPRINT_INFO(STORVSC_DRV,
- "max outstanding reqs %u",
- storvsc_drv_obj->max_outstanding_req_per_channel);
-
if (storvsc_drv_obj->max_outstanding_req_per_channel <
STORVSC_MAX_IO_REQUESTS)
return -1;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 130/206] Staging: hv: Make blkvsc_drv_init the module init function
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Now, get rid of the redundant function and make
blkvsc_drv_init the module init function.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index ed1439f..eebaaee 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -1044,15 +1044,6 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request)
spin_unlock_irqrestore(&blkdev->lock, flags);
}
-static int __init blkvsc_init(void)
-{
- int ret;
-
- ret = blkvsc_drv_init();
-
- return ret;
-}
-
static void __exit blkvsc_exit(void)
{
blkvsc_drv_exit();
@@ -1061,5 +1052,5 @@ static void __exit blkvsc_exit(void)
MODULE_LICENSE("GPL");
MODULE_VERSION(HV_DRV_VERSION);
MODULE_DESCRIPTION("Microsoft Hyper-V virtual block driver");
-module_init(blkvsc_init);
+module_init(blkvsc_drv_init);
module_exit(blkvsc_exit);
--
1.7.4.1
^ permalink raw reply related
* [PATCH 129/206] Staging: hv: Move the sector size check into blkvsc_drv_init
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization; +Cc: Haiyang Zhang, Abhishek Kane
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
The subject line says it all.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index f8a3bce..ed1439f 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -822,6 +822,8 @@ static int blkvsc_drv_init(void)
struct hv_driver *drv = &blkvsc_drv.base;
int ret;
+ BUILD_BUG_ON(sizeof(sector_t) != 8);
+
storvsc_drv->ring_buffer_size = blkvsc_ringbuffer_size;
memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid));
@@ -1046,8 +1048,6 @@ static int __init blkvsc_init(void)
{
int ret;
- BUILD_BUG_ON(sizeof(sector_t) != 8);
-
ret = blkvsc_drv_init();
return ret;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 128/206] Staging: hv: Now get rid of the empty function
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Now, get rid of the empty function.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 7e25707..f8a3bce 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -166,18 +166,6 @@ static int blkvsc_device_add(struct hv_device *device,
return ret;
}
-
-static int blk_vsc_initialize(struct hv_driver *driver)
-{
- struct storvsc_driver *stor_driver;
- int ret = 0;
-
- stor_driver = hvdr_to_stordr(driver);
-
- return ret;
-}
-
-
static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req,
void (*request_completion)(struct hv_storvsc_request *))
{
@@ -836,9 +824,6 @@ static int blkvsc_drv_init(void)
storvsc_drv->ring_buffer_size = blkvsc_ringbuffer_size;
- /* Callback to client driver to complete the initialization */
- blk_vsc_initialize(&storvsc_drv->base);
-
memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid));
drv->name = drv_name;
drv->driver.name = drv_name;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 127/206] Staging: hv: Inline the copying of dev_type guid
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
In preperation to eliminating blk_vsc_initialize(), move the copying of
dev_type field.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 1e6ef6f..7e25707 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -174,8 +174,6 @@ static int blk_vsc_initialize(struct hv_driver *driver)
stor_driver = hvdr_to_stordr(driver);
- memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid));
-
return ret;
}
@@ -841,6 +839,7 @@ static int blkvsc_drv_init(void)
/* Callback to client driver to complete the initialization */
blk_vsc_initialize(&storvsc_drv->base);
+ memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid));
drv->name = drv_name;
drv->driver.name = drv_name;
--
1.7.4.1
^ permalink raw reply related
* [PATCH 126/206] Staging: hv: Move the assignment of driver name
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
In preperation to eliminating blk_vsc_initialize(), move the assignment
of driver name.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index e0d34c1..1e6ef6f 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -174,7 +174,6 @@ static int blk_vsc_initialize(struct hv_driver *driver)
stor_driver = hvdr_to_stordr(driver);
- driver->name = drv_name;
memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid));
return ret;
@@ -842,6 +841,7 @@ static int blkvsc_drv_init(void)
/* Callback to client driver to complete the initialization */
blk_vsc_initialize(&storvsc_drv->base);
+ drv->name = drv_name;
drv->driver.name = drv_name;
/* The driver belongs to vmbus */
--
1.7.4.1
^ permalink raw reply related
* [PATCH 125/206] Staging: hv: Assign the name directly
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Assign the driver name directly.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 77b081c..e0d34c1 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -842,7 +842,7 @@ static int blkvsc_drv_init(void)
/* Callback to client driver to complete the initialization */
blk_vsc_initialize(&storvsc_drv->base);
- drv->driver.name = storvsc_drv->base.name;
+ drv->driver.name = drv_name;
/* The driver belongs to vmbus */
ret = vmbus_child_driver_register(&drv->driver);
--
1.7.4.1
^ permalink raw reply related
* [PATCH 124/206] Staging: hv: Get rid of unnecessary code/comments
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Get rid of unnecessary code/comments.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 8ff9a58..77b081c 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -174,24 +174,9 @@ static int blk_vsc_initialize(struct hv_driver *driver)
stor_driver = hvdr_to_stordr(driver);
- /* Make sure we are at least 2 pages since 1 page is used for control */
-
driver->name = drv_name;
memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid));
-
- /*
- * Divide the ring buffer data size (which is 1 page less than the ring
- * buffer size since that page is reserved for the ring buffer indices)
- * by the max request size (which is
- * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
- */
- stor_driver->max_outstanding_req_per_channel =
- ((stor_driver->ring_buffer_size - PAGE_SIZE) /
- ALIGN(MAX_MULTIPAGE_BUFFER_PACKET +
- sizeof(struct vstor_packet) + sizeof(u64),
- sizeof(u64)));
-
return ret;
}
--
1.7.4.1
^ permalink raw reply related
* [PATCH 123/206] Staging: hv: Get rid unnecessary DPRINT
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Get rid unnecessary DPRINT.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/blkvsc_drv.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 7fb0cf1..8ff9a58 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -192,10 +192,6 @@ static int blk_vsc_initialize(struct hv_driver *driver)
sizeof(struct vstor_packet) + sizeof(u64),
sizeof(u64)));
- DPRINT_INFO(BLKVSC, "max io outstd %u",
- stor_driver->max_outstanding_req_per_channel);
-
-
return ret;
}
--
1.7.4.1
^ permalink raw reply related
* [PATCH 122/206] Staging: hv: Get rid of unnecessary state from struct storvsc_driver
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
This is unused state; get rid of it.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/storvsc_api.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
index 1887940..055902b 100644
--- a/drivers/staging/hv/storvsc_api.h
+++ b/drivers/staging/hv/storvsc_api.h
@@ -83,9 +83,6 @@ struct storvsc_driver {
/* Maximum # of requests in flight per channel/device */
u32 max_outstanding_req_per_channel;
- /* Specific to this driver */
- int (*on_io_request)(struct hv_device *device,
- struct hv_storvsc_request *request);
};
struct storvsc_device_info {
--
1.7.4.1
^ permalink raw reply related
* [PATCH 121/206] Staging: hv: Change Cleanup to cleanup
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
The subject line says it all.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/hv.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index e0c2861..2efac38 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -161,7 +161,7 @@ int hv_init(void)
sizeof(void *) * MAX_NUM_CPUS);
if (!query_hypervisor_presence())
- goto Cleanup;
+ goto cleanup;
max_leaf = query_hypervisor_info();
/* HvQueryHypervisorFeatures(maxLeaf); */
@@ -172,7 +172,7 @@ int hv_init(void)
rdmsrl(HV_X64_MSR_GUEST_OS_ID, hv_context.guestid);
if (hv_context.guestid != 0)
- goto Cleanup;
+ goto cleanup;
/* Write our OS info */
wrmsrl(HV_X64_MSR_GUEST_OS_ID, HV_LINUX_GUEST_ID);
@@ -188,7 +188,7 @@ int hv_init(void)
virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
if (!virtaddr)
- goto Cleanup;
+ goto cleanup;
hypercall_msr.enable = 1;
@@ -200,7 +200,7 @@ int hv_init(void)
rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
if (!hypercall_msr.enable)
- goto Cleanup;
+ goto cleanup;
hv_context.hypercall_page = virtaddr;
@@ -209,7 +209,7 @@ int hv_init(void)
kmalloc(sizeof(struct hv_input_signal_event_buffer),
GFP_KERNEL);
if (!hv_context.signal_event_buffer)
- goto Cleanup;
+ goto cleanup;
hv_context.signal_event_param =
(struct hv_input_signal_event *)
@@ -224,7 +224,7 @@ int hv_init(void)
return ret;
-Cleanup:
+cleanup:
if (virtaddr) {
if (hypercall_msr.enable) {
hypercall_msr.as_uint64 = 0;
@@ -345,7 +345,7 @@ void hv_synic_init(void *irqarg)
if (hv_context.synic_message_page[cpu] == NULL) {
pr_err("Unable to allocate SYNIC message page\n");
- goto Cleanup;
+ goto cleanup;
}
hv_context.synic_event_page[cpu] =
@@ -353,7 +353,7 @@ void hv_synic_init(void *irqarg)
if (hv_context.synic_event_page[cpu] == NULL) {
pr_err("Unable to allocate SYNIC event page\n");
- goto Cleanup;
+ goto cleanup;
}
/* Setup the Synic's message page */
@@ -391,7 +391,7 @@ void hv_synic_init(void *irqarg)
hv_context.synic_initialized = true;
return;
-Cleanup:
+cleanup:
if (hv_context.synic_event_page[cpu])
free_page((unsigned long)hv_context.synic_event_page[cpu]);
--
1.7.4.1
^ permalink raw reply related
* [PATCH 120/206] Staging: hv: Get rid of some dead code from hv.c
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Get rid of some commented code.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/hv.c | 31 -------------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index e6312bd..e0c2861 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -82,34 +82,7 @@ static int query_hypervisor_info(void)
op = HVCPUID_VENDOR_MAXFUNCTION;
cpuid(op, &eax, &ebx, &ecx, &edx);
-/* DPRINT_INFO(VMBUS, "Vendor ID: %c%c%c%c%c%c%c%c%c%c%c%c",
- (ebx & 0xFF),
- ((ebx >> 8) & 0xFF),
- ((ebx >> 16) & 0xFF),
- ((ebx >> 24) & 0xFF),
- (ecx & 0xFF),
- ((ecx >> 8) & 0xFF),
- ((ecx >> 16) & 0xFF),
- ((ecx >> 24) & 0xFF),
- (edx & 0xFF),
- ((edx >> 8) & 0xFF),
- ((edx >> 16) & 0xFF),
- ((edx >> 24) & 0xFF));
-*/
max_leaf = eax;
-/* eax = 0;
- ebx = 0;
- ecx = 0;
- edx = 0;
- op = HVCPUID_INTERFACE;
- cpuid(op, &eax, &ebx, &ecx, &edx);
-
- DPRINT_INFO(VMBUS, "Interface ID: %c%c%c%c",
- (eax & 0xFF),
- ((eax >> 8) & 0xFF),
- ((eax >> 16) & 0xFF),
- ((eax >> 24) & 0xFF));
-*/
if (max_leaf >= HVCPUID_VERSION) {
eax = 0;
@@ -399,10 +372,6 @@ void hv_synic_init(void *irqarg)
wrmsrl(HV_X64_MSR_SIEFP, siefp.as_uint64);
- /* Setup the interception SINT. */
- /* wrmsrl((HV_X64_MSR_SINT0 + HV_SYNIC_INTERCEPTION_SINT_INDEX), */
- /* interceptionSint.as_uint64); */
-
/* Setup the shared SINT. */
rdmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64);
--
1.7.4.1
^ permalink raw reply related
* [PATCH 119/206] Staging: hv: Get rid of some dead code in connection.c
From: K. Y. Srinivasan @ 2011-05-09 21:56 UTC (permalink / raw)
To: gregkh, linux-kernel, devel, virtualization
Cc: K. Y. Srinivasan, Haiyang Zhang, Abhishek Kane, Hank Janssen
In-Reply-To: <1304978288-22999-1-git-send-email-kys@microsoft.com>
Get rid some commented code and dated comments.T
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
---
drivers/staging/hv/connection.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index 3632bcc..dd62585 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -263,11 +263,6 @@ static void process_chn_event(u32 relid)
if (channel) {
vmbus_onchannel_event(channel);
- /*
- * WorkQueueQueueWorkItem(channel->dataWorkQueue,
- * vmbus_onchannel_event,
- * (void*)channel);
- */
} else {
pr_err("channel not found for relid - %u\n", relid);
}
@@ -295,7 +290,10 @@ void vmbus_on_event(unsigned long data)
relid = (dword << 5) + bit;
if (relid == 0) {
- /* special case - vmbus channel protocol msg */
+ /*
+ * Special case - vmbus
+ * channel protocol msg
+ */
continue;
}
process_chn_event(relid);
--
1.7.4.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox