search for: add_cmdline_shell_unquot

...340,6 @@ launch_appliance (guestfs_h *g, const char *arg) guestfs___drive_name (g->nr_drives, &appliance_dev[7]); } - if (STRNEQ (QEMU_OPTIONS, "")) { - /* Add the extra options for the qemu command line specified - * at configure time. - */ - add_cmdline_shell_unquoted (g, QEMU_OPTIONS); - } - /* The qemu -machine option (added 2010-12) is a bit more sane * since it falls back through various different acceleration * modes, so try that first (thanks Markus Armbruster). @@ -471,6 +457,23 @@ launch_appliance (guestfs_h *g, const char *arg)...

...scsi (guestfs_h *g, struct backend_direct_data *); static char *qemu_escape_param (guestfs_h *g, const char *param); +#ifdef QEMU_OPTIONS /* Like 'add_cmdline' but allowing a shell-quoted string of zero or * more options. XXX The unquoting is not very clever. */ @@ -156,6 +157,7 @@ add_cmdline_shell_unquoted (guestfs_h *g, struct stringsbuf *sb, options = nextp; } } +#endif /* defined QEMU_OPTIONS */ /* On Debian, /dev/kvm is mode 0660 and group kvm, so users need to * add themselves to the kvm group otherwise things are going to be @@ -587,8 +589,10 @@ launch_direct (guestfs_h *g, void...

These assorted patches end up with adding virtio-scsi support to libguestfs. It passes libguestfs-test-tool, but I haven't yet tried to run the full set of tests. In theory > 26 devices can be added, but it's likely that certain parts of the daemon will break if you actually try this. This of course needs to be fixed. Thanks Paolo Bonzini for invaluable help. Rich.

Currently we have an OCaml library for generating the qemu command line (used only by ‘virt-v2v -o qemu’). However we also generate a qemu command line in ‘lib/launch-direct.c’, and we might in future need to generate a ‘-readconfig’-compatible configuration file if we want to go beyond 10,000 drives for scalability testing. Therefore this patch series reimplements the qemu command line code as

More comprehensive support for virtio-scsi. Passes all the tests. Rich.

This preliminary patch series adds a libvirt backend to libguestfs. It's for review only because although it launches the guest OK, there are some missing features that need to be implemented. The meat of the patch is in part 4/4. To save you the trouble of interpreting libxml2 fragments, an example of the generated XML and the corresponding qemu command line are attached below. Note the

I've been taking a long hard look at the protocol layer. It has evolved over a long time without any particular direction, and the result is, to say the least, not very organized. These patches take a first step at cleaning up the mess by abstracting out socket operations from the rest of the code. The purpose of this is to allow us to slot in a different connection layer under the

...char *basename, uint64_t max_size) + const char *filename, + const char *basename, uint64_t max_size) { char *r; int fd; diff --git a/src/launch-direct.c b/src/launch-direct.c index 2ffbff1..7540c19 100644 --- a/src/launch-direct.c +++ b/src/launch-direct.c @@ -156,7 +156,7 @@ add_cmdline_shell_unquoted (guestfs_h *g, struct stringsbuf *sb, nextp++; guestfs_int_add_string_nodup (g, sb, - safe_strndup (g, startp, endp-startp)); + safe_strndup (g, startp, endp-startp)); options = nextp; } @@ -215,10 +215,10 @@ debian_kvm_warning (guestfs_...

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.