summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* avoid use of all ctype macrosJim Meyering2009-09-242-7/+7
| | | | | | | | | | | | | | | | | | | | * cfg.mk (disable_temporarily): Don't disable sc_avoid_ctype_macros. * fish/tilde.c: Remove unnecessary inclusion of ctype.h. * bootstrap: Add gnulib's c-ctype module to the list. * daemon/m4/gnulib-cache.m4: Likewise. * daemon/ext2.c: Include "c-ctype.h", not <ctype.h>. Use c_isspace, etc, rather than isspace. * daemon/guestfsd.c: Likewise. * daemon/lvm.c: Likewise. * daemon/proto.c: Likewise. * fish/fish.c: Likewise. * fish/tilde.c: Likewise. * src/generator.ml: Likewise. * src/guestfs.c: Likewise. * examples/to-xml.c: Likewise. * examples/Makefile.am (to_xml_CPPFLAGS): Add -I$(top_srcdir)/gnulib/lib so inclusion of "c-ctype.h" works. (to_xml_CPPFLAGS): Rename from to_xml_CFLAGS.
* maint: use spaces, not TABs for indentationJim Meyering2009-09-241-24/+24
| | | | | | | | "make syntax-check" was failing. This fixes it. * HACKING: Indent with spaces, not TABs. * configure.ac: Likewise. * rescue/virt-rescue: Likewise. * src/generator.ml: Likewise.
* Add direct appliance mode flag and implementation.Richard Jones2009-09-232-33/+94
| | | | | | | | When the g->direct flag is set, the appliance stdin/stdout are not connected to the library. Instead they inherit the stdin/stdout of the caller. This is used to implement virt-rescue.
* Change handling of spaces on Linux kernel command line.Richard Jones2009-09-221-8/+8
|
* Implement "null vmchannel" - no vmchannel needed!Richard Jones2009-09-221-64/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the requirement for vmchannel, although retaining support for it. In this configuration, known as "null vmchannel", the library listens on a random loopback port. It passes the number of this port to the appliance (guestfs_vmchannel=tcp:10.0.2.2:12345), and the daemon then connects back. The library, instead of connecting, listens and accepts the connection during guestfs_launch. QEMU SLIRP (user mode networking) is still required to make this work: SLIRP forwards the TCP connection transparently (instead of explicitly as with guestfwd) to 127.0.0.1:<port> There is a window in which any other local process on the machine could see the port number in the qemu command line and try to connect to it. This would be a devastating security hole, because any local process could pretend to be the daemon and feed back malicious replies to our remote procedure calls. To prevent this, we check the UID of the other side of the TCP connection. If the UID is different from the library's EUID, then we reject the connection. To do this we have to parse /proc/net/tcp. (On Solaris we could use getsockopt (SO_PEERCRED), but this doesn't work on Linux TCP sockets). Other vmchannel(s) are still supported. This is important, because we can't in general be sure the qemu will always support SLIRP. In particular, in recent versions of qemu it is possible to compile out SLIRP.
* Flexible guestfs_vmchannel parameter for future appliances.Richard Jones2009-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | This reimplements parts of commit da0a4f8d1f6ddd302ceba028d87c6e009589e503 in a different, but compatible way. We pass guestfs_vmchannel=tcp:<ip>:<port> on the command line. This is intended to be used as follows (now and in future versions): tcp:10.0.2.4:6666 for guestfwd vmchannel tcp:10.0.2.2:<port> for future "no vmchannel" implementation /dev/vcon4 for future virtio-console vmchannel* It also accepts the old-style guestfs=10.0.2.4:6666 parameter which is sent by older libraries, and turns this transparently into the correct format above. If no guestfs_vmchannel is passed, then this defaults to the guestfwd vmchannel which older libraries would expect. * Maybe this last one should be dev:/dev/vcon4 or file:/dev/vcon4, but we don't need to decide that now.
* Make GUESTFWD_PORT into a string.Richard Jones2009-09-211-4/+4
|
* Remove unnecessary extra space from qemu command line.Richard Jones2009-09-211-1/+1
|
* Remove guestfs_wait_ready (turn it into a no-op).Richard Jones2009-09-212-49/+41
| | | | | | | | | | | | | | This commit changes guestfs_launch so that it both launches the appliance and waits until it is ready (ie. the daemon communicates back to us). Since we removed the pretence that we could implement a low-level asynchronous API, the need to call launch() followed by wait_ready() has looked a bit silly. Now guestfs_wait_ready() is basically a no-op. It is left in the API for backwards compatibility. Any calls to guestfs_wait_ready() can be removed from client code.
* Combine temporary buffers.Richard Jones2009-09-211-7/+5
| | | | | | | buf[], append[] and memsize_str[] were all temporary buffers used in non-overlapping code. Combine them to use a single buffer (buf[]).
* Rearrange qemu command line order (no functional change).Richard Jones2009-09-211-29/+30
|
* Enable new-style -chardev ... guestfwd command line.Richard Jones2009-09-181-20/+26
| | | | | | | | | | | | Newer versions of qemu have changed the command line format (again). '-net channel' is now deprecated. Instead we use: -chardev socket,id=guestfsvmc,path=/path/to/sock,server,nowait -net user,vlan=0,net=10.0.2.0/8,guestfwd=tcp:10.0.2.4:6666-chardev:guestfsvmc -net nic,model=ne2k_pci,vlan=0 The old style format is still used if the new style is not detected at runtime.
* Remove explicit guestfs=10.0.2.4:6666 kernel command line parameter.Richard Jones2009-09-171-6/+4
| | | | | | | | | | Since we control the appliance tightly, we can just specify that it will always use a particular host and port, and we don't need to pass it on the command line each time. Also the VMCHANNEL_* constants are only relevant to the particular guestfwd vmchannel implementation, so we rename them as GUESTFWD_*.
* Fix verbose packet dumping functions.Richard Jones2009-09-171-7/+7
| | | | | | | | | | Add the configure parameter --enable-packet-dump so that this code can be enabled without editing the source. This code is normally commented out, because it is too verbose unless you happen to be debugging the underlying protocol. Because it is normally commented out, I found it had bit-rotted slightly. This commit also fixes the obvious problems.
* Fix comparison between signed and unsigned (for RHEL 5).1.0.69Richard Jones2009-09-151-1/+1
|
* Move guestfs-internal-actions.h to EXTRA_DIST.Richard Jones2009-09-141-2/+2
|
* Remove main loop.Richard Jones2009-09-143-1082/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the external main loop, which never worked and caused a number of bugs. Requests are now done synchronously, and if the user wants to have requests issued in the background or to have a responsive GUI, then they'll just have to use threads. The big change is to push all reads and writes through two functions called send_to_daemon (for writes) and recv_from_daemon (for reads) which operate synchronously. These functions read/write whole messages, and also handle checking for EOF (ie. daemon died) and asynchronous log message events from qemu (eg. from debug / dmesg printed by the guest). A more complete description of how these work can be found in the code. This code passes a complete run of the tests. Bugs believed to be fixed by this commit: https://bugzilla.redhat.com/show_bug.cgi?id=501888 internal error: reply callback called twice https://bugzilla.redhat.com/show_bug.cgi?id=504418 In virt-inspector: "download: guestfs_download reply failed, see earlier error messages" I have tried to avoid reintroducing this: https://bugzilla.redhat.com/show_bug.cgi?id=508713 libguestfs: error: write: Broken pipe (guestfish only) One other benefit of this is that 'set_busy/end_busy' calls no longer appear in traces.
* Don't enable trace in set_trace test.Richard Jones2009-09-141-2/+2
| | | | | This leaves trace enabled afterwards, resulting in some ugly test messages.
* guestfish: Enable grouping in string listsMatthew Booth2009-09-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | This change adds the ability to group entries in a string list with single quotes. So the string: "'foo bar'" becomes 1 token rather than 2. Consequently single quotes must now be escaped: "\'" resolves to a literal single quote. Incidentally, this change also alters another, probably unintentional behaviour of the previous implementation, in that tokens are separated by any amount of whitespace rather than a single whitespace character. I.e.: "a b" resolves to: 'a' 'b' rather than: 'a' '' 'b' That last syntax can be used if an empty argument is still desired. Whitespace is now also defined to include tabs. parse_string_list can also now fail if it contains an unmatched open quote.
* Add command trace functionality.Richard Jones2009-09-142-0/+91
| | | | | Enable this by calling guestfs_trace (handle, 1) or by setting the LIBGUESTFS_TRACE=1 environment variable.
* Non-daemon actions indirect through generated code.Richard Jones2009-09-143-35/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously non-daemon actions were called directly by user code, eg: /* Non-generated */ int guestfs_set_verbose (guestfs_h *g, int v) { g->verbose = !!v; return 0; } This changes these actions so they go indirectly via some generated code, eg: /* Generated */ int guestfs_set_verbose (guestfs_h *g, int verbose) { return guestfs__set_verbose (g, verbose); } /* Non-generated */ int guestfs__set_verbose (guestfs_h *g, int v) { g->verbose = !!v; return 0; } The aim is to have a place in the generated code where we can add debug or tracing information for these non- daemon calls.
* Add echo_daemon commandMatthew Booth2009-09-142-1/+14
| | | | | echo_daemon is a simple echo which can be used to test connectivity between the client and daemon.
* generator.ml: Fix string list memory leakMatthew Booth2009-09-111-1/+10
| | | | Parsed string lists are allocated by malloc, but were never freed.
* maint: guestfs.c: avoid warning about possible NULL deref from llvm/clangJim Meyering2009-08-311-1/+1
| | | | * src/guestfs.h (guestfs_abort_cb): Declare with attribute noreturn.
* maint: guestfs.c: remove unnecessary initializationJim Meyering2009-08-311-1/+1
| | | | | * src/guestfs.c (guestfs__receive_file_sync): Don't set "r", only to ignore it.
* generator.ml: avoid a warning about signed overflow in tests.cJim Meyering2009-08-281-4/+4
| | | | | | * src/generator.ml: Emit "unsigned long int n_failed;" rather than "int failed;", to avoid warning from gcc about "assuming signed overflow does not occur when simplifying conditional to constant".
* generator.ml: avoid defined-but-not-used warnings in guestfs_c_actions.cJim Meyering2009-08-281-21/+32
| | | | | * src/generator.ml (emit_ocaml_copy_list_function): New function. Emit a function definition only if it will be used.
* generator.ml: avoid warnings in generated ocaml/guestfs_c_actions.cJim Meyering2009-08-281-0/+7
| | | | | | | | | * src/generator.ml: Emit prototypes for ocaml_guestfs_* functions, to avoid warnings from gcc -Wmissing-prototypes. Normally we'd put these somewhere else, but in this unusual case, they're not needed anywhere else. Handle the >5-argument case, too, for these: ocaml_guestfs_test0_byte, ocaml_guestfs_sfdisk_byte, ocaml_guestfs_sfdisk_N_byte.
* build: don't define _GNU_SOURCE manuallyJim Meyering2009-08-241-1/+0
| | | | | | | | | | | | Now that we're using gnulib in earnest, any manual definition would provoke a redefinition warning. * fish/fish.c (_GNU_SOURCE): Don't define. * fish/destpaths.c (_GNU_SOURCE): Likewise. * src/guestfs.c (_GNU_SOURCE): Likewise. * bootstrap (modules): Add asprintf, strchrnul, strerror, strndup and vasprintf. * fish/fish.c (main): Set argv[0] to sanitized program_name, so functions like getopt_long that use argv[0] use the clean name.
* Add waitpid along guestfs_close path (RHBZ#518747).Richard Jones2009-08-221-0/+4
|
* generator.ml: avoid signed/unsigned-comparison warning in fish/cmds.cJim Meyering2009-08-211-2/+2
| | | | | | * src/generator.ml (emit_print_list_function): Emit code that doesn't evoke warnings. s/int/unsigned int/ (emit print_*_indent): Likewise, s/int/unsigned int/
* tests: namemax on ISO devices is 2551.0.68Richard Jones2009-08-191-1/+1
| | | | Was 256 for the old squashfs device.
* tests: Use ISO instead of squashfs.Richard Jones2009-08-191-67/+67
| | | | | The squashfs format changes too much. Use an ISO file for the tests instead.
* tests: modprobe fat instead of ext2 module.Richard W.M. Jones2009-08-191-1/+1
| | | | | | | On RHEL 5, ext2 is compiled into the kernel, so trying to modprobe it will fail. I've checked that fat.ko is always a module on the platforms we care about (RHEL 5, Fedora 11, Debian), so use that to test instead.
* avoid build failure due to Haskell keyword clashJim Meyering2009-08-191-3/+32
| | | | | | | | * src/generator.ml: Fix this particular problem by renaming the "module" parameter to "modulename". Avoid the general problem by ensuring that no parameter name is in the set of nearly all Haskell, OCaml and C reserved words. (zfile): Adjust one more offender: s/method/meth/.
* guestfs_launch: Correct checks for dup failure.Richard Jones2009-08-191-7/+7
|
* build: Comment out some unused macros.Richard Jones2009-08-192-6/+6
| | | | | GCC 4.4.1 warns about some unused macros. Comment these out while they are not used.
* build: new configure-time option: --enable-gcc-warningsJim Meyering2009-08-181-1/+3
| | | | | * configure.ac: Define/configure it. * src/Makefile.am: Use new variables.
* suppress warnings from -Wmissing-noreturnJim Meyering2009-08-181-0/+2
| | | | | | | Even though these functions are marked as "not implemented yet", and they will surely return a value once implemented, ... * src/guestfs.c (select_add_timeout): Declare with noreturn attribute. (select_remove_timeout): Likewise.
* suppress a warning from -Wswitch-defaultJim Meyering2009-08-181-0/+2
| | | | * src/guestfs.c (guestfs_end_busy): Add a "default:" label.
* suppress signed/unsigned-comparison warningsJim Meyering2009-08-181-2/+2
| | | | | * src/guestfs.c [struct guestfs_h] (msg_in_size, msg_in_allocated): (msg_out_size, msg_out_allocated): Change type from int to unsigned int.
* build: don't perform arithmetic on void* pointersJim Meyering2009-08-181-3/+5
| | | | * src/guestfs.c (receive_file_data_sync, xread, xwrite): Use char*.
* generator.ml: suppress signed/unsigned-compare warningsJim Meyering2009-08-181-1/+1
| | | | | * src/generator.ml (check_reply_header): Emit parameter declarations that are unsigned, so as to avoid signed/unsigned-compare warnings.
* build: suppress an ignored-dup-return-value warningJim Meyering2009-08-181-2/+9
| | | | * src/guestfs.c (guestfs_launch): Handle dup failure.
* build: suppress an ignored-write-return-value warningJim Meyering2009-08-182-2/+5
| | | | | | | | | * bootstrap (modules): Add ignore-value. * src/guestfs.c: Include "ignore-value.h". (stdout_event): Ignore failure to write to stderr. Also, prefer STDERR_FILENO over the literal "2". * src/Makefile.am (libguestfs_la_CPPFLAGS): Include gnulib's .h files. (libprotocol_la_CFLAGS): Remove -Wall -Wno-unused.
* New 'modprobe' command.Matthew Booth2009-08-182-1/+10
| | | | Allow kernel modules to be loaded into the appliance.
* generator: Small code rearrangement.Richard Jones2009-08-181-3/+5
| | | | Move code which updates pod2text memo file into a separate function.
* generator.ml: do not emit unused print_* functionsJim Meyering2009-08-181-5/+12
| | | | | * src/generator.ml: Do not emit functions like print_xattr, print_lvm_vg, print_inotify_event, that are not used.
* generator.ml: do not emit unused print_*_list functionsJim Meyering2009-08-181-12/+24
| | | | | * src/generator.ml (emit_print_list_function): New function. Emit a function definition only if it will be used.
* generator.ml: avoid warnings in generated tests.cJim Meyering2009-08-181-4/+4
| | | | | | | | | * src/generator.ml: Avoid warnings in generated tests.c, regarding print_strings, and in exercising any function that takes a StringList or DeviceList parameter. (print_strings): Change param type to "char *const *s". Declare fully-const initializer for each list-taking function use. Cast *List argument to "(char **)".