svn commit: r255427 - in projects/hyperv/sys: conf dev/hyperv/utilities modules/hyperv/utilities

[Peter Grehan]

Author: grehan
Date: Mon Sep  9 19:27:44 2013
New Revision: 255427
URL: http://svnweb.freebsd.org/changeset/base/255427

Log:
  Revert the kvp code - there's still some work that
  needs to be done for that.
  
  Discussed with:	Microsoft hyper-v devs

Deleted:
  projects/hyperv/sys/dev/hyperv/utilities/hv_kvp.c
Modified:
  projects/hyperv/sys/conf/files.amd64
  projects/hyperv/sys/dev/hyperv/utilities/hv_kvp.h
  projects/hyperv/sys/dev/hyperv/utilities/hv_util.c
  projects/hyperv/sys/modules/hyperv/utilities/Makefile

Modified: projects/hyperv/sys/conf/files.amd64
==============================================================================
--- projects/hyperv/sys/conf/files.amd64	Mon Sep  9 18:11:59 2013	(r255426)
+++ projects/hyperv/sys/conf/files.amd64	Mon Sep  9 19:27:44 2013	(r255427)
@@ -226,7 +226,6 @@ dev/hyperv/netvsc/hv_netvsc_drv_freebsd.
 dev/hyperv/netvsc/hv_rndis_filter.c			optional	hyperv
 dev/hyperv/stordisengage/hv_ata_pci_disengage.c		optional	hyperv
 dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c		optional	hyperv
-dev/hyperv/utilities/hv_kvp.c				optional	hyperv
 dev/hyperv/utilities/hv_util.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel.c				optional	hyperv
 dev/hyperv/vmbus/hv_channel_mgmt.c			optional	hyperv

Modified: projects/hyperv/sys/dev/hyperv/utilities/hv_kvp.h
==============================================================================
--- projects/hyperv/sys/dev/hyperv/utilities/hv_kvp.h	Mon Sep  9 18:11:59 2013	(r255426)
+++ projects/hyperv/sys/dev/hyperv/utilities/hv_kvp.h	Mon Sep  9 19:27:44 2013	(r255427)
@@ -250,17 +250,17 @@ struct hv_kvp_ip_msg {
 
 #define BSD_SOC_PATH "/etc/hyperv/socket" 
 
-#define HV_SHUT_DOWN		 0
-#define HV_TIME_SYNCH	 1
-#define HV_HEART_BEAT	 2
-#define HV_KVP		 3
-#define HV_MAX_UTIL_SERVICES 4
+#define HV_SHUT_DOWN		0
+#define HV_TIME_SYNCH	 	1
+#define HV_HEART_BEAT	 	2
+#define HV_KVP		 	3
+#define HV_MAX_UTIL_SERVICES 	4
 
 #define HV_WLTIMEDELTA			116444736000000000L /* in 100ns unit */
 #define HV_ICTIMESYNCFLAG_PROBE		0
 #define HV_ICTIMESYNCFLAG_SYNC		1
 #define HV_ICTIMESYNCFLAG_SAMPLE	2
-#define HV_NANO_SEC_PER_SEC 1000000000
+#define HV_NANO_SEC_PER_SEC 		1000000000
 
 typedef struct hv_vmbus_service {
 	hv_guid		guid;		/* Hyper-V GUID */
@@ -282,6 +282,4 @@ typedef struct hv_vmbus_service {
 extern uint8_t* receive_buffer[];
 extern hv_vmbus_service service_table[];
 
-void hv_kvp_callback(void *context);
-int hv_kvp_init(hv_vmbus_service *serv);
 #endif /* _KVP_H */

Modified: projects/hyperv/sys/dev/hyperv/utilities/hv_util.c
==============================================================================
--- projects/hyperv/sys/dev/hyperv/utilities/hv_util.c	Mon Sep  9 18:11:59 2013	(r255426)
+++ projects/hyperv/sys/dev/hyperv/utilities/hv_util.c	Mon Sep  9 19:27:44 2013	(r255427)
@@ -82,15 +82,6 @@ hv_vmbus_service service_table[] = {
 	  .enabled = TRUE,
           .callback = hv_heartbeat_cb,
 	},
-
-        /* KVP (Key Value Pair) Service */
-        { .guid.data = {0xe7, 0xf4, 0xa0, 0xa9, 0x45, 0x5a, 0x96, 0x4d,
-			0xb8, 0x27, 0x8a, 0x84, 0x1e, 0x8c, 0x3,  0xe6},
-	  .name = "Hyper-V KVP Service\n",
-	  .enabled = TRUE,
-	  .init = hv_kvp_init, 
-	  .callback = hv_kvp_callback,
-	},
 };
 
 /*

Modified: projects/hyperv/sys/modules/hyperv/utilities/Makefile
==============================================================================
--- projects/hyperv/sys/modules/hyperv/utilities/Makefile	Mon Sep  9 18:11:59 2013	(r255426)
+++ projects/hyperv/sys/modules/hyperv/utilities/Makefile	Mon Sep  9 19:27:44 2013	(r255427)
@@ -2,10 +2,9 @@
 
 .PATH:	${.CURDIR}/../../../dev/hyperv/utilities
 
-KMOD=	 hv_utils
+KMOD=	hv_utils
 
-SRCS =  hv_kvp.c \
-	hv_util.c
+SRCS =  hv_util.c
 
 CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \
 	 -I${.CURDIR}/../../../dev/hyperv/vmbus