support kvmtool

for x86_64
./configure

for aarch64
./configure --with-aarch64

Signed-off-by: Gao feng <omarapazanadi@gmail.com>

Author: gao-feng

src/api.h

@@ -64,4 +64,8 @@ enum {
 #define HYPER_VSOCK_CTL_PORT		2718
 #define HYPER_VSOCK_MSG_PORT		2719
 
+/*
+ * use serial as channel passed through kernel cmdline
+ */
+#define HYPER_USE_SERAIL	"hyper_use_serial"
 #endif /* _HYPERSTART_API_H_ */

src/init.c

@@ -924,13 +924,12 @@ static int hyper_ctl_send_ready(int fd)
 	return 0;
 }
 
-static int hyper_setup_ctl_channel(char *name)
+static int hyper_setup_ctl_channel(char *name, bool is_serial)
 {
-	int fd;
-
-	fd = hyper_open_channel(name, 0);
+	int fd = hyper_open_channel(name, 0, is_serial);
 	if (fd < 0)
 		return fd;
+
 	if (hyper_ctl_send_ready(fd) < 0) {
 		close(fd);
 		return -1;
@@ -939,9 +938,9 @@ static int hyper_setup_ctl_channel(char *name)
 	return fd;
 }
 
-static int hyper_setup_tty_channel(char *name)
+static int hyper_setup_tty_channel(char *name, bool is_serial)
 {
-	int ret = hyper_open_channel(name, O_NONBLOCK);
+	int ret = hyper_open_channel(name, O_NONBLOCK, is_serial);
 	if (ret < 0)
 		return -1;
 
@@ -1061,8 +1060,7 @@ static int hyper_ttyfd_read(struct hyper_event *he, int efd, int events)
 {
 	struct hyper_buf *buf = &he->rbuf;
 	uint32_t len;
-	int size;
-	int ret;
+	int size, ret;
 
 	if (buf->get < STREAM_HEADER_SIZE) {
 		size = hyper_channel_read(he, efd, STREAM_HEADER_SIZE - buf->get, events);
@@ -1524,10 +1522,34 @@ static int hyper_setup_init_process(void)
 	return 0;
 }
 
+void read_cmdline(bool *use_serial)
+{
+	char buf[512];
+	int size;
+
+	int fd = open("/proc/cmdline", O_RDONLY| O_CLOEXEC);
+	if (fd < 0) {
+		perror("fail to open /proc/cmdline");
+		return;
+	}
+	size = read(fd, buf, sizeof(buf));
+	if (size < 0) {
+		perror("fail to read /proc/cmdline");
+		goto out;
+	}
+
+	if (strstr(buf, HYPER_USE_SERAIL))
+		*use_serial= true;
+
+out:
+	close(fd);
+	return;
+}
+
 int main(int argc, char *argv[])
 {
-	char *binary_name, *cmdline, *ctl_serial, *tty_serial;
-	bool is_init, has_vsock = false;
+	char *binary_name, *ctl_serial = NULL, *tty_serial = NULL;
+	bool is_init, has_vsock = false, is_serial = false;
 
 	binary_name = basename(argv[0]);
 	is_init = strncmp(binary_name, "init", 5) == 0;
@@ -1536,20 +1558,26 @@ int main(int argc, char *argv[])
 		return -1;
 	}
 
-	cmdline = read_cmdline();
-
+	read_cmdline(&is_serial);
 #ifdef WITH_VBOX
 	ctl_serial = "/dev/ttyS0";
 	tty_serial = "/dev/ttyS1";
+	is_serial = true;
 
 	if (hyper_insmod("/vboxguest.ko") < 0 ||
 	    hyper_insmod("/vboxsf.ko") < 0) {
 		fprintf(stderr, "fail to load modules\n");
 		return -1;
 	}
 #else
-	ctl_serial = "sh.hyper.channel.0";
-	tty_serial = "sh.hyper.channel.1";
+	if (is_serial) {
+		ctl_serial = "/dev/ttyS1";
+		tty_serial = "/dev/ttyS2";
+	} else {
+		ctl_serial = strdup("sh.hyper.channel.0");
+		tty_serial = strdup("sh.hyper.channel.1");
+	}
+
 	if (probe_vsock_device() <= 0) {
 		fprintf(stderr, "cannot find vsock device\n");
 	} else if (hyper_cmd("modprobe vmw_vsock_virtio_transport") < 0) {
@@ -1558,20 +1586,19 @@ int main(int argc, char *argv[])
 		has_vsock = true;
 	}
 #endif
-
 	if (has_vsock) {
 		if (hyper_setup_vsock_channel() < 0) {
 			fprintf(stderr, "fail to setup hyper vsock listener\n");
 			goto out;
 		}
 	} else {
-		hyper_epoll.ctl.fd = hyper_setup_ctl_channel(ctl_serial);
+		hyper_epoll.ctl.fd = hyper_setup_ctl_channel(ctl_serial, is_serial);
 		if (hyper_epoll.ctl.fd < 0) {
 			fprintf(stderr, "fail to setup hyper control serial port\n");
 			goto out;
 		}
 
-		hyper_epoll.tty.fd = hyper_setup_tty_channel(tty_serial);
+		hyper_epoll.tty.fd = hyper_setup_tty_channel(tty_serial, is_serial);
 		if (hyper_epoll.tty.fd < 0) {
 			fprintf(stderr, "fail to setup hyper tty serial port\n");
 			goto out;
@@ -1589,7 +1616,6 @@ int main(int argc, char *argv[])
 		close(hyper_epoll.tty.fd);
 	if (hyper_epoll.ctl.fd > 0)
 		close(hyper_epoll.ctl.fd);
-	free(cmdline);
 
 	return 0;
 }

src/util.c

@@ -19,17 +19,13 @@
 #include <grp.h>
 #include <pwd.h>
 #include <libgen.h>
+#include <termios.h>
 
 #include "util.h"
 #include "hyper.h"
 #include "container.h"
 #include "../config.h"
 
-char *read_cmdline(void)
-{
-	return NULL;
-}
-
 int hyper_setup_env(struct env *envs, int num, bool setPATH)
 {
 	int i, ret = 0;
@@ -554,10 +550,7 @@ void online_memory(void)
 	closedir(dir);
 }
 
-#if WITH_VBOX
-
-#include <termios.h>
-int hyper_open_channel(char *channel, int mode)
+static int hyper_open_serial(char *channel, int mode)
 {
 	struct termios term;
 	int fd = open(channel, O_RDWR | O_CLOEXEC | mode);
@@ -647,8 +640,8 @@ int hyper_insmod(char *module)
 	ret = -1;
 	goto out;
 }
-#else
-int hyper_open_channel(char *channel, int mode)
+
+static int hyper_open_virtio_port(char *channel, int mode)
 {
 	struct dirent **list;
 	struct dirent *dir;
@@ -707,11 +700,13 @@ int hyper_open_channel(char *channel, int mode)
 	return fd;
 }
 
-int hyper_insmod(char *module)
+int hyper_open_channel(char *channel, int mode, bool is_serial)
 {
-	return 0;
+	if (is_serial)
+		return hyper_open_serial(channel, mode);
+
+	return hyper_open_virtio_port(channel, mode);
 }
-#endif
 
 int hyper_setfd_cloexec(int fd)
 {

src/util.h

@@ -21,7 +21,6 @@ struct env;
 #define dbg_pr(fd, fmt, ...) do { } while (0)
 #endif
 
-char *read_cmdline(void);
 int hyper_setup_env(struct env *envs, int num, bool setPATH);
 int hyper_find_sd(char *addr, char **dev);
 int hyper_list_dir(char *path);
@@ -35,7 +34,7 @@ void hyper_filize(char *hyper_path);
 int hyper_mkdir(char *path, mode_t mode);
 int hyper_mkdir_at(const char *root, char *path, int size);
 int hyper_write_file(const char *path, const char *value, size_t len);
-int hyper_open_channel(char *channel, int mode);
+int hyper_open_channel(char *channel, int mode, bool is_serail);
 int hyper_setfd_cloexec(int fd);
 int hyper_setfd_block(int fd);
 int hyper_setfd_nonblock(int fd);