From owner-svn-src-projects@FreeBSD.ORG Mon Sep 9 19:27:45 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 61BA026D; Mon, 9 Sep 2013 19:27:45 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4ECC82E81; Mon, 9 Sep 2013 19:27:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r89JRjAC061432; Mon, 9 Sep 2013 19:27:45 GMT (envelope-from grehan@svn.freebsd.org) Received: (from grehan@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r89JRiud061428; Mon, 9 Sep 2013 19:27:44 GMT (envelope-from grehan@svn.freebsd.org) Message-Id: <201309091927.r89JRiud061428@svn.freebsd.org> From: Peter Grehan Date: Mon, 9 Sep 2013 19:27:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r255427 - in projects/hyperv/sys: conf dev/hyperv/utilities modules/hyperv/utilities X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2013 19:27:45 -0000 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