Staging: hv: Move the contents of vmbus_channel_interface.h to hyperv.h

Move the contents of vmbus_channel_interface.h to hyperv.h

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/channel_mgmt.h b/drivers/staging/hv/channel_mgmt.h
index f895d0a..4025a59 100644 (file)
--- a/drivers/staging/hv/channel_mgmt.h
+++ b/drivers/staging/hv/channel_mgmt.h
@@ -29,8 +29,7 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 #include <linux/completion.h>
-#include "ring_buffer.h"
-#include "vmbus_channel_interface.h"
+#include "hyperv.h"
 #include "vmbus_packet_format.h"
 
 /* Version 1 messages */

diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c
index 8e762fb..f9e3716 100644 (file)
--- a/drivers/staging/hv/hv_kvp.c
+++ b/drivers/staging/hv/hv_kvp.c
@@ -32,7 +32,6 @@
 #include "hv_api.h"
 #include "vmbus.h"
 #include "vmbus_packet_format.h"
-#include "vmbus_channel_interface.h"
 #include "channel.h"
 #include "vmbus_private.h"
 #include "vmbus_api.h"

diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index 534f052..45d4a07 100644 (file)
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -34,7 +34,6 @@
 #include "hv_api.h"
 #include "vmbus.h"
 #include "vmbus_packet_format.h"
-#include "vmbus_channel_interface.h"
 #include "channel.h"
 #include "vmbus_private.h"
 #include "vmbus_api.h"

diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h
index 2cd1b36..5810f81 100644 (file)
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -122,4 +122,67 @@ struct hv_ring_buffer_debug_info {
 #define HV_DRV_VERSION           "3.1"
 
 
+/*
+ * A revision number of vmbus that is used for ensuring both ends on a
+ * partition are using compatible versions.
+ */
+#define VMBUS_REVISION_NUMBER          13
+
+/* Make maximum size of pipe payload of 16K */
+#define MAX_PIPE_DATA_PAYLOAD          (sizeof(u8) * 16384)
+
+/* Define PipeMode values. */
+#define VMBUS_PIPE_TYPE_BYTE           0x00000000
+#define VMBUS_PIPE_TYPE_MESSAGE                0x00000004
+
+/* The size of the user defined data buffer for non-pipe offers. */
+#define MAX_USER_DEFINED_BYTES         120
+
+/* The size of the user defined data buffer for pipe offers. */
+#define MAX_PIPE_USER_DEFINED_BYTES    116
+
+/*
+ * At the center of the Channel Management library is the Channel Offer. This
+ * struct contains the fundamental information about an offer.
+ */
+struct vmbus_channel_offer {
+       struct hv_guid if_type;
+       struct hv_guid if_instance;
+       u64 int_latency; /* in 100ns units */
+       u32 if_revision;
+       u32 server_ctx_size;    /* in bytes */
+       u16 chn_flags;
+       u16 mmio_megabytes;             /* in bytes * 1024 * 1024 */
+
+       union {
+               /* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */
+               struct {
+                       unsigned char user_def[MAX_USER_DEFINED_BYTES];
+               } std;
+
+               /*
+                * Pipes:
+                * The following sructure is an integrated pipe protocol, which
+                * is implemented on top of standard user-defined data. Pipe
+                * clients have MAX_PIPE_USER_DEFINED_BYTES left for their own
+                * use.
+                */
+               struct {
+                       u32  pipe_mode;
+                       unsigned char user_def[MAX_PIPE_USER_DEFINED_BYTES];
+               } pipe;
+       } u;
+       u32 padding;
+} __packed;
+
+/* Server Flags */
+#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE       1
+#define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES   2
+#define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS           4
+#define VMBUS_CHANNEL_NAMED_PIPE_MODE                  0x10
+#define VMBUS_CHANNEL_LOOPBACK_OFFER                   0x100
+#define VMBUS_CHANNEL_PARENT_OFFER                     0x200
+#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION   0x400
+
+
 #endif /* _HYPERV_H */

diff --git a/drivers/staging/hv/netvsc.h b/drivers/staging/hv/netvsc.h
index 9ebea3b..75516cb 100644 (file)
--- a/drivers/staging/hv/netvsc.h
+++ b/drivers/staging/hv/netvsc.h
@@ -27,7 +27,7 @@
 
 #include <linux/list.h>
 #include "vmbus_packet_format.h"
-#include "vmbus_channel_interface.h"
+#include "hyperv.h"
 #include "netvsc_api.h"
 
 

diff --git a/drivers/staging/hv/vmbus_channel_interface.h b/drivers/staging/hv/vmbus_channel_interface.h
deleted file mode 100644 (file)
index 20ae258..0000000
--- a/drivers/staging/hv/vmbus_channel_interface.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *
- * Copyright (c) 2009, Microsoft Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Authors:
- *   Haiyang Zhang <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- *
- */
-
-#ifndef __VMBUSCHANNELINTERFACE_H
-#define __VMBUSCHANNELINTERFACE_H
-
-/*
- * A revision number of vmbus that is used for ensuring both ends on a
- * partition are using compatible versions.
- */
-#define VMBUS_REVISION_NUMBER          13
-
-/* Make maximum size of pipe payload of 16K */
-#define MAX_PIPE_DATA_PAYLOAD          (sizeof(u8) * 16384)
-
-/* Define PipeMode values. */
-#define VMBUS_PIPE_TYPE_BYTE           0x00000000
-#define VMBUS_PIPE_TYPE_MESSAGE                0x00000004
-
-/* The size of the user defined data buffer for non-pipe offers. */
-#define MAX_USER_DEFINED_BYTES         120
-
-/* The size of the user defined data buffer for pipe offers. */
-#define MAX_PIPE_USER_DEFINED_BYTES    116
-
-/*
- * At the center of the Channel Management library is the Channel Offer. This
- * struct contains the fundamental information about an offer.
- */
-struct vmbus_channel_offer {
-       struct hv_guid if_type;
-       struct hv_guid if_instance;
-       u64 int_latency; /* in 100ns units */
-       u32 if_revision;
-       u32 server_ctx_size;    /* in bytes */
-       u16 chn_flags;
-       u16 mmio_megabytes;             /* in bytes * 1024 * 1024 */
-
-       union {
-               /* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */
-               struct {
-                       unsigned char user_def[MAX_USER_DEFINED_BYTES];
-               } std;
-
-               /*
-                * Pipes:
-                * The following sructure is an integrated pipe protocol, which
-                * is implemented on top of standard user-defined data. Pipe
-                * clients have MAX_PIPE_USER_DEFINED_BYTES left for their own
-                * use.
-                */
-               struct {
-                       u32  pipe_mode;
-                       unsigned char user_def[MAX_PIPE_USER_DEFINED_BYTES];
-               } pipe;
-       } u;
-       u32 padding;
-} __packed;
-
-/* Server Flags */
-#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE       1
-#define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES   2
-#define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS           4
-#define VMBUS_CHANNEL_NAMED_PIPE_MODE                  0x10
-#define VMBUS_CHANNEL_LOOPBACK_OFFER                   0x100
-#define VMBUS_CHANNEL_PARENT_OFFER                     0x200
-#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION   0x400
-
-#endif