diff --git a/src/exec.c b/src/exec.c index b1f078f..029e482 100644 --- a/src/exec.c +++ b/src/exec.c @@ -555,7 +555,7 @@ int hyper_release_exec(struct hyper_exec *exec, } else { /* send out pod finish message, hyper will decide if restart pod or not */ - hyper_send_finish(pod); + hyper_send_pod_finished(pod); } hyper_cleanup_pod(pod); diff --git a/src/hyper.h b/src/hyper.h index 083867f..1a82276 100644 --- a/src/hyper.h +++ b/src/hyper.h @@ -17,13 +17,13 @@ enum { DESTROYPOD, RESTARTCONTAINER, EXECCMD, - FINISHCMD, + CMDFINISHED, READY, ACK, ERROR, WINSIZE, PING, - FINISH, + PODFINISHED, NEXT, WRITEFILE, READFILE, diff --git a/src/util.c b/src/util.c index 5223e36..225375e 100644 --- a/src/util.c +++ b/src/util.c @@ -384,7 +384,7 @@ void hyper_unmount_all(void) sync(); } -int hyper_send_finish(struct hyper_pod *pod) +int hyper_send_pod_finished(struct hyper_pod *pod) { int ret = -1; struct hyper_container *c; @@ -401,7 +401,7 @@ int hyper_send_finish(struct hyper_pod *pod) data = new; } - ret = hyper_send_msg(ctl.chan.fd, FINISH, c_num * 4, data); + ret = hyper_send_msg(ctl.chan.fd, PODFINISHED, c_num * 4, data); out: free(data); return ret; @@ -409,7 +409,7 @@ out: void hyper_shutdown(struct hyper_pod *pod) { - hyper_send_finish(pod); + hyper_send_pod_finished(pod); /* vm will shutdown immediately after we call reboot, * no chance to send out eof message in release exec. * send it out by ourself */ diff --git a/src/util.h b/src/util.h index c285a9d..5087d2f 100644 --- a/src/util.h +++ b/src/util.h @@ -25,7 +25,7 @@ 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(struct hyper_pod *pod); -int hyper_send_finish(struct hyper_pod *pod); +int hyper_send_pod_finished(struct hyper_pod *pod); void hyper_unmount_all(void); int hyper_insmod(char *module); #endif