AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

hv: move "monitor_id" bus attribute to dev_groups

Browse Source 
This moves the "state" bus attribute to the dev_groups structure,
removing the need for it to be in a temporary structure.

Tested-by: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-09-13 11:32:51 -07:00
parent a8fb5f3d58
commit 5ffd00e241
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hv/channel.c
View File

@ -77,8 +77,6 @@ void vmbus_get_debug_info(struct vmbus_channel *channel,
monitorpage = (struct hv_monitor_page *)vmbus_connection.monitor_pages; monitorpage = (struct hv_monitor_page *)vmbus_connection.monitor_pages;
debuginfo->monitorid = channel->offermsg.monitorid;
debuginfo->servermonitor_pending = debuginfo->servermonitor_pending =
monitorpage->trigger_group[monitor_group].pending; monitorpage->trigger_group[monitor_group].pending;
debuginfo->servermonitor_latency = debuginfo->servermonitor_latency =

18
drivers/hv/vmbus_drv.c
View File

@ -50,7 +50,6 @@ struct hv_device_info {
uuid_le chn_type; uuid_le chn_type;
uuid_le chn_instance; uuid_le chn_instance;
u32 monitor_id;
u32 server_monitor_pending; u32 server_monitor_pending;
u32 server_monitor_latency; u32 server_monitor_latency;
u32 server_monitor_conn_id; u32 server_monitor_conn_id;
@ -86,8 +85,6 @@ static void get_channel_info(struct hv_device *device,
memcpy(&info->chn_instance, &debug_info.interface_instance, memcpy(&info->chn_instance, &debug_info.interface_instance,
sizeof(uuid_le)); sizeof(uuid_le));
info->monitor_id = debug_info.monitorid;
info->server_monitor_pending = debug_info.servermonitor_pending; info->server_monitor_pending = debug_info.servermonitor_pending;
info->server_monitor_latency = debug_info.servermonitor_latency; info->server_monitor_latency = debug_info.servermonitor_latency;
info->server_monitor_conn_id = debug_info.servermonitor_connectionid; info->server_monitor_conn_id = debug_info.servermonitor_connectionid;
@ -174,8 +171,6 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
} else if (!strcmp(dev_attr->attr.name, "in_write_bytes_avail")) { } else if (!strcmp(dev_attr->attr.name, "in_write_bytes_avail")) {
ret = sprintf(buf, "%d\n", ret = sprintf(buf, "%d\n",
device_info->inbound.bytes_avail_towrite); device_info->inbound.bytes_avail_towrite);
} else if (!strcmp(dev_attr->attr.name, "monitor_id")) {
ret = sprintf(buf, "%d\n", device_info->monitor_id);
} else if (!strcmp(dev_attr->attr.name, "server_monitor_pending")) { } else if (!strcmp(dev_attr->attr.name, "server_monitor_pending")) {
ret = sprintf(buf, "%d\n", device_info->server_monitor_pending); ret = sprintf(buf, "%d\n", device_info->server_monitor_pending);
} else if (!strcmp(dev_attr->attr.name, "server_monitor_latency")) { } else if (!strcmp(dev_attr->attr.name, "server_monitor_latency")) {
@ -218,9 +213,21 @@ static ssize_t state_show(struct device *dev, struct device_attribute *dev_attr,
} }
static DEVICE_ATTR_RO(state); static DEVICE_ATTR_RO(state);
static ssize_t monitor_id_show(struct device *dev,
struct device_attribute *dev_attr, char *buf)
{
struct hv_device *hv_dev = device_to_hv_device(dev);
if (!hv_dev->channel)
return -ENODEV;
return sprintf(buf, "%d\n", hv_dev->channel->offermsg.monitorid);
}
static DEVICE_ATTR_RO(monitor_id);
static struct attribute *vmbus_attrs[] = { static struct attribute *vmbus_attrs[] = {
&dev_attr_id.attr, &dev_attr_id.attr,
&dev_attr_state.attr, &dev_attr_state.attr,
&dev_attr_monitor_id.attr,
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(vmbus); ATTRIBUTE_GROUPS(vmbus);
@ -229,7 +236,6 @@ ATTRIBUTE_GROUPS(vmbus);
static struct device_attribute vmbus_device_attrs[] = { static struct device_attribute vmbus_device_attrs[] = {
__ATTR(class_id, S_IRUGO, vmbus_show_device_attr, NULL), __ATTR(class_id, S_IRUGO, vmbus_show_device_attr, NULL),
__ATTR(device_id, S_IRUGO, vmbus_show_device_attr, NULL), __ATTR(device_id, S_IRUGO, vmbus_show_device_attr, NULL),
__ATTR(monitor_id, S_IRUGO, vmbus_show_device_attr, NULL),
__ATTR(modalias, S_IRUGO, vmbus_show_device_attr, NULL), __ATTR(modalias, S_IRUGO, vmbus_show_device_attr, NULL),
__ATTR(server_monitor_pending, S_IRUGO, vmbus_show_device_attr, NULL), __ATTR(server_monitor_pending, S_IRUGO, vmbus_show_device_attr, NULL),

1
include/linux/hyperv.h
View File

@ -902,7 +902,6 @@ enum vmbus_channel_state {
struct vmbus_channel_debug_info { struct vmbus_channel_debug_info {
uuid_le interfacetype; uuid_le interfacetype;
uuid_le interface_instance; uuid_le interface_instance;
u32 monitorid;
u32 servermonitor_pending; u32 servermonitor_pending;
u32 servermonitor_latency; u32 servermonitor_latency;
u32 servermonitor_connectionid; u32 servermonitor_connectionid;