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

PATCH In review Weibing Zhang 3 participants 3 messages Oct 19, 2016 Hyper-V/Azure core and drivers

Share & tools

Weibing Zhang

author

2016-10-19 03:43 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Weibing Zhang <[email protected]>

---
 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(-)

tools/hv/Makefile +1 -2

index a8c4644..0d1e61b 100644
@@ -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

tools/hv/hv_fcopy_daemon.c +0 -7

index fdc9ca4..26ae609 100644
@@ -18,21 +18,14 @@
 
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
-#include <linux/types.h>
-#include <linux/kdev_t.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <linux/hyperv.h>
 #include <syslog.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <dirent.h>
 #include <getopt.h>
 
 static int target_fd;

tools/hv/hv_kvp_daemon.c +1 -8

index bc7adb8..d791dbf 100644
@@ -22,8 +22,6 @@
  */
 
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/poll.h>
 #include <sys/utsname.h>
 #include <stdio.h>

@@ -34,7 +32,6 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <linux/hyperv.h>
-#include <linux/netlink.h>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <syslog.h>

@@ -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) {

Signature · 1 line

2.7.4

KY Srinivasan

2016-10-19 14:45 UTC #1 lore raw

Quoted 12 lines

-----Original Message-----
From: Weibing Zhang [mailto:[email protected]]
Sent: Tuesday, October 18, 2016 8:43 PM
To: KY Srinivasan <[email protected]>; Haiyang Zhang <[email protected]>
Cc: [email protected]; [email protected]; Weibing Zhang <[email protected]>
Subject: [PATCH] tools: hv: clean up code, remove unnecessary header files and link flags

Quoted 4 lines

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

Quoted 92 lines

Signed-off-by Weibing Zhang <[email protected]>

---
 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(-)

tools/hv/Makefile +1 -2

index a8c4644..0d1e61b 100644
@@ -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

tools/hv/hv_fcopy_daemon.c +0 -7

index fdc9ca4..26ae609 100644
@@ -18,21 +18,14 @@
 
 
 #include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
-#include <linux/types.h>
-#include <linux/kdev_t.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
-#include <ctype.h>
 #include <errno.h>
 #include <linux/hyperv.h>
 #include <syslog.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <dirent.h>
 #include <getopt.h>
 
 static int target_fd;

tools/hv/hv_kvp_daemon.c +1 -9

index bc7adb8..d791dbf 100644
@@ -22,8 +22,6 @@
  */
 
 
-#include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/poll.h>
 #include <sys/utsname.h>
 #include <stdio.h>

@@ -34,7 +32,6 @@
 #include <errno.h>
 #include <arpa/inet.h>
 #include <linux/hyperv.h>
-#include <linux/netlink.h>
 #include <ifaddrs.h>
 #include <netdb.h>
 #include <syslog.h>

@@ -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

Dan Carpenter

2016-10-19 15:07 UTC #2 lore raw

In reply to Weibing Zhang

Quoted 6 lines · 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 <[email protected]>

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

regards,
dan carpenter