浏览代码

drivers: hv: kvp: Add/cleanup connector defines

The current KVP code carries some private connector related defines.
Update connector.h to have all the KVP defines. As part of this patch
get rid of some unused defines.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
K. Y. Srinivasan 13 年之前
父节点
当前提交
4f03a2c934
共有 3 个文件被更改,包括 1 次插入7 次删除
  1. 0 3
      drivers/hv/hv_kvp.h
  2. 1 0
      include/linux/connector.h
  3. 0 4
      tools/hv/hv_kvp_daemon.c

+ 0 - 3
drivers/hv/hv_kvp.h

@@ -107,9 +107,6 @@
  * the KVP user-mode component.
  * the KVP user-mode component.
  */
  */
 
 
-#define CN_KVP_VAL             0x1 /* This supports queries from the kernel */
-#define CN_KVP_USER_VAL       0x2 /* This supports queries from the user */
-
 enum hv_ku_op {
 enum hv_ku_op {
 	KVP_REGISTER = 0, /* Register the user mode component */
 	KVP_REGISTER = 0, /* Register the user mode component */
 	KVP_KERNEL_GET, /* Kernel is requesting the value */
 	KVP_KERNEL_GET, /* Kernel is requesting the value */

+ 1 - 0
include/linux/connector.h

@@ -43,6 +43,7 @@
 #define CN_IDX_DRBD			0x8
 #define CN_IDX_DRBD			0x8
 #define CN_VAL_DRBD			0x1
 #define CN_VAL_DRBD			0x1
 #define CN_KVP_IDX			0x9	/* HyperV KVP */
 #define CN_KVP_IDX			0x9	/* HyperV KVP */
+#define CN_KVP_VAL			0x1	/* queries from the kernel */
 
 
 #define CN_NETLINK_USERS		10	/* Highest index + 1 */
 #define CN_NETLINK_USERS		10	/* Highest index + 1 */
 
 

+ 0 - 4
tools/hv/hv_kvp_daemon.c

@@ -40,15 +40,11 @@
 #include <syslog.h>
 #include <syslog.h>
 
 
 /*
 /*
- * KYS: TODO. Need to register these in the kernel.
  *
  *
  * The following definitions are shared with the in-kernel component; do not
  * The following definitions are shared with the in-kernel component; do not
  * change any of this without making the corresponding changes in
  * change any of this without making the corresponding changes in
  * the KVP kernel component.
  * the KVP kernel component.
  */
  */
-#define CN_KVP_IDX		0x9     /* MSFT KVP functionality */
-#define CN_KVP_VAL		0x1 /* This supports queries from the kernel */
-#define CN_KVP_USER_VAL		0x2 /* This supports queries from the user  */
 
 
 /*
 /*
  * KVP protocol: The user mode component first registers with the
  * KVP protocol: The user mode component first registers with the