diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-03-25 12:32:08 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-03-25 12:32:14 +0000 |
| commit | 110bfe1fcc9964b82acf7df6d4d60774471f9157 (patch) | |
| tree | 86d4274c6f2dfbad4062cef848ced23f6c68ad13 | |
| parent | 23b7c92b0dab43c6feaa137eaf46260f28cdc1f1 (diff) | |
| download | libguestfs-110bfe1fcc9964b82acf7df6d4d60774471f9157.tar.gz libguestfs-110bfe1fcc9964b82acf7df6d4d60774471f9157.tar.xz libguestfs-110bfe1fcc9964b82acf7df6d4d60774471f9157.zip | |
Rename $tmpdir/sock to $tmpdir/guestfsd.sock.
No functional change; this simply makes the purpose of the
socket clearer.
Notes
Notes:
Labels: cleanup
| -rw-r--r-- | src/guestfs.c | 2 | ||||
| -rw-r--r-- | src/launch.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/guestfs.c b/src/guestfs.c index 776214e4..9c4f22fa 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -217,7 +217,7 @@ guestfs_close (guestfs_h *g) /* Remove tmpfiles. */ if (g->tmpdir) { - snprintf (filename, sizeof filename, "%s/sock", g->tmpdir); + snprintf (filename, sizeof filename, "%s/guestfsd.sock", g->tmpdir); unlink (filename); rmdir (g->tmpdir); diff --git a/src/launch.c b/src/launch.c index 261136d5..8074d131 100644 --- a/src/launch.c +++ b/src/launch.c @@ -393,7 +393,7 @@ launch_appliance (guestfs_h *g) { int r; int wfd[2], rfd[2]; - char unixsock[256]; + char guestfsd_sock[256]; struct sockaddr_un addr; /* At present you must add drives before starting the appliance. In @@ -422,8 +422,8 @@ launch_appliance (guestfs_h *g) /* Using virtio-serial, we need to create a local Unix domain socket * for qemu to connect to. */ - snprintf (unixsock, sizeof unixsock, "%s/sock", g->tmpdir); - unlink (unixsock); + snprintf (guestfsd_sock, sizeof guestfsd_sock, "%s/guestfsd.sock", g->tmpdir); + unlink (guestfsd_sock); g->sock = socket (AF_UNIX, SOCK_STREAM, 0); if (g->sock == -1) { @@ -437,7 +437,7 @@ launch_appliance (guestfs_h *g) } addr.sun_family = AF_UNIX; - strncpy (addr.sun_path, unixsock, UNIX_PATH_MAX); + strncpy (addr.sun_path, guestfsd_sock, UNIX_PATH_MAX); addr.sun_path[UNIX_PATH_MAX-1] = '\0'; if (bind (g->sock, &addr, sizeof addr) == -1) { @@ -546,7 +546,7 @@ launch_appliance (guestfs_h *g) /* Set up virtio-serial for the communications channel. */ add_cmdline (g, "-chardev"); - snprintf (buf, sizeof buf, "socket,path=%s,id=channel0", unixsock); + snprintf (buf, sizeof buf, "socket,path=%s,id=channel0", guestfsd_sock); add_cmdline (g, buf); add_cmdline (g, "-device"); add_cmdline (g, "virtserialport,chardev=channel0,name=org.libguestfs.channel.0"); |