Page MenuHomeFreeBSD
Files F142448449

D34863.id105528.diff
No OneTemporary
Actions

D34863.id105528.diff
View Options

diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c
--- a/usr.sbin/bhyve/snapshot.c
+++ b/usr.sbin/bhyve/snapshot.c
@@ -1450,19 +1450,21 @@
void *
checkpoint_thread(void *param)
{
+ int fd;
struct checkpoint_thread_info *thread_info;
nvlist_t *nvl;
pthread_set_name_np(pthread_self(), "checkpoint thread");
thread_info = (struct checkpoint_thread_info *)param;
- for (;;) {
- nvl = nvlist_recv(thread_info->socket_fd, 0);
+ while ((fd = accept(thread_info->socket_fd, NULL, NULL)) != -1) {
+ nvl = nvlist_recv(fd, 0);
if (nvl != NULL)
handle_message(thread_info->ctx, nvl);
else
EPRINTLN("nvlist_recv() failed: %s", strerror(errno));
+ close(fd);
nvlist_destroy(nvl);
}
@@ -1515,7 +1517,7 @@
memset(&addr, 0, sizeof(addr));
- socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
+ socket_fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (socket_fd < 0) {
EPRINTLN("Socket creation failed: %s", strerror(errno));
err = -1;
@@ -1536,6 +1538,12 @@
goto fail;
}
+ if (listen(socket_fd, 10) < 0) {
+ EPRINTLN("ipc socket listen: %s\n", strerror(errno));
+ err = errno;
+ goto fail;
+ }
+
checkpoint_info = calloc(1, sizeof(*checkpoint_info));
checkpoint_info->ctx = ctx;
checkpoint_info->socket_fd = socket_fd;
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -1687,7 +1687,7 @@
struct sockaddr_un addr;
int err, socket_fd;
- socket_fd = socket(PF_UNIX, SOCK_DGRAM, 0);
+ socket_fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (socket_fd < 0) {
perror("Error creating bhyvectl socket");
err = -1;
@@ -1695,11 +1695,12 @@
}
memset(&addr, 0, sizeof(struct sockaddr_un));
+ snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s",
+ BHYVE_RUN_DIR, vmname);
addr.sun_family = AF_UNIX;
+ addr.sun_len = SUN_LEN(&addr);
- snprintf(addr.sun_path, sizeof(addr.sun_path), "%s%s", BHYVE_RUN_DIR, vmname);
-
- if (connect(socket_fd, (struct sockaddr *)&addr, SUN_LEN(&addr)) != 0) {
+ if (connect(socket_fd, (struct sockaddr *)&addr, addr.sun_len) != 0) {
perror("connect() failed");
err = errno;
goto done;

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 1:49 AM (17 m, 11 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27773661
Default Alt Text
D34863.id105528.diff (2 KB)

Event Timeline