[Qemu-devel] [PATCH 6/6] migration-local: replace send_pipefd with qemu_send_with_fd

[Lei Li]

Signed-off-by: Lei Li <address@hidden>
---
 migration-local.c |   52 +++-------------------------------------------------
 1 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/migration-local.c b/migration-local.c
index ce4c070..c01ba06 100644
--- a/migration-local.c
+++ b/migration-local.c
@@ -26,6 +26,7 @@
 #include "sysemu/sysemu.h"
 #include "block/block.h"
 #include "qemu/sockets.h"
+#include "qemu/fd-exchange.h"
 #include "migration/block.h"
 #include "qemu/thread.h"
 #include "qmp-commands.h"
@@ -169,8 +170,6 @@ static int qemu_local_close(void *opaque)
     return 0;
 }
 
-static int send_pipefd(int sockfd, int pipefd);
-
 static size_t qemu_local_save_ram(QEMUFile *f, void *opaque,
                                   MemoryRegion *mr, ram_addr_t offset,
                                   size_t size, int *bytes_sent)
@@ -179,13 +178,14 @@ static size_t qemu_local_save_ram(QEMUFile *f, void 
*opaque,
     ram_addr_t current_addr = mr->ram_addr + offset;
     void *ram_addr;
     ssize_t ret;
+    char req[1] = { 0x01 };
 
     if (s->unix_page_flipping) {
         qemu_put_be64(s->file, current_addr | RAM_SAVE_FLAG_HOOK);
         qemu_fflush(s->file);
 
         if (!s->pipefd_passed) {
-            ret = send_pipefd(s->sockfd, s->pipefd[0]);
+            ret = qemu_send_with_fd(s->sockfd, s->pipefd[0], &req, 
sizeof(req));
             if (ret < 0) {
                 fprintf(stderr, "failed to pass PIPE\n");
                 return ret;
@@ -342,49 +342,3 @@ fail:
     g_free(s);
     return NULL;
 }
-
-
-/*
- * Pass a pipe file descriptor to another process.
- *
- * Return negative value If pipefd < 0. Return 0 on
- * success.
- *
- */
-static int send_pipefd(int sockfd, int pipefd)
-{
-    struct msghdr msg;
-    struct iovec iov[1];
-    ssize_t ret;
-    char req[1] = { 0x01 };
-
-    union {
-      struct cmsghdr cm;
-      char control[CMSG_SPACE(sizeof(int))];
-    } control_un;
-    struct cmsghdr *cmptr;
-
-    msg.msg_control = control_un.control;
-    msg.msg_controllen = sizeof(control_un.control);
-
-    cmptr = CMSG_FIRSTHDR(&msg);
-    cmptr->cmsg_len = CMSG_LEN(sizeof(int));
-    cmptr->cmsg_level = SOL_SOCKET;
-    cmptr->cmsg_type = SCM_RIGHTS;
-    *((int *) CMSG_DATA(cmptr)) = pipefd;
-
-    msg.msg_name = NULL;
-    msg.msg_namelen = 0;
-
-    iov[0].iov_base = req;
-    iov[0].iov_len = sizeof(req);
-    msg.msg_iov = iov;
-    msg.msg_iovlen = 1;
-
-    ret = sendmsg(sockfd, &msg, 0);
-    if (ret <= 0) {
-        DPRINTF("sendmsg error: %s\n", strerror(errno));
-    }
-
-    return ret;
-}
-- 
1.7.7.6