search for: guestfwd_addr

...-------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/guestfs.c b/src/guestfs.c index 069de45..c735c1c 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -86,7 +86,7 @@ static void close_handles (void); /* Also in guestfsd.c */ #define GUESTFWD_PORT 6666 -//#define GUESTFWD_ADDR "10.0.2.4" +#define GUESTFWD_ADDR "10.0.2.4" /* GuestFS handle and connection. */ enum state { CONFIG, LAUNCHING, READY, BUSY, NO_HANDLE }; @@ -983,7 +983,7 @@ guestfs__launch (guestfs_h *g) } if (r == 0) { /* Child (qemu). */ - char vmchannel[256]; + char bu...

...mon/guestfsd.c index af554bf..ebaf960 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -43,8 +43,8 @@ static void usage (void); /* Also in guestfs.c */ -#define VMCHANNEL_PORT "6666" -#define VMCHANNEL_ADDR "10.0.2.4" +#define GUESTFWD_PORT "6666" +#define GUESTFWD_ADDR "10.0.2.4" int verbose = 0; @@ -67,18 +67,14 @@ int sysroot_len = 8; int main (int argc, char *argv[]) { - static const char *options = "fh:p:?"; + static const char *options = "f?"; static const struct option long_options[] = { { "foreground&quo...

Couple of notes: (1) You may need to 'make clean' after applying this patch. There is some missing dep so it seems the appliance isn't fully rebuilt. (2) [Comment mainly directed to Matt] This is not a candidate to be automatically added to the stable 1.2 branch. It's far too large of a change for a stable release. Since this change may be required for V2V, please clone

This attempts to implement the idea proposed in https://www.redhat.com/archives/libguestfs/2010-April/msg00087.html The idea is that an externally managed QEMU (manual, or via libvirt) can boot the appliance kernel/initrd. libguestfs can then be just told of the UNIX domain socket associated with the guest daemon. An example based on guestfish. 1. Step one, find the appliance kernel/initrd

...up (p + 4, len); if (!vmchannel) { perror ("strndup"); - exit (1); + exit (EXIT_FAILURE); } memcpy (vmchannel, "tcp:", 4); } @@ -216,7 +216,7 @@ main (int argc, char *argv[]) vmchannel = strdup ("tcp:" GUESTFWD_ADDR ":" GUESTFWD_PORT); if (!vmchannel) { perror ("strdup"); - exit (1); + exit (EXIT_FAILURE); } } @@ -241,7 +241,7 @@ main (int argc, char *argv[]) } else { fprintf (stderr, "vmchannel: expecting \"tcp:<ip>:<port>\&q...