Skip to content

Commit

Permalink
drivers: hv: kvp: Add/cleanup connector defines
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Feb 2, 2012
1 parent bd1d462 commit 4f03a2c
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 7 deletions.
3 changes: 0 additions & 3 deletions drivers/hv/hv_kvp.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@
* 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 {
KVP_REGISTER = 0, /* Register the user mode component */
KVP_KERNEL_GET, /* Kernel is requesting the value */
Expand Down
1 change: 1 addition & 0 deletions include/linux/connector.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#define CN_IDX_DRBD 0x8
#define CN_VAL_DRBD 0x1
#define CN_KVP_IDX 0x9 /* HyperV KVP */
#define CN_KVP_VAL 0x1 /* queries from the kernel */

#define CN_NETLINK_USERS 10 /* Highest index + 1 */

Expand Down
4 changes: 0 additions & 4 deletions tools/hv/hv_kvp_daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,11 @@
#include <syslog.h>

/*
* KYS: TODO. Need to register these in the kernel.
*
* The following definitions are shared with the in-kernel component; do not
* change any of this without making the corresponding changes in
* 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
Expand Down

0 comments on commit 4f03a2c

Please sign in to comment.