git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix errno check in readdir in devsparts.c
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
64c327b
..
de63275
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-1081,7
+1081,7
@@
guestfs_launch (guestfs_h *g)
* http://git.savannah.gnu.org/cgit/qemu.git/commit/?id=c92ef6a22d3c71538fcc48fb61ad353f7ba03b62
*/
snprintf (vmchannel, sizeof vmchannel,
* http://git.savannah.gnu.org/cgit/qemu.git/commit/?id=c92ef6a22d3c71538fcc48fb61ad353f7ba03b62
*/
snprintf (vmchannel, sizeof vmchannel,
- "user,vlan=0,guestfwd=tcp:%s:%d-unix:%s,server,nowait",
+ "user,vlan=0,
net=10.0.2.0/8,
guestfwd=tcp:%s:%d-unix:%s,server,nowait",
VMCHANNEL_ADDR, VMCHANNEL_PORT, unixsock);
add_cmdline (g, "-net");
VMCHANNEL_ADDR, VMCHANNEL_PORT, unixsock);
add_cmdline (g, "-net");
@@
-1098,12
+1098,12
@@
guestfs_launch (guestfs_h *g)
add_cmdline (g, "-net");
add_cmdline (g, vmchannel);
add_cmdline (g, "-net");
add_cmdline (g, "-net");
add_cmdline (g, vmchannel);
add_cmdline (g, "-net");
- add_cmdline (g, "user,vlan=0");
+ add_cmdline (g, "user,vlan=0
,net=10.0.2.0/8
");
#if 0
}
#endif
add_cmdline (g, "-net");
#if 0
}
#endif
add_cmdline (g, "-net");
- add_cmdline (g, "nic,model=virtio,vlan=0");
+ add_cmdline (g, "nic,model=virtio,vlan=0");
/* model=ne2k_pci also works */
/* These options recommended by KVM developers to improve reliability. */
if (qemu_supports (g, "-no-hpet"))
/* These options recommended by KVM developers to improve reliability. */
if (qemu_supports (g, "-no-hpet"))