search for: backing_dr

..."If the format is known, pass the format to libguestfs, eg. using the\n" + "'--format' option, or via the optional 'format' argument to 'add-drive'.")); + return NULL; +} + static char * make_qcow2_overlay (guestfs_h *g, const char *backing_drive, const char *format) @@ -169,6 +213,8 @@ make_qcow2_overlay (guestfs_h *g, const char *backing_drive, char *overlay; struct guestfs_disk_create_argv optargs; + assert (format != NULL); + if (guestfs_int_lazy_make_tmpdir (g) == -1) return NULL; @@ -176,10 +...

...rt.c b/lib/launch-libvirt.c > index 4adb2cfb3..030ea6911 100644 > --- a/lib/launch-libvirt.c > +++ b/lib/launch-libvirt.c > @@ -212,9 +212,10 @@ get_source_format_or_autodetect (guestfs_h *g, struct drive *drv) > > /** > * Create a qcow2 format overlay, with the given C<backing_drive> > - * (file). The C<format> parameter, which must be non-NULL, is the > - * backing file format. This is used to create the appliance overlay, > - * and also for read-only drives. > + * (file). The C<format> parameter is the backing file format. > + * The C<f...

...WRESTOOL " -x --type=2 --name=6801 "); diff --git a/lib/launch-direct.c b/lib/launch-direct.c index 00cb25077..87ac121c7 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -86,11 +86,10 @@ create_cow_overlay_direct (guestfs_h *g, void *datav, struct drive *drv) if (!backing_drive) return NULL; - if (guestfs_int_lazy_make_tmpdir (g) == -1) + overlay = guestfs_int_make_temp_path (g, "overlay", "qcow2"); + if (!overlay) return NULL; - overlay = safe_asprintf (g, "%s/overlay%d", g->tmpdir, ++g->unique); - optargs.bitma...

A lot of code runs 'qemu-img create' or 'truncate' to create blank disk images. In the past I resisted adding an API to do this, since it essentially duplicates what you can already do using other tools (ie. qemu-img). However this does simplify calling code quite a lot since qemu-img is somewhat error-prone to use (eg: don't try to create a disk called "foo:bar")

...ocation=%s", preallocation); backingformat is an optional parameter (controlled by ‘optargs->bitmask & GUESTFS_DISK_CREATE_BACKINGFORMAT_BITMASK’), so just don't pass it, rather than defining new API. Then ... > @@ -233,7 +232,7 @@ make_qcow2_overlay (guestfs_h *g, const char *backing_drive, > optargs.bitmask = GUESTFS_DISK_CREATE_BACKINGFILE_BITMASK; > optargs.backingfile = backing_drive; > optargs.bitmask |= GUESTFS_DISK_CREATE_BACKINGFORMAT_BITMASK; > - optargs.backingformat = format; > + optargs.backingformat = format ? format : AUTODETECTION_FORMAT;...

QEMU upstream has broken snapshot=on ... again. These two patches stop using it entirely. Instead we run 'qemu-img create' to create overlay disks as required. Note that the libvirt and UML backends were already doing this: The libvirt backend because <transient/> has never worked, and the UML backend was running uml_mkcow because the UML-equivalent syntax of snapshot=on was

v1 -> v2: - Remove the unnecessary calls to guestfs_int_lazy_make_tmpdir in the final patch. Rich.

Miscellaneous small cleanups in lib/ directory. Rich.

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.