Re: [PATCH] tools: hv: clean up code, remove unnecessary header files and link flags

2016-10-19 Thread Dan Carpenter 
On Wed, Oct 19, 2016 at 11:43:28AM +0800, Weibing Zhang wrote:
> Remove unnecessary header files and netlink related code as the daemons
> do not use netlink to communicate with the kernel now.
> Fix a compile warning in snprintf.
> Pthread is also not needed.
> 
> Signed-off-by: Weibing Zhang 

Break this up into multiple patches.
1) cleanup makefile
2) remove unneeded header stuff
3) fix a compile warning

regards,
dan carpenter

RE: [PATCH] tools: hv: clean up code, remove unnecessary header files and link flags

2016-10-19 Thread KY Srinivasan 


> -Original Message-
> From: Weibing Zhang [mailto:atheism.zh...@gmail.com]
> Sent: Tuesday, October 18, 2016 8:43 PM
> To: KY Srinivasan ; Haiyang Zhang
> 
> Cc: de...@linuxdriverproject.org; linux-kernel@vger.kernel.org; Weibing
> Zhang 
> Subject: [PATCH] tools: hv: clean up code, remove unnecessary header files
> and link flags
> 
> Remove unnecessary header files and netlink related code as the daemons
> do not use netlink to communicate with the kernel now.
> Fix a compile warning in snprintf.
> Pthread is also not needed.

Breakup this patch into one that does header cleanup and the other that fixes 
the 
compilation warning.

K. Y
> 
> Signed-off-by: Weibing Zhang 
> ---
>  tools/hv/Makefile  | 3 +--
>  tools/hv/hv_fcopy_daemon.c | 7 ---
>  tools/hv/hv_kvp_daemon.c   | 9 +
>  3 files changed, 2 insertions(+), 17 deletions(-)
> 
> diff --git a/tools/hv/Makefile b/tools/hv/Makefile
> index a8c4644..0d1e61b 100644
> --- a/tools/hv/Makefile
> +++ b/tools/hv/Makefile
> @@ -1,9 +1,8 @@
>  # Makefile for Hyper-V tools
> 
>  CC = $(CROSS_COMPILE)gcc
> -PTHREAD_LIBS = -lpthread
>  WARNINGS = -Wall -Wextra
> -CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) $(shell getconf LFS_CFLAGS)
> +CFLAGS = $(WARNINGS) -g $(shell getconf LFS_CFLAGS)
> 
>  CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
> 
> diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
> index fdc9ca4..26ae609 100644
> --- a/tools/hv/hv_fcopy_daemon.c
> +++ b/tools/hv/hv_fcopy_daemon.c
> @@ -18,21 +18,14 @@
> 
> 
>  #include 
> -#include 
> -#include 
> -#include 
> -#include 
>  #include 
>  #include 
>  #include 
> -#include 
> -#include 
>  #include 
>  #include 
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
> 
>  static int target_fd;
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index bc7adb8..d791dbf 100644
> --- a/tools/hv/hv_kvp_daemon.c
> +++ b/tools/hv/hv_kvp_daemon.c
> @@ -22,8 +22,6 @@
>   */
> 
> 
> -#include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -34,7 +32,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -99,10 +96,6 @@ static struct utsname uts_buf;
>  #define MAX_FILE_NAME 100
>  #define ENTRIES_PER_BLOCK 50
> 
> -#ifndef SOL_NETLINK
> -#define SOL_NETLINK 270
> -#endif
> -
>  struct kvp_record {
>   char key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
>   char value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
> @@ -702,7 +695,7 @@ static char *kvp_mac_to_if_name(char *mac)
>   if (dir == NULL)
>   return NULL;
> 
> - snprintf(dev_id, sizeof(dev_id), kvp_net_dir);
> + snprintf(dev_id, sizeof(dev_id), "%s", kvp_net_dir);
>   q = dev_id + strlen(kvp_net_dir);
> 
>   while ((entry = readdir(dir)) != NULL) {
> --
> 2.7.4

[PATCH] tools: hv: clean up code, remove unnecessary header files and link flags

2016-10-18 Thread Weibing Zhang 
Remove unnecessary header files and netlink related code as the daemons
do not use netlink to communicate with the kernel now.
Fix a compile warning in snprintf.
Pthread is also not needed.

Signed-off-by: Weibing Zhang 
---
 tools/hv/Makefile  | 3 +--
 tools/hv/hv_fcopy_daemon.c | 7 ---
 tools/hv/hv_kvp_daemon.c   | 9 +
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/tools/hv/Makefile b/tools/hv/Makefile
index a8c4644..0d1e61b 100644
--- a/tools/hv/Makefile
+++ b/tools/hv/Makefile
@@ -1,9 +1,8 @@
 # Makefile for Hyper-V tools
 
 CC = $(CROSS_COMPILE)gcc
-PTHREAD_LIBS = -lpthread
 WARNINGS = -Wall -Wextra
-CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) $(shell getconf LFS_CFLAGS)
+CFLAGS = $(WARNINGS) -g $(shell getconf LFS_CFLAGS)
 
 CFLAGS += -D__EXPORTED_HEADERS__ -I../../include/uapi -I../../include
 
diff --git a/tools/hv/hv_fcopy_daemon.c b/tools/hv/hv_fcopy_daemon.c
index fdc9ca4..26ae609 100644
--- a/tools/hv/hv_fcopy_daemon.c
+++ b/tools/hv/hv_fcopy_daemon.c
@@ -18,21 +18,14 @@
 
 
 #include 
-#include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 static int target_fd;
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index bc7adb8..d791dbf 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -22,8 +22,6 @@
  */
 
 
-#include 
-#include 
 #include 
 #include 
 #include 
@@ -34,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -99,10 +96,6 @@ static struct utsname uts_buf;
 #define MAX_FILE_NAME 100
 #define ENTRIES_PER_BLOCK 50
 
-#ifndef SOL_NETLINK
-#define SOL_NETLINK 270
-#endif
-
 struct kvp_record {
char key[HV_KVP_EXCHANGE_MAX_KEY_SIZE];
char value[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
@@ -702,7 +695,7 @@ static char *kvp_mac_to_if_name(char *mac)
if (dir == NULL)
return NULL;
 
-   snprintf(dev_id, sizeof(dev_id), kvp_net_dir);
+   snprintf(dev_id, sizeof(dev_id), "%s", kvp_net_dir);
q = dev_id + strlen(kvp_net_dir);
 
while ((entry = readdir(dir)) != NULL) {
-- 
2.7.4