git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Flexible guestfs_vmchannel parameter for future appliances.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
55732f9
..
ec7473e
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-984,6
+984,7
@@
guestfs__launch (guestfs_h *g)
if (r == 0) { /* Child (qemu). */
char buf[256];
if (r == 0) { /* Child (qemu). */
char buf[256];
+ const char *vmchannel = NULL;
/* Set up the full command line. Do this in the subprocess so we
* don't need to worry about cleaning up.
/* Set up the full command line. Do this in the subprocess so we
* don't need to worry about cleaning up.
@@
-1045,6
+1046,7
@@
guestfs__launch (guestfs_h *g)
}
add_cmdline (g, "-net");
add_cmdline (g, "nic,model=" NET_IF ",vlan=0");
}
add_cmdline (g, "-net");
add_cmdline (g, "nic,model=" NET_IF ",vlan=0");
+ vmchannel = "guestfs_vmchannel=tcp:" GUESTFWD_ADDR ":" GUESTFWD_PORT " ";
#define LINUX_CMDLINE \
"panic=1 " /* force kernel to panic if daemon exits */ \
#define LINUX_CMDLINE \
"panic=1 " /* force kernel to panic if daemon exits */ \
@@
-1058,9
+1060,11
@@
guestfs__launch (guestfs_h *g)
snprintf (buf, sizeof buf,
LINUX_CMDLINE
"%s" /* (selinux) */
snprintf (buf, sizeof buf,
LINUX_CMDLINE
"%s" /* (selinux) */
+ "%s" /* (vmchannel) */
"%s" /* (verbose) */
"%s", /* (append) */
g->selinux ? "selinux=1 enforcing=0 " : "selinux=0 ",
"%s" /* (verbose) */
"%s", /* (append) */
g->selinux ? "selinux=1 enforcing=0 " : "selinux=0 ",
+ vmchannel ? vmchannel : "",
g->verbose ? "guestfs_verbose=1 " : "",
g->append ? g->append : "");
g->verbose ? "guestfs_verbose=1 " : "",
g->append ? g->append : "");