diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-13 11:22:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-13 11:22:10 -0700 |
| commit | 719d631363a9728e4b082cb689b802ece4476f6c (patch) | |
| tree | f0ea8e8c62621b7536f5216242bdc5dc5781a28e /f03.patch | |
| parent | 44ea8a3f679a11e5ac3c5b174b645669e33fd8cf (diff) | |
| download | patches-719d631363a9728e4b082cb689b802ece4476f6c.tar.gz | |
rename hv patches and document them better.
Diffstat (limited to 'f03.patch')
| -rw-r--r-- | f03.patch | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/f03.patch b/f03.patch deleted file mode 100644 index ba76e2ca7a2de0..00000000000000 --- a/f03.patch +++ /dev/null @@ -1,97 +0,0 @@ -From foo@baz Mon Sep 9 14:31:30 PDT 2013 -Date: Mon, 09 Sep 2013 14:31:30 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: hv: move "monitor_id" bus attribute to dev_groups - -This moves the "state" bus attribute to the dev_groups structure, -removing the need for it to be in a temporary structure. - -Cc: "K. Y. Srinivasan" <kys@microsoft.com> -Cc: Haiyang Zhang <haiyangz@microsoft.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/hv/channel.c | 2 -- - drivers/hv/vmbus_drv.c | 18 ++++++++++++------ - include/linux/hyperv.h | 1 - - 3 files changed, 12 insertions(+), 9 deletions(-) - ---- a/drivers/hv/channel.c -+++ b/drivers/hv/channel.c -@@ -77,8 +77,6 @@ void vmbus_get_debug_info(struct vmbus_c - - monitorpage = (struct hv_monitor_page *)vmbus_connection.monitor_pages; - -- debuginfo->monitorid = channel->offermsg.monitorid; -- - debuginfo->servermonitor_pending = - monitorpage->trigger_group[monitor_group].pending; - debuginfo->servermonitor_latency = ---- a/drivers/hv/vmbus_drv.c -+++ b/drivers/hv/vmbus_drv.c -@@ -50,7 +50,6 @@ struct hv_device_info { - uuid_le chn_type; - uuid_le chn_instance; - -- u32 monitor_id; - u32 server_monitor_pending; - u32 server_monitor_latency; - u32 server_monitor_conn_id; -@@ -86,8 +85,6 @@ static void get_channel_info(struct hv_d - memcpy(&info->chn_instance, &debug_info.interface_instance, - sizeof(uuid_le)); - -- info->monitor_id = debug_info.monitorid; -- - info->server_monitor_pending = debug_info.servermonitor_pending; - info->server_monitor_latency = debug_info.servermonitor_latency; - info->server_monitor_conn_id = debug_info.servermonitor_connectionid; -@@ -174,8 +171,6 @@ static ssize_t vmbus_show_device_attr(st - } else if (!strcmp(dev_attr->attr.name, "in_write_bytes_avail")) { - ret = sprintf(buf, "%d\n", - 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")) { - ret = sprintf(buf, "%d\n", device_info->server_monitor_pending); - } else if (!strcmp(dev_attr->attr.name, "server_monitor_latency")) { -@@ -218,9 +213,21 @@ static ssize_t state_show(struct device - } - 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[] = { - &dev_attr_id.attr, - &dev_attr_state.attr, -+ &dev_attr_monitor_id.attr, - NULL, - }; - ATTRIBUTE_GROUPS(vmbus); -@@ -229,7 +236,6 @@ ATTRIBUTE_GROUPS(vmbus); - static struct device_attribute vmbus_device_attrs[] = { - __ATTR(class_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(server_monitor_pending, S_IRUGO, vmbus_show_device_attr, NULL), ---- a/include/linux/hyperv.h -+++ b/include/linux/hyperv.h -@@ -902,7 +902,6 @@ enum vmbus_channel_state { - struct vmbus_channel_debug_info { - uuid_le interfacetype; - uuid_le interface_instance; -- u32 monitorid; - u32 servermonitor_pending; - u32 servermonitor_latency; - u32 servermonitor_connectionid; |