Merge pull request #268 from bergwolf/cleanup

Cleanup

Author: laijs

src/container.c

@@ -180,7 +180,7 @@ static int container_setup_volume(struct hyper_container *container)
 
 		if (vol->readonly &&
 		    mount(volume, mountpoint, NULL, MS_BIND | MS_REMOUNT | MS_RDONLY, NULL) < 0) {
-			perror("mount fsmap failed");
+			perror("mount volume ro failed");
 			return -1;
 		}
 
@@ -203,7 +203,7 @@ static int container_setup_volume(struct hyper_container *container)
 		if (st.st_mode & S_IFDIR) {
 			if (hyper_mkdir(mountpoint, 0755) < 0) {
 				perror("create map dir failed");
-				continue;
+				return -1;
 			}
 			if (map->docker) {
 				/* converted from volume */
@@ -212,28 +212,30 @@ static int container_setup_volume(struct hyper_container *container)
 				if (container->initialize &&
 				    (container_populate_volume(mountpoint, volume) < 0)) {
 					fprintf(stderr, "fail to populate volume %s\n", mountpoint);
-					continue;
+					return -1;
 				}
 			}
 		} else {
 			int fd = open(mountpoint, O_CREAT|O_WRONLY, 0755);
 			if (fd < 0) {
 				perror("create map file failed");
-				continue;
+				return -1;
 			}
 			close(fd);
 		}
 
 		if (mount(src, mountpoint, NULL, MS_BIND, NULL) < 0) {
 			perror("mount fsmap failed");
-			continue;
+			return -1;
 		}
 
 		if (map->readonly == 0)
 			continue;
 
-		if (mount(src, mountpoint, NULL, MS_BIND | MS_REMOUNT | MS_RDONLY, NULL) < 0)
-			perror("mount fsmap failed");
+		if (mount(src, mountpoint, NULL, MS_BIND | MS_REMOUNT | MS_RDONLY, NULL) < 0) {
+			perror("mount fsmap ro failed");
+			return -1;
+		}
 	}
 
 	return 0;

src/container.h

@@ -35,7 +35,6 @@ struct hyper_container {
 	struct list_head	list;
 	struct hyper_exec	exec;
 	int			ns;
-	uint32_t		code;
 
 	// configs
 	char			*id;

src/hyper.h

@@ -83,7 +83,6 @@ static inline int hyper_create(char *hyper_path)
 	return 0;
 }
 
-int hyper_open_serial(char *tty);
 int hyper_enter_sandbox(struct hyper_pod *pod, int pidpipe);
 void hyper_pod_destroyed(int failed);
 int hyper_ctl_append_msg(struct hyper_event *he, uint32_t type, uint8_t *data, uint32_t len);

src/util.h

@@ -34,7 +34,6 @@ int hyper_open_channel(char *channel, int mode);
 int hyper_setfd_cloexec(int fd);
 int hyper_setfd_block(int fd);
 int hyper_setfd_nonblock(int fd);
-int hyper_socketpair(int domain, int type, int protocol, int sv[2]);
 void hyper_shutdown();
 int hyper_insmod(char *module);
 bool hyper_name_to_id(const char *name, unsigned long *val);