From 9690c59ca622dcc408f0392ed1b9e0a61dc0a0bc Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 27 Jan 2012 15:55:57 -0800 Subject: [PATCH] --- yaml --- r: 288861 b: refs/heads/master c: 4f03a2c934894f30a64d397df8c7c4de129c5b30 h: refs/heads/master i: 288859: 3cff0a1dd238a9e76c6594c6e99fac210ee24fca v: v3 --- [refs] | 2 +- trunk/drivers/hv/hv_kvp.h | 3 --- trunk/include/linux/connector.h | 1 + trunk/tools/hv/hv_kvp_daemon.c | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index b71c7a3b5dd9..4a9a190f9e49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd1d462e13b278fc57752d0b9b15040e60e561a0 +refs/heads/master: 4f03a2c934894f30a64d397df8c7c4de129c5b30 diff --git a/trunk/drivers/hv/hv_kvp.h b/trunk/drivers/hv/hv_kvp.h index 9b765d7df838..c2c5bba25a5a 100644 --- a/trunk/drivers/hv/hv_kvp.h +++ b/trunk/drivers/hv/hv_kvp.h @@ -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 */ diff --git a/trunk/include/linux/connector.h b/trunk/include/linux/connector.h index 3c9c54fd5690..76384074262d 100644 --- a/trunk/include/linux/connector.h +++ b/trunk/include/linux/connector.h @@ -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 */ diff --git a/trunk/tools/hv/hv_kvp_daemon.c b/trunk/tools/hv/hv_kvp_daemon.c index 11224eddcdc2..2b6a2d950b88 100644 --- a/trunk/tools/hv/hv_kvp_daemon.c +++ b/trunk/tools/hv/hv_kvp_daemon.c @@ -40,15 +40,11 @@ #include /* - * 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