Version 1.21.27.

New APIs: Add support for syslinux and extlinux (bootloaders).
This also adds tests of SYSLINUX and EXTLINUX which create bootable guests.
2026-03-22 16:26:17 +00:00 · 2013-04-04 21:04:32 +01:00 · 2013-04-04 18:31:41 +01:00 · 2013-04-04 18:23:32 +01:00 · 2013-04-04 14:58:32 +01:00 · 2013-04-04 14:58:32 +01:00
766 changed files with 233260 additions and 76477 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@
 *.cmxa
 *.diff
 *.eml
+*.gcda
+*.gcno
+*.gcov
 *.hi
 *.jar
 *.la
@@ -22,10 +25,11 @@
 bindtests.tmp
 cscope.out
 .deps
+.gdb_history
+gmon.out
 .libs
 Makefile
 Makefile.in
-pod2htm?.tmp

 /ABOUT-NLS
 /aclocal.m4
@@ -41,6 +45,15 @@ pod2htm?.tmp
 /appliance/stamp-supermin
 /appliance/supermin.d
 /autom4te.cache
+/bash/virt-cat
+/bash/virt-df
+/bash/virt-edit
+/bash/virt-filesystems
+/bash/virt-format
+/bash/virt-inspector
+/bash/virt-ls
+/bash/virt-sysprep
+/bash/virt-sparsify
 /build-aux
 /cat/stamp-virt-*.pod
 /cat/virt-cat
@@ -51,6 +64,7 @@ pod2htm?.tmp
 /cat/virt-ls.1
 /ChangeLog
 /compile
+/config.cache
 /config.guess
 /config.h
 /config.h.in
@@ -61,10 +75,11 @@ pod2htm?.tmp
 /csharp/Libguestfs.cs
 /daemon/actions.h
 /daemon/errnostring.c
-/daemon/errnostring_gperf.c
-/daemon/errnostring_gperf.gperf
+/daemon/errnostring-gperf.c
+/daemon/errnostring-gperf.gperf
 /daemon/errnostring.h
 /daemon/guestfsd
+/daemon/guestfsd.8
 /daemon/guestfsd.exe
 /daemon/guestfs_protocol.c
 /daemon/guestfs_protocol.h
@@ -73,6 +88,7 @@ pod2htm?.tmp
 /daemon/names.c
 /daemon/optgroups.c
 /daemon/optgroups.h
+/daemon/stamp-guestfsd.pod
 /daemon/stubs.c
 /depcomp
 /df/stamp-virt-df.pod
@@ -81,22 +97,25 @@ pod2htm?.tmp
 /edit/stamp-virt-*.pod
 /edit/virt-edit
 /edit/virt-edit.1
+/erlang/bindtests.erl
 /erlang/erl-guestfs
 /erlang/erl-guestfs.c
 /erlang/examples/guestfs-erlang.3
 /erlang/examples/stamp-guestfs-erlang.pod
 /erlang/guestfs.beam
 /erlang/guestfs.erl
-/examples/copy_over
-/examples/create_disk
-/examples/display_icon
+/erlang/test.img
+/examples/copy-over
+/examples/create-disk
+/examples/display-icon
 /examples/guestfs-examples.3
 /examples/guestfs-faq.1
 /examples/guestfs-performance.1
 /examples/guestfs-recipes.1
 /examples/guestfs-testing.1
-/examples/inspect_vm
-/examples/mount_local
+/examples/inspect-vm
+/examples/libvirt-auth
+/examples/mount-local
 /examples/stamp-guestfs-examples.pod
 /examples/stamp-guestfs-faq.pod
 /examples/stamp-guestfs-performance.pod
@@ -104,8 +123,8 @@ pod2htm?.tmp
 /examples/stamp-guestfs-testing.pod
 /examples/virt-dhcp-address
 /fish/cmds.c
-/fish/cmds_gperf.c
-/fish/cmds_gperf.gperf
+/fish/cmds-gperf.c
+/fish/cmds-gperf.gperf
 /fish/completion.c
 /fish/event-names.c
 /fish/fish-cmds.h
@@ -131,7 +150,11 @@ pod2htm?.tmp
 /format/virt-format.1
 /fuse/guestmount
 /fuse/guestmount.1
+/fuse/guestunmount
+/fuse/guestunmount.1
 /fuse/stamp-guestmount.pod
+/fuse/stamp-guestunmount.pod
+/fuse/test-guestunmount-fd
 /generator/.depend
 /generator/files-generated.txt
 /generator/generator
@@ -146,13 +169,13 @@ pod2htm?.tmp
 /gobject/Guestfs-1.0.typelib
 /gobject/guestfs-gobject*.c
 /gobject/guestfs-gobject*.h
-/.guestfs-*
-/guestfs.*
+/guestfs-release-notes.1
 /guestfsd-in-wine.log
 /haskell/Bindtests
 /haskell/Bindtests.hs
-/haskell/Guestfs005Load
-/haskell/Guestfs010Basic
+/haskell/Guestfs010Load
+/haskell/Guestfs030Config
+/haskell/Guestfs050LVCreate
 /haskell/Guestfs.hs
 /html/guestfish.1.html
 /html/guestfs.3.html
@@ -160,14 +183,18 @@ pod2htm?.tmp
 /html/guestfs-examples.3.html
 /html/guestfs-faq.1.html
 /html/guestfs-java.3.html
+/html/guestfs-lua.3.html
 /html/guestfs-ocaml.3.html
 /html/guestfs-performance.1.html
 /html/guestfs-perl.3.html
 /html/guestfs-python.3.html
 /html/guestfs-recipes.1.html
+/html/guestfs-release-notes.1.html
 /html/guestfs-ruby.3.html
 /html/guestfs-testing.1.html
+/html/guestfsd.8.html
 /html/guestmount.1.html
+/html/guestunmount.1.html
 /html/libguestfs-make-fixed-appliance.1.html
 /html/libguestfs-test-tool.1.html
 /html/virt-alignment-scan.1.html
@@ -192,6 +219,7 @@ pod2htm?.tmp
 /html/virt-tar-out.1.html
 /html/virt-win-reg.1.html
 /inspector/stamp-virt-inspector.pod
+/inspector/test-xmllint.sh
 /inspector/virt-inspector
 /inspector/virt-inspector.1
 /install-sh
@@ -208,6 +236,12 @@ pod2htm?.tmp
 /libtool
 /local*
 /ltmain.sh
+/lua/bindtests.lua
+/lua/examples/guestfs-lua.3
+/lua/examples/stamp-guestfs-lua.pod
+/lua/guestfs.so
+/lua/lua-guestfs.c
+/lua/test.img
 /m4/ChangeLog
 /m4/gnulib-cache.m4
 /m4/intmax.m4
@@ -227,13 +261,12 @@ pod2htm?.tmp
 /ocaml/examples/guestfs-ocaml.3
 /ocaml/examples/inspect_vm
 /ocaml/examples/stamp-guestfs-ocaml.pod
-/ocaml/guestfs_c_actions.c
-/ocaml/guestfs_inspector.ml
-/ocaml/guestfs_inspector.mli
+/ocaml/guestfs-c-actions.c
 /ocaml/guestfs.ml
 /ocaml/guestfs.mli
 /ocamlinit-stamp
 /ocaml/META
+/ocaml/stamp-mlguestfs
 /ocaml/t/guestfs_005_load.bc
 /ocaml/t/guestfs_005_load.opt
 /ocaml/t/guestfs_010_basic.bc
@@ -246,8 +279,8 @@ pod2htm?.tmp
 /ocaml/t/guestfs_400_events.opt
 /ocaml/t/guestfs_400_progress.bc
 /ocaml/t/guestfs_400_progress.opt
-/ocaml/t/guestfs_500_parallel_mount_local.bc
-/ocaml/t/guestfs_500_parallel_mount_local.opt
+/ocaml/t/guestfs_500_mount_local.bc
+/ocaml/t/guestfs_500_mount_local.opt
 /perl/bindtests.pl
 /perl/blib
 /perl/examples/guestfs-perl.3
@@ -275,6 +308,7 @@ pod2htm?.tmp
 /php/extension/config.sub
 /php/extension/configure
 /php/extension/configure.in
+/php/extension/env
 /php/extension/guestfs_php.c
 /php/extension/guestfs_php_*.diff
 /php/extension/guestfs_php_*.exp
@@ -294,13 +328,16 @@ pod2htm?.tmp
 /php/extension/php_guestfs_php.h
 /php/extension/run-tests.php
 /php/extension/tmp-php.ini
+/pick-guests.pl
 /po-docs/*/*.1
 /po-docs/*/*.3
+/po-docs/*/*.8
 /po-docs/*/*.pl
 /po-docs/po4a.conf
 /po-docs/*/*.pod
 /po-docs/*/stamp-update-po
-/podwrapper.sh
+/podwrapper.1
+/podwrapper.pl
 /po/*.gmo
 /python/bindtests.py
 /python/examples/guestfs-python.3
@@ -310,13 +347,14 @@ pod2htm?.tmp
 /python/guestfs.pyc
 /python/guestfs.pyo
 /python/__pycache__
+/qemu-wrapper.sh
 /rescue/stamp-virt-rescue.pod
 /rescue/virt-rescue
 /rescue/virt-rescue.1
 /resize/.depend
-/resize/resize_gettext.ml
+/resize/common_gettext.ml
+/resize/common_utils_tests
 /resize/stamp-virt-resize.pod
-/resize/utils_tests
 /resize/virt-resize
 /resize/virt-resize.1
 /ruby/bindtests.rb
@@ -324,6 +362,7 @@ pod2htm?.tmp
 /ruby/examples/guestfs-ruby.3
 /ruby/examples/stamp-guestfs-ruby.pod
 /ruby/ext/guestfs/extconf.h
+/ruby/ext/guestfs/extconf.rb
 /ruby/ext/guestfs/_guestfs.bundle
 /ruby/ext/guestfs/_guestfs.c
 /ruby/ext/guestfs/_guestfs.so
@@ -331,21 +370,25 @@ pod2htm?.tmp
 /ruby/Rakefile
 /run
 /sparsify/.depend
-/sparsify/sparsify_gettext.ml
 /sparsify/stamp-virt-sparsify.pod
 /sparsify/virt-sparsify
 /sparsify/virt-sparsify.1
-/src/actions.c
+/src/actions-?.c
+/src/actions-variants.c
 /src/bindtests.c
+/src/cleanup-structs.c
 /src/errnostring.c
-/src/errnostring_gperf.c
-/src/errnostring_gperf.gperf
+/src/errnostring-gperf.c
+/src/errnostring-gperf.gperf
 /src/errnostring.h
+/src/event-string.c
+/src/free-structs.c
 /src/guestfs.3
 /src/guestfs-actions.pod
 /src/guestfs-availability.pod
 /src/guestfs.h
 /src/guestfs-internal-actions.h
+/src/guestfs-internal-frontend-cleanups.h
 /src/guestfs_protocol.c
 /src/guestfs_protocol.h
 /src/guestfs_protocol.x
@@ -354,13 +397,13 @@ pod2htm?.tmp
 /src/libguestfs.syms
 /src/.libs/libguestfs.so
 /src/stamp-guestfs.pod
+/stamp-guestfs-release-notes.pod
 /stamp-h1
 /sysprep/.depend
 /sysprep/stamp-script1.sh
 /sysprep/stamp-script2.sh
 /sysprep/stamp-virt-sysprep.pod
 /sysprep/sysprep-extra-options.pod
-/sysprep/sysprep_gettext.ml
 /sysprep/sysprep-operations.pod
 /sysprep/virt-sysprep
 /sysprep/virt-sysprep.1
@@ -374,16 +417,20 @@ pod2htm?.tmp
 /tests/c-api/test-config
 /tests/c-api/test-create-handle
 /tests/c-api/test-debug-to-file
+/tests/c-api/test-environment
+/tests/c-api/test-event-string
 /tests/c-api/test*.img
 /tests/c-api/test-just-header
 /tests/c-api/test-just-header-cxx
 /tests/c-api/test-last-errno
 /tests/c-api/test.log
 /tests/c-api/test-private-data
+/tests/c-api/test-pwd
 /tests/c-api/tests
 /tests/c-api/tests.c
 /tests/c-api/test*.tmp
 /tests/c-api/test-user-cancel
+/tests/charsets/test-charset-fidelity
 /tests/data/100kallnewlines
 /tests/data/100kallspaces
 /tests/data/100kallzeroes
@@ -396,18 +443,28 @@ pod2htm?.tmp
 /tests/data/initrd-x86_64.img.gz
 /tests/data/test-grep.txt.gz
 /tests/data/test.iso
-/tests/extra/valgrind.log
+/tests/guests/blank-*.img
 /tests/guests/debian.img
 /tests/guests/fedora.img
+/tests/guests/fedora-btrfs.img
 /tests/guests/fedora-md1.img
 /tests/guests/fedora-md2.img
+/tests/guests/guests.xml
+/tests/guests/guests-all-good.xml
 /tests/guests/guest-aux/fedora-name.db
 /tests/guests/guest-aux/fedora-packages.db
 /tests/guests/stamp-fedora-md.img
 /tests/guests/ubuntu.img
 /tests/guests/windows.img
+/tests/mount-local/test-parallel-mount-local
+/tests/mountable/test-internal-parse-mountable
+/tests/parallel/test-parallel
 /tests/regressions/rhbz501893
 /tests/regressions/rhbz790721
+/tests/regressions/rhbz914931
+/tests/rsync/rsyncd.pid
+/tests/syslinux/extlinux-guest.img
+/tests/syslinux/syslinux-guest.img
 /test-tool/libguestfs-test-tool
 /test-tool/libguestfs-test-tool.1
 /test-tool/libguestfs-test-tool-helper
@@ -415,4 +472,3 @@ pod2htm?.tmp
 /tools/test.img
 /tools/virt-*.1
 /tools/virt-*.pl
-/valgrind.log.*
--- a/.gnulib
+++ b/.gnulib
--- a/.lvimrc
+++ b/.lvimrc
@@ -5,5 +5,5 @@

 set sw=2
 set ts=2
-set tw=80
+set tw=70
 set expandtab
--- a/.mailmap
+++ b/.mailmap
@@ -0,0 +1,13 @@
+Jim Meyering <meyering@redhat.com> <jim@meyering.net>
+Jim Meyering <meyering@redhat.com> <meyering@vv.meyering.net.meyering.net>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rich@hakodate.home.annexia.org>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rich@koneko.home.annexia.org>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rich@koneko.local>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rjones@centos5x32.home.annexia.org>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rjones@debian5x64.home.annexia.org>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rjones@redhat.com>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rjones@trick.home.annexia.org>
+Richard W.M. Jones <rjones@redhat.com> Richard Jones <rjones@ubuntu910x64.home.annexia.org>
+Richard W.M. Jones <rjones@redhat.com> <rich@annexia.org>
+Richard W.M. Jones <rjones@redhat.com> rjones <rjones>
+Wanlong Gao <gaowanlong@cn.fujitsu.com> <wanlong.gao@gmail.com>
--- a/.tx/config
+++ b/.tx/config
@@ -10,4 +10,3 @@ source_lang = en
 file_filter = po-docs/<lang>.po
 source_file = po-docs/libguestfs-docs.pot
 source_lang = en
-
--- a/13
+++ b/13
@@ -1,28 +1,37 @@
 Angus Salkeld <asalkeld@redhat.com>
 Ani Peter <apeter@redhat.com>
 Charles Duffy <cduffy@messageone.com>
+Cole Robinson <crobinso@redhat.com>
 Daniel Berrange <berrange@redhat.com>
 Daniel Cabrera <logan@fedoraproject.org>
 Douglas Schilling Landgraf <dougsland@redhat.com>
+Eric Blake <eblake@redhat.com>
 Erik Nolte <erik_nolte@acm.org>
+Evaggelos Balaskas <ebalaskas@ebalaskas.gr>
 Geert Warrink <geert.warrink@onsnet.nu>
 Guido Günther <agx@sigxcpu.org>
+Hilko Bengen <bengen@debian.org>
 Hilko Bengen <bengen@hilluzination.de>
+infernix <infernix@infernix.net>
 Jaswinder Singh <jsingh@redhat.com>
-Jim Meyering <jim@meyering.net>
+Jim Meyering <meyering@redhat.com>
 Jiri Popelka <jpopelka@redhat.com>
+John Eckersberg <jeckersb@redhat.com>
 Karel Klíč <kklic@redhat.com>
 Marcin Gibula <m.gibula@e24cloud.com>
+Masami HIRATA <msmhrt@gmail.com>
 Matthew Booth <mbooth@redhat.com>
 Maxim Koltsov <kolmax94@gmail.com>
 Michael Scherer <misc@zarb.org>
 Nikita A Menkovich <menkovich@gmail.com>
 Nikos Skalkotos <skalkoto@gmail.com>
+Olaf Hering <olaf@aepfle.de>
 Piotr Drąg <piotrdrag@gmail.com>
 Qin Guan <qguan@redhat.com>
 Rajesh Ranjan <rranjan@redhat.com>
-Richard W.M. Jones <rich@annexia.org>
+Richard W.M. Jones <rjones@redhat.com>
 Sandeep Shedmake <sshedmak@redhat.com>
 Shankar Prasad <svenkate@redhat.com>
 Thomas S Hatch <thatch45@gmail.com>
 Wanlong Gao <gaowanlong@cn.fujitsu.com>
+Wulf C. Krueger <philantrop@exherbo.org>
--- a/436
+++ b/436
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2012-05-17
+Last updated: 2013-04-04

 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -20,108 +20,81 @@ When reporting a new bug, please check:
 --------------------------------------------------
 Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.

-676020 NEW https://bugzilla.redhat.com/show_bug.cgi?id=676020
-  After using virt-resize with an ntfs partition windows is not booting
+507278 NEW https://bugzilla.redhat.com/show_bug.cgi?id=507278
+  libguestfs fails to build on Fedora sparc64

-684486 NEW https://bugzilla.redhat.com/show_bug.cgi?id=684486
-  Guest fails to boot after virt-resize
+547488 NEW https://bugzilla.redhat.com/show_bug.cgi?id=547488
+  guestfish cannot tab complete filenames that contain spaces
+
+554829 NEW https://bugzilla.redhat.com/show_bug.cgi?id=554829
+  SELinux handling could be done better.
+
+563450 NEW https://bugzilla.redhat.com/show_bug.cgi?id=563450
+  list-devices returns devices of different types out of order
+
+572337 NEW https://bugzilla.redhat.com/show_bug.cgi?id=572337
+  libguestfs should support gptsync
+
+578103 NEW https://bugzilla.redhat.com/show_bug.cgi?id=578103
+  [RFE] Tool to Compare Windows Registry Entries
+
+593511 NEW https://bugzilla.redhat.com/show_bug.cgi?id=593511
+  [RFE] function to get partition name
+
+604041 NEW https://bugzilla.redhat.com/show_bug.cgi?id=604041
+  guestmount absolute symlinks don't work
+
+624334 NEW https://bugzilla.redhat.com/show_bug.cgi?id=624334
+  blockdev-setbsz succeeds, but does not affect blockdev-getbsz
+
+624335 NEW https://bugzilla.redhat.com/show_bug.cgi?id=624335
+  blockdev-setbsz succeeds, but does not affect blockdev-getbsz
+
+637251 NEW https://bugzilla.redhat.com/show_bug.cgi?id=637251
+  virt-inspector fails to recognize data-only NTFS disk image
+
+660687 NEW https://bugzilla.redhat.com/show_bug.cgi?id=660687
+  guestmount: "touch" command fails: touch: setting times of `timestamp': Invalid argument
+
+672485 NEW https://bugzilla.redhat.com/show_bug.cgi?id=672485
+  [RFE] virt-edit/tar/inspector do not support encrypted system

 693064 NEW https://bugzilla.redhat.com/show_bug.cgi?id=693064
  Symbolic links on ntfs-3g are not followed correctly by some commands

+696445 NEW https://bugzilla.redhat.com/show_bug.cgi?id=696445
+  Backport virt-inspector for virt-v2v
+
+696451 NEW https://bugzilla.redhat.com/show_bug.cgi?id=696451
+  libguestfs: unknown filesystem label SWAP-sda2
+
+700342 NEW https://bugzilla.redhat.com/show_bug.cgi?id=700342
+  virt-inspector resports unknown filesystem UUID
+
 709326 NEW https://bugzilla.redhat.com/show_bug.cgi?id=709326
  virt-inspector cannot detect ReactOS

-728224 NEW https://bugzilla.redhat.com/show_bug.cgi?id=728224
-  configure can't find qemu on PPC
-
 737261 NEW https://bugzilla.redhat.com/show_bug.cgi?id=737261
  libguestfs grub-install API needs grub1

+745282 NEW https://bugzilla.redhat.com/show_bug.cgi?id=745282
+  [RFE] Support to use virt-filesystems with remote libvirt systems
+
 745576 NEW https://bugzilla.redhat.com/show_bug.cgi?id=745576
  libguestfs (or qemu?) hangs if sparse file runs out of disk space

-761565 NEW https://bugzilla.redhat.com/show_bug.cgi?id=761565
-  Missing deps on netpbm-progs and icoutils
-
 770075 NEW https://bugzilla.redhat.com/show_bug.cgi?id=770075
  FEBOOTSTRAP_MODULES fails if modules directory is not under /lib

 770076 NEW https://bugzilla.redhat.com/show_bug.cgi?id=770076
  FEBOOTSTRAP_KERNEL causes appliance build to fail

-782167 NEW https://bugzilla.redhat.com/show_bug.cgi?id=782167
-  libguestfs doesn't recognize Windows Dynamic disks in some configurations, eg. spanned
-
 785603 NEW https://bugzilla.redhat.com/show_bug.cgi?id=785603
-  copy-out can't find root directory
+  copy-out "No such file or directory"

 790837 NEW https://bugzilla.redhat.com/show_bug.cgi?id=790837
  Use of atexit to clean up handles is wrong in multithreaded programs

-798979 NEW https://bugzilla.redhat.com/show_bug.cgi?id=798979
-  Ubuntu install CDs from oneiric onwards are not recognized: "multi-boot operating systems are not supported"
-
-801117 NEW https://bugzilla.redhat.com/show_bug.cgi?id=801117
-  libguestfs cannot get icon for Windows 8 preview
-
-808193 NEW https://bugzilla.redhat.com/show_bug.cgi?id=808193
-  g.launch() crashes on RHEL 5
-
-811265 NEW https://bugzilla.redhat.com/show_bug.cgi?id=811265
-  the list-filesystems can detect the reiserFS,but can not mount it.and minix filesystem too.
-
-811395 NEW https://bugzilla.redhat.com/show_bug.cgi?id=811395
-  virt-inspector to detect ia64 Windows 2k3 install media
-
-811398 NEW https://bugzilla.redhat.com/show_bug.cgi?id=811398
-  virt-inspector fails to detect Win2k, Win2k8, Win2k8r2, WinVista, Win7 install media
-
-812970 NEW https://bugzilla.redhat.com/show_bug.cgi?id=812970
-  virt-rescue cannot set ><rescue> prompt, on Ubuntu 12.04
-
-813271 NEW https://bugzilla.redhat.com/show_bug.cgi?id=813271
-  intermittent appliance boot failures (divide_error)
-
-813290 NEW https://bugzilla.redhat.com/show_bug.cgi?id=813290
-  mdadm (md-detail) test occasionally fails with 'md device /dev/md125 does not appear to be active.'
-
-815149 NEW https://bugzilla.redhat.com/show_bug.cgi?id=815149
-  virt-alignment-scan gives error "part_list: could not parse row from output of parted print command: /dev/vda:4194304B:virtblk:512:512:msdos:Virtio Block Device"
-
-819086 NEW https://bugzilla.redhat.com/show_bug.cgi?id=819086
-  look for qemu-kvm on /usr/libexec
-
-822538 NEW https://bugzilla.redhat.com/show_bug.cgi?id=822538
-  libguestfs tools hang on qcow2 encrypted disks
-
-822626 NEW https://bugzilla.redhat.com/show_bug.cgi?id=822626
-  virt-ls error: "libguestfs: error: checksum: path: parameter cannot be NULL"
-
-563450 NEW https://bugzilla.redhat.com/show_bug.cgi?id=563450
-  list-devices returns devices of different types out of order
-
-696445 NEW https://bugzilla.redhat.com/show_bug.cgi?id=696445
-  Backport virt-inspector for virt-v2v
-
-806176 NEW https://bugzilla.redhat.com/show_bug.cgi?id=806176
-  libguestfs doesn't use the external tools (wrestool ...) to get icon even these tools are installed
-
-547488 NEW https://bugzilla.redhat.com/show_bug.cgi?id=547488
-  guestfish cannot tab complete filenames that contain spaces
-
-672485 NEW https://bugzilla.redhat.com/show_bug.cgi?id=672485
-  [RFE] virt-edit/tar/inspector do not support encrypted system
-
-745282 NEW https://bugzilla.redhat.com/show_bug.cgi?id=745282
-  [RFE] Support to use virt-filesystems with remote libvirt systems
-
-801640 NEW https://bugzilla.redhat.com/show_bug.cgi?id=801640
-  [RFE] the error reported by resize2fs-M need to be more clear
-
-803643 NEW https://bugzilla.redhat.com/show_bug.cgi?id=803643
-  inspect-is-multipart return false when inspection results should be true
-
 803650 NEW https://bugzilla.redhat.com/show_bug.cgi?id=803650
  inspect-is-live return false when inspection results should be true

@@ -134,194 +107,207 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 806179 NEW https://bugzilla.redhat.com/show_bug.cgi?id=806179
  RFE: support inspection of icon for more Windows guests

-816839 NEW https://bugzilla.redhat.com/show_bug.cgi?id=816839
-  data overflow error when debug progress -1
+812970 NEW https://bugzilla.redhat.com/show_bug.cgi?id=812970
+  virt-rescue cannot set ><rescue> prompt, on Ubuntu 12.04

-507278 NEW https://bugzilla.redhat.com/show_bug.cgi?id=507278
-  libguestfs fails to build on Fedora sparc64
+813290 NEW https://bugzilla.redhat.com/show_bug.cgi?id=813290
+  mdadm (md-detail) test occasionally fails with 'md device /dev/md125 does not appear to be active.'

-554829 NEW https://bugzilla.redhat.com/show_bug.cgi?id=554829
-  SELinux handling could be done better.
+815149 NEW https://bugzilla.redhat.com/show_bug.cgi?id=815149
+  virt-alignment-scan gives error "part_list: could not parse row from output of parted print command: /dev/vda:4194304B:virtblk:512:512:msdos:Virtio Block Device"

-555803 NEW https://bugzilla.redhat.com/show_bug.cgi?id=555803
-  guestfs_tgz_out does not detect failure of tar command
+819086 NEW https://bugzilla.redhat.com/show_bug.cgi?id=819086
+  look for qemu-kvm on /usr/libexec

-572337 NEW https://bugzilla.redhat.com/show_bug.cgi?id=572337
-  libguestfs should support gptsync
+822538 NEW https://bugzilla.redhat.com/show_bug.cgi?id=822538
+  libguestfs tools hang on qcow2 encrypted disks

-578103 NEW https://bugzilla.redhat.com/show_bug.cgi?id=578103
-  [RFE] Tool to Compare Windows Registry Entries
+824021 NEW https://bugzilla.redhat.com/show_bug.cgi?id=824021
+  inspection cannot recognize guest which uses btrfs subvolumes for root

-593511 NEW https://bugzilla.redhat.com/show_bug.cgi?id=593511
-  [RFE] function to get partition name
+824782 NEW https://bugzilla.redhat.com/show_bug.cgi?id=824782
+  virt-resize cannot resize PowerPC guests

-596354 NEW https://bugzilla.redhat.com/show_bug.cgi?id=596354
-  guestfish.1.html and guestfs.3.html declared "XHTML 1.0 Strict" but are not in fact well-formed XML
+832602 NEW https://bugzilla.redhat.com/show_bug.cgi?id=832602
+  "error in chunked encoding" when trying to extract (tar-out) a truncated ISO image

-604041 NEW https://bugzilla.redhat.com/show_bug.cgi?id=604041
-  guestmount absolute symlinks don't work
+833362 NEW https://bugzilla.redhat.com/show_bug.cgi?id=833362
+  virt-make-fs test fails on ppc64 because filesystem block size is 64k

-624334 NEW https://bugzilla.redhat.com/show_bug.cgi?id=624334
-  blockdev-setbsz succeeds, but does not affect blockdev-getbsz
+835622 NEW https://bugzilla.redhat.com/show_bug.cgi?id=835622
+  RFE: virt-sparsify should be able to sparsify onto a thin-provisioned LV

-624335 NEW https://bugzilla.redhat.com/show_bug.cgi?id=624335
-  blockdev-setbsz succeeds, but does not affect blockdev-getbsz
+837941 NEW https://bugzilla.redhat.com/show_bug.cgi?id=837941
+  Data loss when writing to qcow2-format disk files

-627675 NEW https://bugzilla.redhat.com/show_bug.cgi?id=627675
-  libguestfs inspector code cannot handle /dev/disk/by-id/* paths
+845234 NEW https://bugzilla.redhat.com/show_bug.cgi?id=845234
+  RFE: virt-ls on Windows guest doesn't support drive letters

-637251 NEW https://bugzilla.redhat.com/show_bug.cgi?id=637251
-  virt-inspector fails to recognize data-only NTFS disk image
+848464 NEW https://bugzilla.redhat.com/show_bug.cgi?id=848464
+  gobject javascript bindings cannot use 64 bit integers

-646036 NEW https://bugzilla.redhat.com/show_bug.cgi?id=646036
-  libguestfs fails to launch
+857763 NEW https://bugzilla.redhat.com/show_bug.cgi?id=857763
+  libguestfs 'file-architecture' returns 'ARM' for arm binaries

-660687 NEW https://bugzilla.redhat.com/show_bug.cgi?id=660687
-  guestmount: "touch" command fails: touch: setting times of `timestamp': Invalid argument
+866994 NEW https://bugzilla.redhat.com/show_bug.cgi?id=866994
+  tgz-out causes memory leak in guestfsd

-696451 NEW https://bugzilla.redhat.com/show_bug.cgi?id=696451
-  libguestfs: unknown filesystem label SWAP-sda2
+869179 NEW https://bugzilla.redhat.com/show_bug.cgi?id=869179
+  libguestfs fail to startup  on latest rhel7 tree

-696484 NEW https://bugzilla.redhat.com/show_bug.cgi?id=696484
-  [RFE] virt-v2v show the warning info after convert rhel4u8 guest if comment a line of swap in the fstab
+880806 NEW https://bugzilla.redhat.com/show_bug.cgi?id=880806
+  virt-df with two -a options displays incorrect disk image name

-700342 NEW https://bugzilla.redhat.com/show_bug.cgi?id=700342
-  virt-inspector resports unknown filesystem UUID
+887826 NEW https://bugzilla.redhat.com/show_bug.cgi?id=887826
+  RFE: virt-sparsify cannot handle multi-disk virtual machines (eg. if they use LVM, MD, LDM, etc)

-802389 NEW https://bugzilla.redhat.com/show_bug.cgi?id=802389
-  event handlers for 'close' event doesn't work in remote mode
+889089 NEW https://bugzilla.redhat.com/show_bug.cgi?id=889089
+  Block device /dev/sd* didn't translate to  /dev/vd*

-691389 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=691389
-  Extended attributes don't work over guestmount (FUSE)
+890027 NEW https://bugzilla.redhat.com/show_bug.cgi?id=890027
+  virt-sysprep: Setting the hostname on Fedora 18 is stupidly over-complicated

-713678 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=713678
-  Not all febootstrap messages are redirected to log callbacks
+891909 NEW https://bugzilla.redhat.com/show_bug.cgi?id=891909
+  Can't make install with non-standard prefix as non-root

-721160 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=721160
-  Missing btrfs support
+892271 NEW https://bugzilla.redhat.com/show_bug.cgi?id=892271
+  virt-format fail to format  the same disk more than twice with lvm enable

-539746 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=539746
-  launch fails when run inside a Xen guest, when no non-PV kernels are installed
+892272 NEW https://bugzilla.redhat.com/show_bug.cgi?id=892272
+  Specify QEMU interface emulation will break libguestfs
+
+892275 NEW https://bugzilla.redhat.com/show_bug.cgi?id=892275
+  checksums-out fail to compute the checksums of all regular files in directory
+
+892291 NEW https://bugzilla.redhat.com/show_bug.cgi?id=892291
+  guestmount: link() incorrectly returns ENOENT, when it should be EXDEV
+
+892834 NEW https://bugzilla.redhat.com/show_bug.cgi?id=892834
+  guestmount: rename() incorrectly follows symbolic links
+
+895898 NEW https://bugzilla.redhat.com/show_bug.cgi?id=895898
+  RFE: Allow interface to be specified with libvirt attach-method
+
+895946 NEW https://bugzilla.redhat.com/show_bug.cgi?id=895946
+  Got incorrect block count number when resize ntfs file system via "ntfsresize_opts"
+
+903890 NEW https://bugzilla.redhat.com/show_bug.cgi?id=903890
+  scrub-freespace didn't remove the scrub file, cause the file system 100% full
+
+903972 NEW https://bugzilla.redhat.com/show_bug.cgi?id=903972
+  Command "acl-set-file" is inconvenient to use
+
+903987 NEW https://bugzilla.redhat.com/show_bug.cgi?id=903987
+  Command "acl-set-file" is inconvenient to use
+
+905322 NEW https://bugzilla.redhat.com/show_bug.cgi?id=905322
+  "No such file or directory" when execute "hivex-commit"
+
+906190 NEW https://bugzilla.redhat.com/show_bug.cgi?id=906190
+  Need add a line break behind the output of command "hivex-value-value"
+
+906766 NEW https://bugzilla.redhat.com/show_bug.cgi?id=906766
+  virt-resize cannot resize RHEL 5 guest with GPT partition table type
+
+906777 NEW https://bugzilla.redhat.com/show_bug.cgi?id=906777
+  In tests, set_label sometimes fails
+
+908255 NEW https://bugzilla.redhat.com/show_bug.cgi?id=908255
+  error message didn't translate to user language
+
+909666 NEW https://bugzilla.redhat.com/show_bug.cgi?id=909666
+  Unexpected non-tail recursion in recv_from_daemon results in stack overflow in very long-running API calls that send progress messages
+
+909667 NEW https://bugzilla.redhat.com/show_bug.cgi?id=909667
+  Unexpected non-tail recursion in recv_from_daemon results in stack overflow in very long-running API calls that send progress messages
+
+910115 NEW https://bugzilla.redhat.com/show_bug.cgi?id=910115
+  RFE: support ntfsresize --bad-sectors option in virt-resize
+
+910269 NEW https://bugzilla.redhat.com/show_bug.cgi?id=910269
+  Tracker: Bugs in other packages that stop libguestfs working on current Rawhide
+
+910270 NEW https://bugzilla.redhat.com/show_bug.cgi?id=910270
+  Tracker: Bugs in other packages that stop libguestfs working on Fedora 18
+
+911674 NEW https://bugzilla.redhat.com/show_bug.cgi?id=911674
+  swapon label test fails (RHEL 7 only)
+
+911678 NEW https://bugzilla.redhat.com/show_bug.cgi?id=911678
+  libguestfs: error: cpio command failed: Resource temporarily unavailable (RHEL 7 only)
+
+913774 NEW https://bugzilla.redhat.com/show_bug.cgi?id=913774
+  libguestfs: could not create appliance through libvirt when URI is qemu:///system or running as root (which causes system to be used implicitly)
+
+913815 NEW https://bugzilla.redhat.com/show_bug.cgi?id=913815
+  febootstrap: no ext2 root device found when running libguestfs-test-tools
+
+916130 NEW https://bugzilla.redhat.com/show_bug.cgi?id=916130
+  libguestfs can't rebuild in mock
+
+917706 NEW https://bugzilla.redhat.com/show_bug.cgi?id=917706
+  guestfs_umount_local is not thread safe
+
+920617 NEW https://bugzilla.redhat.com/show_bug.cgi?id=920617
+  RFE: virt-inspector (or another tool) should produce OVF output for oVirt / RHEV
+
+921299 NEW https://bugzilla.redhat.com/show_bug.cgi?id=921299
+  virt-p2v fails with permissions problem on kernel module.
+
+921710 NEW https://bugzilla.redhat.com/show_bug.cgi?id=921710
+  9p support should be disabled in libguestfs in RHEL 7
+
+922891 NEW https://bugzilla.redhat.com/show_bug.cgi?id=922891
+  Tracker: Bugs in other packages that stop libguestfs working on Fedora 19
+
+923355 NEW https://bugzilla.redhat.com/show_bug.cgi?id=923355
+  guestfish prints literal "n" in error messages
+
+927447 NEW https://bugzilla.redhat.com/show_bug.cgi?id=927447
+  [suse] virt tools hang on disk image, but libguestfs-test-tool runs OK
+
+948324 NEW https://bugzilla.redhat.com/show_bug.cgi?id=948324
+  inspection fails if libosinfo is not installed

 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
  guestfish's list splitting does not recognize internal quoting

+539746 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=539746
+  launch fails when run inside a Xen guest, when no non-PV kernels are installed
+
 541618 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=541618
  guestfish not able to mount freebsd ufs2 partitions automatically

 619334 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=619334
  RFE: Enable coredump capture in the appliance

-(64 bugs)
+691389 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=691389
+  Extended attributes don't work over guestmount (FUSE)
+
+803643 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=803643
+  inspect-is-multipart return false when inspection results should be true
+
+(89 bugs)

 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
 You can help by testing the fixes.

-657499 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=657499
-  checksum: wrong check sum type causes umount to fail
+889536 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=889536
+  [RFE]It's better to emphasize "libguestfs-winsupport" in V2V manpage or error output

-719879 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=719879
-  Rebase libguestfs in RHEL 6.3
+889537 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=889537
+  Libguestfs live support should be disabled in RHEL 7 packages

-749828 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=749828
-  p2v does not support raid devices
+889538 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=889538
+  libguestfs can not be installed with recent iptables

-(3 bugs)
+909573 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=909573
+  patch libguestfs to use 'supermin' instead of 'febootstrap' in RHEL 7

--------------------------------------------------
-These bugs are in the VERIFIED state.
+947438 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=947438
+  Some obsolete tools should be removed from libguestfs RHEL 7 package

-729076 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=729076
-  libguestfs confuses Hp_recovery partition with Windows root filesystem
-
-731742 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=731742
-  libguestfs should escape special/non-printing characters in debug output
-
-760221 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=760221
-  RFE: Support inspection of cciss devices
-
-769359 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=769359
-  virt-resize on RHEL 6 kernel fails to re-read the partition table
-
-785305 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=785305
-  ocaml (bytecode) bindings segfault in 'add_drive_opts'
-
-788642 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=788642
-  virt-edit doesn't preserve file permissions
-
-790958 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=790958
-  multiprovider build error: RuntimeError: link: /tmp/.guestfs-0/kernel /tmp/.guestfs-0/kernel.10139: File exists
-
-797760 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=797760
-  virt-resize on Windows XP in sysprep state causes "UNMOUNTABLE_BOOT_VOLUME" BSOD
-
-798197 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=798197
-  virt-resize confuses format and output_format variables; using --output-format sets the input format
-
-798980 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=798980
-  Libguestfs live support should be disabled in RHEL 6 packages
-
-799695 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=799695
-  guestfs.h fails to compile with c++ compiler
-
-801788 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=801788
-  libguestfs holds open file descriptors when handle is launched
-
-803699 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=803699
-  libguestfs inspection fails on Windows XP: libguestfs: error: hivex: could not locate HKLMSYSTEMMountedDevices
-
-809401 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=809401
-  inspection doesn't recognize Fedora 17+ (because of grub2 and UsrMove)
-
-811673 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=811673
-  guestfs_last_error not set when qemu fails early during launch
-
-812092 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=812092
-  libguestfs cannot open disk images which are symlinks to files that contain ':' (colon) character
-
-647174 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=647174
-  RHEL6: virt-clone should remove old udev rules when changing MAC address
-
-789960 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=789960
-  guestfsd crash when try to mount non-exist disk
-
-799798 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=799798
-  set_autosync: this function can only be called in the config state at /usr/share/perl5/vendor_perl/Sys/VirtConvert/GuestfsHandle.pm line 107
-
-807557 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=807557
-  virt-sysprep: wrong params are passed to virt-inspector
-
-807905 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=807905
-  mkfs blocksize option breaks when creating btrfs
-
-811112 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=811112
-  [RFE][virt-sysprep] hostname can not be changed on rhel system
-
-811117 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=811117
-  [RFE][virt-sysprep] net-hwaddr not removed from "ifcfg-*" files on rhel
-
-813329 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=813329
-  virt-p2v can not convert physical host on MD device
-
-679737 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=679737
-  libguestfs: improve error message when zerofree is not available in the appliance
-
-785668 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=785668
-  aug-defnode: daemon crash
-
-795322 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=795322
-  add_ro should return error if not running in a config state
-
-796520 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=796520
-  [RFE] Prevent user from running some appliance configure commands after appliance boot up
-
-801273 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=801273
-  Document for set-pgroup need to be updated
-
-741183 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=741183
-  [RFE] Write a tool to align the partition(s) in a Windows XP image to a multiple of 8 sectors
-
-(30 bugs)
+(5 bugs)

 End of BUGS file.
--- a/14
+++ b/14
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-			    Preamble
+                            Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
  The precise terms and conditions for copying, distribution and
 modification follow.

-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.

-			    NO WARRANTY
+                            NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.

-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS

-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -1,112 +1,125 @@
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999

- Copyright (C) 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]

-			    Preamble
+                            Preamble

  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
 Licenses are intended to guarantee your freedom to share and change
 free software--to make sure the software is free for all its users.

-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.

-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.

  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
 or for a fee, you must give the recipients all the rights that we gave
 you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
 it.  And you must show them these terms so they know their rights.

-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.

-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.

-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.

-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.

-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.

-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.

-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.

-		  GNU LIBRARY GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
 prepared so as to be conveniently linked with application programs
@@ -255,7 +268,7 @@ distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.

-  6. As an exception to the Sections above, you may also compile or
+  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
 under terms of your choice, provided that the terms permit
@@ -282,23 +295,31 @@ of these things:
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

-    b) Accompany the work with a written offer, valid for at
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

-    c) If distribution of the work is made by offering access to copy
+    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

-    d) Verify that the user has already received a copy of these
+    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
 Library" must include any data and utility programs needed for
 reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
 components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
@@ -347,7 +368,7 @@ Library), the recipient automatically receives a license from the
 original licensor to copy, distribute, link with or modify the Library
 subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+You are not responsible for enforcing compliance by third parties with
 this License.

  11. If, as a consequence of a court judgment or allegation of patent
@@ -390,7 +411,7 @@ excluded.  In such case, this License incorporates the limitation as if
 written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
+versions of the Lesser General Public License from time to time.
 Such new versions will be similar in spirit to the present version,
 but may differ in detail to address new problems or concerns.

@@ -411,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.

-			    NO WARRANTY
+                            NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -434,9 +455,9 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.

-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS

-     Appendix: How to Apply These Terms to Your New Libraries
+           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
@@ -453,19 +474,18 @@ convey the exclusion of warranty; and each file should have at least the
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
+    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
+    Lesser General Public License for more details.

-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

 Also add information on how to contact you by electronic and paper mail.

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 # libguestfs
-# Copyright (C) 2009-2012 Red Hat Inc.
+# Copyright (C) 2009-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+-include $(top_builddir)/localenv
+
 include $(top_srcdir)/subdir-rules.mk

 ACLOCAL_AMFLAGS = -I m4
@@ -28,28 +30,37 @@ SUBDIRS += tests/data generator src examples po
 if ENABLE_DAEMON
 SUBDIRS += daemon
 endif
-if ENABLE_APPLIANCE
 SUBDIRS += appliance
-endif

 # Tests - order is important.
 if ENABLE_APPLIANCE
 SUBDIRS += tests/qemu
 SUBDIRS += tests/guests
 SUBDIRS += tests/c-api
+SUBDIRS += tests/tmpdirs
 SUBDIRS += tests/protocol
+SUBDIRS += tests/parallel
+SUBDIRS += tests/disks
+SUBDIRS += tests/mountable
 SUBDIRS += tests/lvm
 SUBDIRS += tests/luks
 SUBDIRS += tests/md
+SUBDIRS += tests/selinux
 SUBDIRS += tests/ntfsclone
 SUBDIRS += tests/btrfs
+SUBDIRS += tests/charsets
 SUBDIRS += tests/xml
+SUBDIRS += tests/mount-local
+SUBDIRS += tests/9p
+SUBDIRS += tests/rsync
+SUBDIRS += tests/bigdirs
+SUBDIRS += tests/disk-labels
+SUBDIRS += tests/hotplug
+SUBDIRS += tests/nbd
+SUBDIRS += tests/syslinux
 SUBDIRS += tests/regressions
 endif

-# Extra tests don't run by default.  You have to do 'make extra-tests'.
-SUBDIRS += tests/extra
-
 # libguestfs-test-tool
 SUBDIRS += test-tool

@@ -59,6 +70,9 @@ SUBDIRS += fish
 # virt-tools in C.
 SUBDIRS += align cat df edit format inspector rescue

+# bash-completion
+SUBDIRS += bash
+
 # Language bindings.
 if HAVE_PERL
 SUBDIRS += perl perl/examples
@@ -84,6 +98,9 @@ endif
 if HAVE_ERLANG
 SUBDIRS += erlang erlang/examples
 endif
+if HAVE_LUA
+SUBDIRS += lua lua/examples
+endif
 if HAVE_GOBJECT
 SUBDIRS += gobject
 endif
@@ -113,17 +130,27 @@ endif

 EXTRA_DIST = \
 	$(generator_built) \
-	BUGS HACKING RELEASE-NOTES ROADMAP TODO \
+	BUGS HACKING ROADMAP TODO \
 	.gitignore \
+	.lvimrc \
+	.mailmap \
+	.tx/config \
 	bugs-in-changelog.sh \
 	autogen.sh \
 	bindtests \
 	contrib/autobuild/autobuild.sh \
 	contrib/guestfsd-in-wine.sh \
 	contrib/intro/libguestfs-intro.html \
+	contrib/intro/overview.png \
 	contrib/intro/overview.svg \
 	contrib/intro/talk.txt \
+	contrib/intro/tools.png \
 	contrib/intro/tools.svg \
+	contrib/intro/virt-manager-t.png \
+	contrib/intro/virt-manager.png \
+	contrib/intro/vmm-icons-t.png \
+	contrib/intro/vmm-icons.png \
+	contrib/intro/win7.xml \
 	contrib/make-check-on-installed.pl \
 	contrib/README \
 	contrib/visualize-alignment/.gitignore \
@@ -136,11 +163,18 @@ EXTRA_DIST = \
 	contrib/visualize-alignment/qemu-0.13-trace-block-device-access.patch \
 	contrib/visualize-alignment/README \
 	contrib/visualize-alignment/tracetops.ml \
+	guestfs-release-notes.pod \
+	guestfs-release-notes.txt \
+	html/draft.png \
+	html/draft.svg \
 	html/pod.css \
 	libtool-kill-dependency_libs.sh \
 	logo/fish.svg logo/fish.png \
 	m4/.gitignore \
-	update-bugs.sh
+	tmp/.gitignore \
+	tx-pull.sh \
+	update-bugs.sh \
+	valgrind-suppressions

 # The website.
 HTMLFILES = \
@@ -149,15 +183,19 @@ HTMLFILES = \
 	html/guestfs-erlang.3.html \
 	html/guestfs-faq.1.html \
 	html/guestfs-java.3.html \
+	html/guestfs-lua.3.html \
 	html/guestfs-ocaml.3.html \
 	html/guestfs-performance.1.html \
 	html/guestfs-perl.3.html \
 	html/guestfs-python.3.html \
 	html/guestfs-recipes.1.html \
+	html/guestfs-release-notes.1.html \
 	html/guestfs-ruby.3.html \
 	html/guestfs-testing.1.html \
+	html/guestfsd.8.html \
 	html/guestfish.1.html \
 	html/guestmount.1.html \
+	html/guestunmount.1.html \
 	html/libguestfs-make-fixed-appliance.1.html \
 	html/libguestfs-test-tool.1.html \
 	html/virt-alignment-scan.1.html \
@@ -182,7 +220,9 @@ HTMLFILES = \
 	html/virt-tar-out.1.html \
 	html/virt-win-reg.1.html

-TEXTFILES = BUGS README RELEASE-NOTES ROADMAP TODO
+HTMLSUPPORTFILES = html/draft.png html/pod.css
+
+TEXTFILES = BUGS README ROADMAP TODO

 WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs

@@ -191,7 +231,7 @@ WEBSITEDIR = $(HOME)/d/redhat/websites/libguestfs
 website: $(HTMLFILES) $(TEXTFILES)
 	find -name 'stamp-*.pod' -delete
 	$(MAKE)
-	cp $(HTMLFILES) $(WEBSITEDIR)
+	cp $(HTMLFILES) $(HTMLSUPPORTFILES) $(WEBSITEDIR)
 	for f in $(TEXTFILES); do cp $$f $(WEBSITEDIR)/$$f.txt; done
 	cd $(WEBSITEDIR) && \
 	date=`date +%F`; \
@@ -203,13 +243,10 @@ website: $(HTMLFILES) $(TEXTFILES)
 dist-hook:
 	$(top_srcdir)/build-aux/gitlog-to-changelog > ChangeLog
 	cp ChangeLog $(distdir)/ChangeLog
-#	$(top_srcdir)/update-bugs.sh > BUGS-t
-#	mv BUGS-t BUGS
+	$(top_srcdir)/update-bugs.sh > BUGS-t
+	mv BUGS-t BUGS
 	cp BUGS $(distdir)/BUGS
-	git log --pretty="format:%an <%ae>" | sort -u | uniq -w 10 | \
-		grep -v rjones | \
-		grep -v "Richard Jones" \
-		> AUTHORS-t
+	git shortlog -se | awk -F'\t' '{print $$2}' | sort -f > AUTHORS-t
 	mv AUTHORS-t AUTHORS
 	cp AUTHORS $(distdir)/AUTHORS

@@ -237,32 +274,181 @@ all-local:
 	find resize sparsify sysprep -name '*.ml' | \
 	LC_ALL=C sort > po/POTFILES-ml

+# Manual pages in top level directory.
+
+man_MANS = \
+	guestfs-release-notes.1
+noinst_DATA = \
+	$(top_builddir)/html/guestfs-release-notes.1.html
+
+guestfs-release-notes.1 guestfs-release-notes.txt $(top_builddir)/html/guestfs-release-notes.1.html: stamp-guestfs-release-notes.pod
+
+stamp-guestfs-release-notes.pod: guestfs-release-notes.pod
+	$(PODWRAPPER) \
+	  --section 1 \
+	  --man guestfs-release-notes.1 \
+	  --text guestfs-release-notes.txt \
+	  --html $(top_builddir)/html/guestfs-release-notes.1.html \
+	  --license GPLv2+ \
+	  $<
+	touch $@
+
+# NB. podwrapper is an internal tool, so the man page mustn't be installed.
+noinst_MANS = podwrapper.1
+podwrapper.1: podwrapper.pl
+	$(PODWRAPPER) \
+	  --section 1 \
+	  --man $@-t \
+	  --license GPLv2+ \
+	  $<
+	mv $@-t $@
+
 # Make clean.

 CLEANFILES = \
+	*~ \
+	html/*.html \
 	pod2htm?.tmp \
-	html/*.html
+	podwrapper.1 \
+	qemu-wrapper.sh \
+	stamp-guestfs-release-notes.pod \
+	tmp/guestfs.* \
+	tmp/run-* \
+	tmp/valgrind-*.log
+
+clean-local:
+	-rm -rf tmp/libguestfs??????

 # If you don't want to run all of the tests ('make check') then this
 # will just run libguestfs-test-tool for a quick check.  Note this
 # is NOT a substitute for proper testing!

 quickcheck:
-	./run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)
+	$(top_builddir)/run test-tool/libguestfs-test-tool $(QUICKCHECK_TEST_TOOL_ARGS)

-# Run extra-tests in tests/extra/ subdirectory.
+# Non-standard tests.

 extra-tests:
-	make -C tests/extra $@
+	$(MAKE) -j1 \
+	  check-valgrind \
+	  check-valgrind-local-guests \
+	  check-direct \
+	  check-valgrind-direct \
+	  check-with-upstream-qemu \
+	  check-with-upstream-libvirt \
+	  check-slow

-# Make binary distribution.
+check-valgrind: build-test-guests
+	@errors=0; \
+	for f in `grep -l '^$@:' $(SUBDIRS:%=%/Makefile.am)`; do \
+	  echo $(MAKE) -C `dirname $$f` $@; \
+	  $(MAKE) -C `dirname $$f` $@ || (( errors++ )); \
+	done; \
+	exit $$(( $$errors ? 1 : 0 ))

-BINTMPDIR = /tmp/libguestfs-bin
-bindist:
-	rm -rf $(BINTMPDIR)
-	mkdir $(BINTMPDIR)
-	$(MAKE)
-	$(MAKE) DESTDIR=$(BINTMPDIR) install
-	-find $(BINTMPDIR) -type d -exec rmdir --ignore-fail-on-non-empty {} \;
-	(cd $(BINTMPDIR) && tar cf - .) | \
-	  gzip -c -9 > libguestfs-$(VERSION)-$(DISTRO)-$(host_cpu).tar.gz
+check-valgrind-local-guests:
+	@GUESTS=`$(top_builddir)/run ./pick-guests.pl 5`; \
+	errors=0; \
+	for f in `grep -l '^$@:' $(SUBDIRS:%=%/Makefile.am)`; do \
+	  echo $(MAKE) GUESTS="$$GUESTS" -C `dirname $$f` $@; \
+	  $(MAKE) GUESTS="$$GUESTS" -C `dirname $$f` $@ || (( errors++ )); \
+	done; \
+	exit $$(( $$errors ? 1 : 0 ))
+
+check-direct:
+	@backend=`$(top_builddir)/run ./fish/guestfish get-backend`; \
+	if [ "$$backend" != "direct" ]; then \
+	  $(MAKE) LIBGUESTFS_BACKEND=direct check || exit $$?; \
+	fi
+
+check-with-appliance: check-direct
+
+check-valgrind-direct:
+	@backend=`$(top_builddir)/run ./fish/guestfish get-backend`; \
+	if [ "$$backend" != "direct" ]; then \
+	  $(MAKE) LIBGUESTFS_BACKEND=direct check-valgrind || exit $$?; \
+	fi
+
+check-valgrind-with-appliance: check-valgrind-direct
+
+QEMUDIR = $(HOME)/d/qemu
+QEMUBINARY = $(QEMUDIR)/x86_64-softmmu/qemu-system-x86_64
+
+check-with-upstream-qemu:
+	rm -f $(top_builddir)/qemu-wrapper.sh
+	$(MAKE) check-with-upstream-qemu-1 || exit $$?
+
+check-with-upstream-qemu-1: $(top_builddir)/qemu-wrapper.sh
+	$(QEMUBINARY) --version
+	$(MAKE) LIBGUESTFS_QEMU=$(abs_top_builddir)/qemu-wrapper.sh check
+
+$(top_builddir)/qemu-wrapper.sh: Makefile
+	rm -f $@ $@-t
+	echo -e "#!/bin/sh\nexec" "$(QEMUBINARY)" -L "$(QEMUDIR)/pc-bios" \"\$$@\" > $@-t
+	chmod +x,-w $@-t
+	mv $@-t $@
+
+LIBVIRTDIR = $(HOME)/d/libvirt
+
+check-with-upstream-libvirt:
+	@backend=`$(top_builddir)/run ./fish/guestfish get-backend`; \
+	if [ "$$backend" = "libvirt" ] && [ -x "$(LIBVIRTDIR)/run" ]; then \
+	  $(LIBVIRTDIR)/run $(MAKE) check || exit $$?; \
+	fi
+
+check-slow: build-test-guests
+	@errors=0; \
+	for f in `grep -l '^$@:' $(SUBDIRS:%=%/Makefile.am)`; do \
+	  echo $(MAKE) -C `dirname $$f` $@; \
+	  $(MAKE) -C `dirname $$f` $@ || (( errors++ )); \
+	done; \
+	exit $$(( $$errors ? 1 : 0 ))
+
+build-test-guests:
+	$(MAKE) -C tests/guests check
+
+# Print subdirs.
+#
+# If you want to selectively run tests, or if the test suite fails half
+# way through, use:
+#
+#   make print-subdirs
+#
+# to print the subdirectories, select the ones you want to run / the
+# remaining ones, and do:
+#
+#   make check SUBDIRS="..."
+
+print-subdirs:
+	@echo $(SUBDIRS)
+
+# Provide help on common Makefile targets.
+
+help:
+	@echo
+	@echo "make                              Build everything."
+	@echo
+	@echo "make check                        Run the standard tests"
+	@echo "make -k check                       ... and display all errors at once."
+	@echo
+	@echo "make extra-tests                  Runs all of the following tests:"
+	@echo "  make check-valgrind                Run a subset of the tests under valgrind."
+	@echo "  make check-valgrind-local-guests   Test under valgrind using local guests."
+	@echo "  make check-direct                  Test using direct backend."
+	@echo "  make check-valgrind-direct         Test valgrind + direct backend."
+	@echo "  make check-with-upstream-qemu      Test using upstream qemu."
+	@echo "  make check-with-upstream-libvirt   Test using upstream libvirt."
+	@echo "  make check-slow                    Slow/long-running tests."
+	@echo
+	@echo "make syntax-check                 Check syntax and style problems in the code."
+	@echo "make print-subdirs                Print subdirectories."
+	@echo
+	@echo "make install                      Install everything."
+	@echo
+	@echo "make clean                        Clean everything."
+	@echo
+	@echo "To run programs without installing:"
+	@echo "  ./run ./fish/guestfish [or any other program]"
+	@echo
+	@echo "For more information, see EXTENDING LIBGUESTFS in guestfs(3); and README."
+	@echo
--- a/353
+++ b/353
@@ -41,142 +41,222 @@ Debian/Ubuntu users:

 The full requirements are described below.

-For basic functionality and the C tools:
-
- look at appliance/packagelist.in and install as many of the packages
-  that apply to your distro as possible
-
- recent QEMU >= 0.13 (0.14 or later is better) with virtio-serial support
-
- kernel >= 2.6.34 with virtio-serial support enabled.
-
- virtio-block and virtio-net drivers should be compiled into your
-  host kernel (strictly speaking this is optional, but you will have
-  to make complex changes to the ./configure command line to get it
-  to work if you don't have virtio)
-
- febootstrap >= 3.3 (it is best to use the latest version)
-
-  Notes: (1) febootstrap 2.x WILL NOT WORK
-         (2) febootstrap 3.x is distro-independent, and is required on
-             Debian and other distros as well as Fedora
-
- XDR, rpcgen (on Linux these are provided by glibc)
-
- cpio
-
- gperf
-
- pcre (Perl Compatible Regular Expressions C library)
-
- genisoimage (NOT mkisofs any more)
-
- hivex >= 1.2.7 (http://libguestfs.org/download) (optional)
-
- libmagic (the library that corresponds to the 'file' command) (optional)
-
- libvirt (optional)
-
- libxml2 (optional)
-
- libconfig (optional)
-
- augeas >= 0.5.0 (http://augeas.net/) (optional)
-
- Berkeley DB 'db_dump' and 'db_load' utilities
-  (db4-utils or db4.X-util or similar) (optional)
-
- systemtap/DTrace userspace probes (optional)
-  http://sourceware.org/systemtap/wiki/AddingUserSpaceProbingToApps
-
- perldoc (pod2man, pod2text, pod2html) to generate the manual pages
-  and other documentation.
-
- Readline to have nicer command-line editing in guestfish (optional)
-
- xmllint (part of libxml2) to validate virt-inspector
-  RELAX NG schema (optional)
-
- OCaml if you want to rebuild the generated files, and
-  also to build the OCaml bindings (optional)
-
- ocaml-gettext if you want to translate OCaml tools (optional)
-
- po4a for translating manpages and POD files.
-  This is optional when compiling from the tarball, but mandatory
-  if you compile from git.
-
- getfacl, getfattr libraries and programs (optional)
-
- netpbm, icoutils (optional)
-  These programs are used to render icons from guests.
-
-To build FUSE support (guestmount):
-
- FUSE libraries and kernel module (optional)
-
-To build language bindings:
-
- Perl if you want to build the perl bindings (optional)
-
- Python if you want to build the python bindings (optional)
-
- Ruby, rake if you want to build the ruby bindings (optional)
-
- Java, JNI, jpackage-utils if you want to build the java
-  bindings (optional)
-
- GHC if you want to build the Haskell bindings (optional)
-
- PHP, phpize if you want to build the PHP bindings (optional)
-
-To build the Perl tools:
-
- Perl Sys::Virt module (optional)
-
- Perl Win::Hivex module (optional)
-
- Perl Pod::Usage module (optional)
-
- Perl Test::More module (from perl Test::Simple) (optional)
-
- Perl String::ShellQuote module (optional)
-
- perl-libintl for translating perl code (optional)
-
-To run virt-sysprep:
-
- virt-sysprep requires FUSE support since it uses guestmount
+                               R = Required
+                               O = Optional
+==============+=============+===+=========================================+
+| Package name | Min.version |   | Notes                                   |
+==============+=============+===+=========================================+
+| Install as many packages listed in appliance/packagelist.in as possible. |
+| This installs the disk management tools required by the appliance.  The  |
+| list below is *additional* packages needed on the host.                  |
+--------------+-------------+---+-----------------------------------------+
+| qemu         | 1.2.0       | R | 1.1 may work, but has broken virtio-scsi|
+--------------+-------------+---+-----------------------------------------+
+| qemu-img     |             | R |                                         |
+--------------+-------------+---+-----------------------------------------+
+| kernel       | 2.6.34      | R | Make sure the following are enabled     |
+|              |             |   | compiled in or as a module:             |
+|              |             |   |  - virtio-pci                           |
+|              |             |   |  - virtio-serial                        |
+|              |             |   |  - virtio-block                         |
+|              |             |   |  - virtio-net                           |
+--------------+-------------+---+-----------------------------------------+
+| supermin     | 4.1.0       | R | This is required on all distros.        |
+| febootstrap  | 3.20        |   | 'supermin' is the new name for          |
+|              |             |   | 'febootstrap'.                          |
+|              |             |   | For alternatives, see:                  |
+|              |             |   | libguestfs.org/download/binaries/appliance/
+|              |             |   | febootstrap 2.x WILL NOT WORK           |
+--------------+-------------+---+-----------------------------------------+
+| glibc        |             | R | We use various glibc-isms.              |
+|              |             |   | Also glibc provides XDR, rpcgen.        |
+--------------+-------------+---+-----------------------------------------+
+| GCC or LLVM  |             | R | We use __attribute__((cleanup)).        |
+--------------+-------------+---+-----------------------------------------+
+| Perl         |             | R | Various build and test programs need    |
+|              |             |   | Perl.  Not needed at runtime except if  |
+|              |             |   | you need to run a handful of virt-*     |
+|              |             |   | tools that are still written in Perl.   |
+--------------+-------------+---+-----------------------------------------+
+| Pod::Man     |             | R | Part of Perl core.                      |
+--------------+-------------+---+-----------------------------------------+
+| Pod::Simple  |             | R | Part of Perl core.                      |
+--------------+-------------+---+-----------------------------------------+
+| OCaml        |             |R/O| Required if compiling from git.         |
+|              |             |   | Optional if compiling from tarball.     |
+|              |             |   | To build generated files and OCaml bindings.
+--------------+-------------+---+-----------------------------------------+
+| autotools    |             |R/O| Required if compiling from git.         |
+|              |             |   | Optional if compiling from tarball.     |
+|              |             |   | Autotools-based build system.           |
+--------------+-------------+---+-----------------------------------------+
+| cpio         |             | R |                                         |
+--------------+-------------+---+-----------------------------------------+
+| gperf        |             | R |                                         |
+--------------+-------------+---+-----------------------------------------+
+| PCRE         |             | R | Perl-compatible Regular Expression lib. |
+--------------+-------------+---+-----------------------------------------+
+| genisoimage  |             | R | mkisofs may work.                       |
+--------------+-------------+---+-----------------------------------------+
+| po4a         |             |R/O| Required if compiling from git.         |
+|              |             |   | Optional if compiling from tarball.     |
+|              |             |   | For localizing man pages.               |
+--------------+-------------+---+-----------------------------------------+
+| hivex        | 1.2.7       | O | Windows Registry hive parser.           |
+--------------+-------------+---+-----------------------------------------+
+| libmagic     |             | O | The library used by the 'file' command. |
+--------------+-------------+---+-----------------------------------------+
+| libvirt      |             | O | >= 0.10.2 is needed if you want to use  |
+|              |             |   | libvirt to manage transient VMs.        |
+--------------+-------------+---+-----------------------------------------+
+| libxml2      |             | O | Popular XML library.                    |
+--------------+-------------+---+-----------------------------------------+
+| xmllint      |             | O | Part of libxml2.  Used for tests only.  |
+--------------+-------------+---+-----------------------------------------+
+| libconfig    |             | O | Used to parse libguestfs's own config   |
+|              |             |   | files eg. /etc/libguestfs-tools.conf.   |
+--------------+-------------+---+-----------------------------------------+
+| libselinux   |             | O | Used by the libvirt backend to securely |
+|              |             |   | confine the appliance (sVirt).          |
+--------------+-------------+---+-----------------------------------------+
+| augeas       | 0.5.0       | O | To inspect configuration of Linux guests.
+--------------+-------------+---+-----------------------------------------+
+| db utils     |             | O | db_dump, db_load etc.  Usually found in |
+|              |             |   | a package called db-utils, db4-utils,   |
+|              |             |   | db4.X-utils, Berkeley DB utils, etc.    |
+--------------+-------------+---+-----------------------------------------+
+| systemtap    |             | O | For userspace probes.                   |
+--------------+-------------+---+-----------------------------------------+
+| readline     |             | O | For nicer command line in guestfish.    |
+--------------+-------------+---+-----------------------------------------+
+| acl          |             | O | Library (libacl) and programs for       |
+|              |             |   | handling POSIX ACLs.                    |
+--------------+-------------+---+-----------------------------------------+
+| libcap       |             | O | Library (libcap) and programs for       |
+|              |             |   | handling Linux capabilities.            |
+--------------+-------------+---+-----------------------------------------+
+| libldm       |             | O | Library (libldm) and 'ldmtool' for      |
+|              |             |   | handling Windows Dynamic Disks.         |
+--------------+-------------+---+-----------------------------------------+
+| yajl         | 2           | O | JSON parser for parsing output of       |
+|              |             |   | ldmtool and qemu-img info commands.     |
+--------------+-------------+---+-----------------------------------------+
+| gdisk        |             | O | GPT disk support.                       |
+--------------+-------------+---+-----------------------------------------+
+| netpbm       |             | O | Render icons from guests.               |
+--------------+-------------+---+-----------------------------------------+
+| icoutils     |             | O | Render icons from Windows guests.       |
+--------------+-------------+---+-----------------------------------------+
+| Expect       |             | O | Perl module used to test virt-rescue.   |
+--------------+-------------+---+-----------------------------------------+
+| FUSE         |             | O | fusermount, libfuse, and kernel module  |
+|              |             |   | are all needed if you want guestmount   |
+|              |             |   | and/or 'mount-local' support.           |
+--------------+-------------+---+-----------------------------------------+
+| static glibc |             | O | Used for testing only.                  |
+--------------+-------------+---+-----------------------------------------+
+| qemu-nbd     |             | O | Used for testing only.                  |
+--------------+-------------+---+-----------------------------------------+
+| findlib      |             | O | For the OCaml bindings.                 |
+--------------+-------------+---+-----------------------------------------+
+| ocaml-gettext|             | O | For localizing OCaml virt-* tools.      |
+--------------+-------------+---+-----------------------------------------+
+| Python       | 2.2         | O | For the Python bindings.                |
+--------------+-------------+---+-----------------------------------------+
+| Ruby         |             | O | >= 1.9 is better than 1.8.              |
+--------------+-------------+---+-----------------------------------------+
+| rake         |             | O | For the Ruby bindings.                  |
+--------------+-------------+---+-----------------------------------------+
+| rubygem-minitest           | O | For the Ruby bindings.                  |
+--------------+-------------+---+-----------------------------------------+
+| Java         | 1.6         | O | Java + JNI + jpackage-utils are needed  |
+|              |             |   | for the Java bindings.                  |
+--------------+-------------+---+-----------------------------------------+
+| GHC          |             | O | For the Haskell bindings.               |
+--------------+-------------+---+-----------------------------------------+
+| PHP          |             | O | For the PHP bindings.                   |
+--------------+-------------+---+-----------------------------------------+
+| phpize       |             | O | For the PHP bindings.                   |
+--------------+-------------+---+-----------------------------------------+
+| glib2        |             | O | For the GObject bindings.               |
+--------------+-------------+---+-----------------------------------------+
+| gobject-introspection      | O | For the GObject bindings.               |
+--------------+-------------+---+-----------------------------------------+
+| gjs          |             | O | For testing the GObject bindings.       |
+--------------+-------------+---+-----------------------------------------+
+| LUA          |             | O | For the LUA bindings.                   |
+--------------+-------------+---+-----------------------------------------+
+| Erlang       |             | O | For the Erlang bindings.                |
+--------------+-------------+---+-----------------------------------------+
+| erl_interface|             | O | For the Erlang bindings.                |
+--------------+-------------+---+-----------------------------------------+
+| valgrind     |             | O | For testing for memory problems.        |
+--------------+-------------+---+-----------------------------------------+
+| Sys::Virt    |             | O | Perl bindings for libvirt.              |
+--------------+-------------+---+-----------------------------------------+
+| Win::Hivex   |             | O | Perl bindings for hivex.                |
+--------------+-------------+---+-----------------------------------------+
+| Pod::Usage   |             | O | Perl module used by tests.              |
+--------------+-------------+---+-----------------------------------------+
+| Test::More   |             | O | Perl module used by tests.              |
+--------------+-------------+---+-----------------------------------------+
+| String::Shellquote         | O | Perl module used by some virt-* tools.  |
+--------------+-------------+---+-----------------------------------------+
+| XML::XPath   |             | O | Perl module used by some virt-* tools.  |
+--------------+-------------+---+-----------------------------------------+
+| XML::XPath::XMLParser      | O | Perl module used by some virt-* tools.  |
+--------------+-------------+---+-----------------------------------------+
+| perl-libintl |             | O | Perl module for localization.           |
+--------------+-------------+---+-----------------------------------------+
+| bash-completion            | O | For tab-completion of commands in bash. |
+==============+=============+===+=========================================+
+                               R = Required
+                               O = Optional


 Building
 ----------------------------------------------------------------------

-Then make the daemon, library and root filesystem:
+Build the daemon, library and root filesystem:

  ./configure
  make

-Finally run the tests:
+Run the tests:

  make check

-There are some extra tests, but these require that you have some
-libvirt guests installed, that these guests' disks are accessible by
-the current user, and these tests may fail for other reasons which are
-not necessarily because of real problems.  If you want to run these
-extra tests do:
+Also:

-  make extra-tests
+ make check-valgrind

-If everything works, you can install the library and tools by running
-this command as root:
+runs a subset of the test suite under valgrind (requires valgrind to
+be installed obviously).
+
+ make extra-tests
+
+runs check-valgrind + even more tests, but these require that you have
+some libvirt guests installed, that these guests' disks are accessible
+by the current user, and these tests may fail for other reasons which
+are not necessarily because of real problems.
+
+ make help
+
+lists all 'make' targets.
+
+You may install the library by running the following command as root.
+However *most users should probably not do this*.  Instead, './run'
+the programs from the build directory as described below.

  make install

+Distro packagers should use this instead:
+
+ make INSTALLDIRS=vendor [DESTDIR=...] install
+
 You can run guestfish, guestmount and the virt tools without needing
-to install, using the "run" script in the top directory.  This script
-sets up some environment variables.  For example:
+to install, using the "./run" script in the top directory.  This
+script sets up some environment variables.  For example:

  ./run ./fish/guestfish [usual guestfish args ...]

@@ -187,8 +267,7 @@ command will also work:

  ../run ./guestfish [...]

-You can also make a symlink (note: NOT a hard link) from your $PATH to
-the run script, eg:
+You can also make a link from your $PATH to the run script, eg:

  cd ~/bin
  ln -s ~/libguestfs/run libguestfs-run
@@ -199,6 +278,10 @@ You can also run the C programs under valgrind like this:

  ./run valgrind [valgrind opts...] ./cat/virt-cat [virt-cat opts...]

+or under gdb:
+
+  ./run gdb --args ./cat/virt-cat [virt-cat opts...]
+
 This also works with sudo (eg. if you need root access for libvirt or
 to access a block device):

@@ -234,7 +317,7 @@ these instructions:

 On some systems, this will work too:

-  chmod o+rw /dev/kvm
+  chmod 0666 /dev/kvm

 On some systems, the chmod will not survive a reboot, and you will
 need to make edits to the udev configuration.
@@ -268,7 +351,7 @@ distributions.  Non-Linux ports are trickier, but we will accept
 patches if they aren't too invasive.

 The main porting issues are with the dependencies needed to build the
-appliance.  You will need to port the febootstrap first
+appliance.  You will need to port febootstrap first
 (http://people.redhat.com/~rjones/febootstrap/).


@@ -293,31 +376,39 @@ In theory libguestfs should work on non-x86 architectures.  Usually if
 it doesn't it's because qemu isn't available or cannot boot the
 kernel.

-Nevertheless we've had some success on arm.  For arm you will need to
-specify the exact machine type and CPU variant that is required to
-boot the Linux kernel (there's no way to know this except by looking
-at how the Linux kernel was configured).  For example:
+For ARM you will need to specify the exact machine type and CPU
+variant that is required to boot the Linux kernel (there's no way to
+know this except by looking at how the Linux kernel was configured).
+For example:

  ./configure \
        --with-qemu="qemu-system-arm" \
        --with-qemu-options="-M versatilepb -cpu arm926"
  ./configure \
        --with-qemu="qemu-system-arm" \
-        --with-qemu-options="-M vexpress-a9 -cpu cortex-a9"
+        --with-qemu-options="-M vexpress-a15 -cpu cortex-a15"

 Note that since virtio is required by libguestfs, and virtio is a
-PCI-based architecture, whatever architecture qemu emulates must
-support PCI also.
+PCI-based architecture, whatever architecture qemu emulates MUST
+support PCI.
+
+For PPC64 you will need to specify the IBM pSeries machine type:
+
+  ./configure \
+        --with-qemu="qemu-system-ppc64" \
+        --with-qemu-options="-M pseries"

 After building libguestfs, run 'make quickcheck' and pay close
-attention to the qemu command line.
+attention to the qemu command line and kernel output.


 Copyright and license information
 ----------------------------------------------------------------------

-Copyright (C) 2009-2012 Red Hat Inc.
+Copyright (C) 2009-2013 Red Hat Inc.

 The library is distributed under the LGPLv2+.  The programs are
 distributed under the GPLv2+.  Please see the files COPYING and
 COPYING.LIB for full license information.
+
+The examples are under a very liberal license.
--- a/23
+++ b/23
@@ -3,7 +3,7 @@ Roadmap for future releases

 Before you read this:

-(1) To see what's in the current release, read 'RELEASE-NOTES'.
+(1) To see what's in the current release, read 'guestfs-release-notes(1)'.

 (2) To see the list of bugs, read 'BUGS'.

@@ -12,19 +12,19 @@ Before you read this:

 (4) For general "might be good to have" items, see 'TODO'.

-For next major stable release (1.20)
+For next major stable release (1.22)
 ------------------------------------

 * Allow remote libvirt volumes to be accessed.  This requires some
  enhancements to libvirt which have been agreed but not yet
  implemented.

-Bugs assigned to 1.20 (put "1.20" in the Devel Whiteboard field in
+Bugs assigned to 1.22 (put "1.22" in the Devel Whiteboard field in
 Bugzilla):

-https://bugzilla.redhat.com/buglist.cgi?query_format=advanced&field0-0-0=cf_devel_whiteboard&bug_status=NEW&bug_status=ASSIGNED&bug_status=MODIFIED&bug_status=ON_DEV&bug_status=ON_QA&bug_status=VERIFIED&bug_status=FAILS_QA&bug_status=RELEASE_PENDING&bug_status=POST&bug_status=PASSES_QA&type0-0-0=anywords&value0-0-0=1.20&component=libguestfs&product=Virtualization%20Tools
+https://bugzilla.redhat.com/buglist.cgi?query_format=advanced&field0-0-0=cf_devel_whiteboard&bug_status=NEW&bug_status=ASSIGNED&bug_status=MODIFIED&bug_status=ON_DEV&bug_status=ON_QA&bug_status=VERIFIED&bug_status=FAILS_QA&bug_status=RELEASE_PENDING&bug_status=POST&bug_status=PASSES_QA&type0-0-0=anywords&value0-0-0=1.22&component=libguestfs&product=Virtualization%20Tools

-Beyond 1.20
+Beyond 1.22
 -----------

 * Make 'guestfish --ro' be the default, and get users to use
@@ -33,20 +33,7 @@ Beyond 1.20
  for 1.10 but there's not nearly enough adoption of the new
  'guestfish --rw' option out there to do this yet.

-* Allow alternate methods to start the appliance, including through
-  libvirt, by connecting to an existing appliance, and remotely over
-  ssh.  Libvirt integration was originally planned for 1.10 but we
-  didn't get patches in time.
-
 * Write a new partition handling library to replace parted, and use it
  instead of parted.  (RHBZ#593511, RHBZ#642821).

-* Hot plugging of disks using QMP.  This would allow more efficient
-  reuse of the appliance in some circumstances: multiple disks
-  (ie. VMs) can be added in turn to the same appliance.  In particular
-  this would help virt-df.
-
-  [Note this requires upstream work on QMP, see:
-  https://www.redhat.com/archives/libguestfs/2011-March/msg00124.html]
-
 See TODO and BUGS files.
--- a/113
+++ b/113
@@ -48,7 +48,6 @@ Ideas for extra commands

  General glibc / core programs:
    chgrp
-    more mk*temp calls

  ext2 properties:
    badblocks
@@ -57,17 +56,23 @@ Ideas for extra commands
    e2image
    e2undo
    filefrag
-    mklost+found

  SELinux:
    chcat
    restorecon
-    ch???
+      [Wanlong Gao submitted patches for restorecon, but
+       there are problems with using the restorecon binary
+       from the host on the guest.  Most of the time it
+       would do more harm than good.]
+    setfiles

  Oddball:
    pivot_root
    fts(3) / ftw(3)

+  sh-in, sh-out: run shell command with large input/output
+  debug sh-in, debug sh-out: debug versions of the above
+
 Other initrd-* commands
 -----------------------

@@ -356,14 +361,14 @@ Interactive disk creator

 An interactive disk creator program.

-Attach method for disconnected operation
----------------------------------------
+Backend for disconnected operation
+----------------------------------

-http://libguestfs.org/guestfs.3.html#guestfs_set_attach_method
+http://libguestfs.org/guestfs.3.html#guestfs_set_backend

 "Librarian" has an idea that he should be able to attach to a regular
 appliance, but disconnect from it and reconnect to it later.  This
-would be some sort of modified attach method (see link above).
+would be some sort of modified backend (see link above).

 The complexity here is that we would no longer have access to
 stdin/stdout (or we'd have to direct that somewhere else).
@@ -377,15 +382,10 @@ virt-sysprep ideas
 ------------------

 - other Spacewalk / RHN IDs (?)
- - Kerberos keys
- - Puppet registration
 - Windows sysprep
   (see: https://github.com/clalancette/oz/blob/e74ce83283d468fd987583d6837b441608e5f8f0/oz/Windows.py )
 - (librarian suggests ...)
-   . install a firstboot script      virt-sysprep --script=/tmp/foo.sh
-   . run an external shell script
   . run external guestfish script   virt-sysprep --fish=/tmp/foo.fish
- - /var/run/* and pam_faillock's data files
 - if drives are encrypted, then dm-crypt key should be changed
   and drives all re-encrypted
 - /etc/pki
@@ -401,6 +401,19 @@ virt-sysprep ideas
 - remove or modify UUIDs in /etc/fstab (eg. on Ubuntu)
   (thanks Joshua Daniel Franklin)

+Kazuo Moriwaka adds:
+
+ - swap devices (both of block device and file) should be wiped. This may
+   good for security purpose, and size.  I found virt-sparsify can clear
+   swap partition.
+ - --script is nice.  Defining default sysprep script directory
+   like /usr/lib/guestfs/sysprep-scripts.d/ may be useful to integrate
+   other package maintainer(or ISV)'s effort.
+ - To achieve better (or crazy) coverage, a simple examination will be
+   help:
+     Install the same kickstart into VM twice, and diff the trees.
+     Many autogenerated IDs and configs can be found :)
+
 As well as 'virt-sysprep' there is a case for a 'virt-customize' tool
 which can customize templated guests.  This would be useful within
 companies/organizations that want to offer multiple guests, but all
@@ -408,14 +421,13 @@ customized with the organization logo etc.  Some ideas:

 - change the background image to some custom desktop
 - change the sign-on messages (/etc/issue.net etc)
- - firstboot script (as suggested by librarian above)
 - Windows login script/service

 Launch remote sessions over ssh
 -------------------------------

 We had an idea you could add a launch method that uses ssh, ie.  all
-febootstrap and qemu commands happen the same as now, but prefixed by
+supermin and qemu commands happen the same as now, but prefixed by
 ssh so it happens on a remote machine.

 Note that proper remote support and integration with libvirt is
@@ -478,6 +490,9 @@ Optimize the appliance

 Pass -cpu host.  Anything else?

+[The libvirt backend uses 'host-model' which is basically
+the same as this]
+
 Sort out partitioning
 ---------------------

@@ -502,3 +517,73 @@ should.  There is a command line tool designed for scripts called
 this approach works, it doesn't solve the MBR problem, so likely we'd
 have to write a library for that (or perhaps go back to sfdisk but
 using a very abstracted interface over sfdisk).
+
+qemu caching
+------------
+
+(Suggested by Paolo Bonzini and Kevin Wolf)
+
+Measure the effect of cache=none, cache=directsync,
+cache=writethrough, cache=writeback.
+
+It's doubtful that using cache=none is useful, since it disables the
+host cache making read-heavy workloads slower (they rely entirely on
+the smaller appliance kernel's cache).  And in libguestfs we don't
+necessarily care about ongoing data integrity while writing, as long
+as data is reliably written out when g.sync, g.shutdown or g.close
+return.  Also in libguestfs we effectively control the whole stack, so
+we can ensure write barriers happen when we want.
+
+libvirt backend
+---------------
+
+Since libguestfs 1.19.24 this mostly works.  Here are some suggested
+items to work on:
+
+ - SELinux labelling of guestfsd.sock, console.sock
+   https://bugzilla.redhat.com/show_bug.cgi?id=842307
+   Once this is fixed, remove <seclabel type=none> from libvirt XML
+
+ - Check feature parity between src/launch-appliance.c and
+   src/launch-libvirt.c.
+
+ - Remote support.  (This requires work on libvirt)
+
+virt-sparsify should use discard
+--------------------------------
+
+This requires some changes to qemu to make discard work properly
+throughout the entire stack.
+
+Reimplement some APIs to avoid protocol limits
+----------------------------------------------
+
+We should reimplement the following APIs to avoid protocol limits.
+These would be changed from daemon_functions to non_daemon_functions,
+with the non-daemon versions implemented using guestfs_upload and
+guestfs_download (and others).  This change should be transparent from
+the p.o.v of the API and ABI.
+
+ - guestfs_readdir
+
+hivex
+-----
+
+Add more of hivex to the API, especially for writing.
+
+Reimplement virt-win-reg to use this API.  (This is difficult because
+the Perl libraries underneath access the hivex API directly).
+
+ruby
+----
+
+Implement blocking calls.  The API for this:
+
+  http://www.spacevatican.org/2012/7/5/whos-afraid-of-the-big-bad-lock/
+
+is very poorly designed and essentially impossible for us to use:
+
+  https://bugs.ruby-lang.org/issues/5543
+
+particularly if we also want to maintain backwards compatibility with
+Ruby 1.8, and/or maintain volatile VALUEs on the stack.
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -18,6 +18,8 @@
 include $(top_srcdir)/subdir-rules.mk

 EXTRA_DIST = \
+	test-virt-alignment-scan.sh \
+	test-virt-alignment-scan-guests.sh \
 	virt-alignment-scan.pod

 CLEANFILES = stamp-virt-alignment-scan.pod
@@ -25,34 +27,46 @@ CLEANFILES = stamp-virt-alignment-scan.pod
 bin_PROGRAMS = virt-alignment-scan

 SHARED_SOURCE_FILES = \
+	../df/domains.c \
+	../df/domains.h \
+	../df/estimate-max-threads.c \
+	../df/estimate-max-threads.h \
+	../df/parallel.c \
+	../df/parallel.h \
 	../fish/config.c \
+	../fish/domain.c \
 	../fish/inspect.c \
 	../fish/keys.c \
 	../fish/options.h \
-	../fish/options.c \
-	../fish/virt.c
+	../fish/options.c

 virt_alignment_scan_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
-	domains.c \
-	scan.c \
-	scan.h
+	scan.c

-virt_alignment_scan_CFLAGS = \
+virt_alignment_scan_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
+	-DGUESTFS_PRIVATE=1 \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
+	-I$(top_srcdir)/df \
 	-I$(top_srcdir)/fish \
 	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+	-DLOCALEBASEDIR=\""$(datadir)/locale"\"
+
+virt_alignment_scan_CFLAGS = \
+	-pthread \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(GPROF_CFLAGS) $(GCOV_CFLAGS) \
 	$(LIBCONFIG_CFLAGS) \
 	$(LIBVIRT_CFLAGS)

 virt_alignment_scan_LDADD = \
 	$(LIBCONFIG_LIBS) \
+	$(top_builddir)/src/libutils.la \
 	$(top_builddir)/src/libguestfs.la \
-	../gnulib/lib/libgnu.la \
+	$(LIBXML2_LIBS) \
 	$(LIBVIRT_LIBS) \
+	../gnulib/lib/libgnu.la \
 	-lm

 # Manual pages and HTML files for the website.
@@ -62,18 +76,24 @@ noinst_DATA = $(top_builddir)/html/virt-alignment-scan.1.html
 virt-alignment-scan.1 $(top_builddir)/html/virt-alignment-scan.1.html: stamp-virt-alignment-scan.pod

 stamp-virt-alignment-scan.pod: virt-alignment-scan.pod
-	$(top_builddir)/podwrapper.sh \
+	$(PODWRAPPER) \
 	  --man virt-alignment-scan.1 \
 	  --html $(top_builddir)/html/virt-alignment-scan.1.html \
+	  --license GPLv2+ \
 	  $<
 	touch $@

 # Tests.

-# random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
+TESTS_ENVIRONMENT = $(top_builddir)/run --test

-# TESTS_ENVIRONMENT = \
-# 	MALLOC_PERTURB_=$(random_val) \
-# 	$(top_builddir)/run
+TESTS =

-# TESTS = test-virt-alignment-scan.sh
+if ENABLE_APPLIANCE
+TESTS += \
+	test-virt-alignment-scan.sh \
+	test-virt-alignment-scan-guests.sh
+endif
+
+check-valgrind:
+	$(MAKE) VG="$(top_builddir)/run @VG@" check
--- a/align/domains.c
+++ b/align/domains.c
@@ -1,360 +0,0 @@
-/* virt-alignment-scan
- * Copyright (C) 2012 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libintl.h>
-#include <assert.h>
-
-#ifdef HAVE_LIBVIRT
-#include <libvirt/libvirt.h>
-#include <libvirt/virterror.h>
-#endif
-
-#include "progname.h"
-
-#if defined(HAVE_LIBVIRT) && defined(HAVE_LIBXML2)
-#define GUESTFS_PRIVATE_FOR_EACH_DISK 1
-#endif
-
-#include "guestfs.h"
-#include "options.h"
-#include "scan.h"
-
-#if defined(HAVE_LIBVIRT) && defined(HAVE_LIBXML2)
-
-/* The list of domains and disks that we build up in
- * get_domains_from_libvirt.
- */
-struct disk {
-  struct disk *next;
-  char *filename;
-  char *format; /* could be NULL */
-};
-
-struct domain {
-  char *name;
-  char *uuid;
-  struct disk *disks;
-  size_t nr_disks;
-};
-
-struct domain *domains = NULL;
-size_t nr_domains;
-
-static int
-compare_domain_names (const void *p1, const void *p2)
-{
-  const struct domain *d1 = p1;
-  const struct domain *d2 = p2;
-
-  return strcmp (d1->name, d2->name);
-}
-
-static void
-free_domain (struct domain *domain)
-{
-  struct disk *disk, *next;
-
-  for (disk = domain->disks; disk; disk = next) {
-    next = disk->next;
-    free (disk->filename);
-    free (disk->format);
-    free (disk);
-  }
-
-  free (domain->name);
-  free (domain->uuid);
-}
-
-static void add_domains_by_id (virConnectPtr conn, int *ids, size_t n);
-static void add_domains_by_name (virConnectPtr conn, char **names, size_t n);
-static void add_domain (virDomainPtr dom);
-static int add_disk (guestfs_h *g, const char *filename, const char *format, int readonly, void *domain_vp);
-static size_t add_disks_to_handle_reverse (struct disk *disk, size_t *errors_r);
-static void reset_guestfs_handle (void);
-
-void
-get_domains_from_libvirt (int uuid, size_t *worst_alignment_ptr)
-{
-  virErrorPtr err;
-  virConnectPtr conn;
-  int n;
-  size_t i, count, errors;
-  const char *prefix;
-
-  nr_domains = 0;
-  domains = NULL;
-
-  /* Get the list of all domains. */
-  conn = virConnectOpenReadOnly (libvirt_uri);
-  if (!conn) {
-    err = virGetLastError ();
-    fprintf (stderr,
-             _("%s: could not connect to libvirt (code %d, domain %d): %s\n"),
-             program_name, err->code, err->domain, err->message);
-    exit (EXIT_FAILURE);
-  }
-
-  n = virConnectNumOfDomains (conn);
-  if (n == -1) {
-    err = virGetLastError ();
-    fprintf (stderr,
-             _("%s: could not get number of running domains (code %d, domain %d): %s\n"),
-             program_name, err->code, err->domain, err->message);
-    exit (EXIT_FAILURE);
-  }
-
-  int ids[n];
-  n = virConnectListDomains (conn, ids, n);
-  if (n == -1) {
-    err = virGetLastError ();
-    fprintf (stderr,
-             _("%s: could not list running domains (code %d, domain %d): %s\n"),
-             program_name, err->code, err->domain, err->message);
-    exit (EXIT_FAILURE);
-  }
-
-  add_domains_by_id (conn, ids, n);
-
-  n = virConnectNumOfDefinedDomains (conn);
-  if (n == -1) {
-    err = virGetLastError ();
-    fprintf (stderr,
-             _("%s: could not get number of inactive domains (code %d, domain %d): %s\n"),
-             program_name, err->code, err->domain, err->message);
-    exit (EXIT_FAILURE);
-  }
-
-  char *names[n];
-  n = virConnectListDefinedDomains (conn, names, n);
-  if (n == -1) {
-    err = virGetLastError ();
-    fprintf (stderr,
-             _("%s: could not list inactive domains (code %d, domain %d): %s\n"),
-             program_name, err->code, err->domain, err->message);
-    exit (EXIT_FAILURE);
-  }
-
-  add_domains_by_name (conn, names, n);
-
-  /* You must free these even though the libvirt documentation doesn't
-   * mention it.
-   */
-  for (i = 0; i < (size_t) n; ++i)
-    free (names[i]);
-
-  virConnectClose (conn);
-
-  /* No domains? */
-  if (nr_domains == 0)
-    return;
-
-  /* Sort the domains alphabetically by name for display. */
-  qsort (domains, nr_domains, sizeof (struct domain), compare_domain_names);
-
-  errors = 0;
-  for (i = 0; i < nr_domains; ++i) {
-    if (domains[i].disks == NULL)
-      continue;
-
-    count = add_disks_to_handle_reverse (domains[i].disks, &errors);
-    if (count == 0)
-      continue;
-
-    if (guestfs_launch (g) == -1)
-      exit (EXIT_FAILURE);
-
-    prefix = !uuid ? domains[i].name : domains[i].uuid;
-
-    /* Perform the scan. */
-    scan (worst_alignment_ptr, prefix);
-
-    if (i < nr_domains - 1)
-      reset_guestfs_handle ();
-  }
-
-  /* Free up domains structure. */
-  for (i = 0; i < nr_domains; ++i)
-    free_domain (&domains[i]);
-  free (domains);
-
-  if (errors > 0) {
-    fprintf (stderr, _("%s: failed to analyze a disk, see error(s) above\n"),
-             program_name);
-    exit (EXIT_FAILURE);
-  }
-}
-
-static void
-add_domains_by_id (virConnectPtr conn, int *ids, size_t n)
-{
-  size_t i;
-  virDomainPtr dom;
-
-  for (i = 0; i < n; ++i) {
-    if (ids[i] != 0) {          /* RHBZ#538041 */
-      dom = virDomainLookupByID (conn, ids[i]);
-      if (dom) { /* transient errors are possible here, ignore them */
-        add_domain (dom);
-        virDomainFree (dom);
-      }
-    }
-  }
-}
-
-static void
-add_domains_by_name (virConnectPtr conn, char **names, size_t n)
-{
-  size_t i;
-  virDomainPtr dom;
-
-  for (i = 0; i < n; ++i) {
-    dom = virDomainLookupByName (conn, names[i]);
-    if (dom) { /* transient errors are possible here, ignore them */
-      add_domain (dom);
-      virDomainFree (dom);
-    }
-  }
-}
-
-static void
-add_domain (virDomainPtr dom)
-{
-  struct domain *domain;
-
-  domains = realloc (domains, (nr_domains + 1) * sizeof (struct domain));
-  if (domains == NULL) {
-    perror ("realloc");
-    exit (EXIT_FAILURE);
-  }
-
-  domain = &domains[nr_domains];
-  nr_domains++;
-
-  domain->name = strdup (virDomainGetName (dom));
-  if (domain->name == NULL) {
-    perror ("strdup");
-    exit (EXIT_FAILURE);
-  }
-
-  char uuid[VIR_UUID_STRING_BUFLEN];
-  if (virDomainGetUUIDString (dom, uuid) == 0) {
-    domain->uuid = strdup (uuid);
-    if (domain->uuid == NULL) {
-      perror ("strdup");
-      exit (EXIT_FAILURE);
-    }
-  }
-  else
-    domain->uuid = NULL;
-
-  domain->disks = NULL;
-  int n = guestfs___for_each_disk (g, dom, add_disk, domain);
-  if (n == -1)
-    exit (EXIT_FAILURE);
-  domain->nr_disks = n;
-}
-
-static int
-add_disk (guestfs_h *g,
-          const char *filename, const char *format, int readonly,
-          void *domain_vp)
-{
-  struct domain *domain = domain_vp;
-  struct disk *disk;
-
-  disk = malloc (sizeof *disk);
-  if (disk == NULL) {
-    perror ("malloc");
-    return -1;
-  }
-
-  disk->next = domain->disks;
-  domain->disks = disk;
-
-  disk->filename = strdup (filename);
-  if (disk->filename == NULL) {
-    perror ("malloc");
-    return -1;
-  }
-  if (format) {
-    disk->format = strdup (format);
-    if (disk->format == NULL) {
-      perror ("malloc");
-      return -1;
-    }
-  }
-  else
-    disk->format = NULL;
-
-  return 0;
-}
-
-static size_t
-add_disks_to_handle_reverse (struct disk *disk, size_t *errors_r)
-{
-  size_t nr_disks_added;
-
-  if (disk == NULL)
-    return 0;
-
-  nr_disks_added = add_disks_to_handle_reverse (disk->next, errors_r);
-
-  struct guestfs_add_drive_opts_argv optargs = { .bitmask = 0 };
-
-  optargs.bitmask |= GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK;
-  optargs.readonly = 1;
-
-  if (disk->format) {
-    optargs.bitmask |= GUESTFS_ADD_DRIVE_OPTS_FORMAT_BITMASK;
-    optargs.format = disk->format;
-  }
-
-  if (guestfs_add_drive_opts_argv (g, disk->filename, &optargs) == -1) {
-    (*errors_r)++;
-    return nr_disks_added;
-  }
-
-  return nr_disks_added+1;
-}
-
-/* Close and reopen the libguestfs handle. */
-static void
-reset_guestfs_handle (void)
-{
-  /* Copy the settings from the old handle. */
-  int verbose = guestfs_get_verbose (g);
-  int trace = guestfs_get_trace (g);
-
-  guestfs_close (g);
-
-  g = guestfs_create ();
-  if (g == NULL) {
-    fprintf (stderr, _("guestfs_create: failed to create handle\n"));
-    exit (EXIT_FAILURE);
-  }
-
-  guestfs_set_verbose (g, verbose);
-  guestfs_set_trace (g, trace);
-}
-
-#endif
--- a/align/scan.c
+++ b/align/scan.c
@@ -29,17 +29,29 @@
 #include <assert.h>
 #include <libintl.h>

+#include <pthread.h>
+
 #ifdef HAVE_LIBVIRT
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #endif

 #include "progname.h"
-#include "c-ctype.h"

 #include "guestfs.h"
 #include "options.h"
-#include "scan.h"
+#include "parallel.h"
+#include "domains.h"
+
+/* This just needs to be larger than any alignment we care about. */
+static size_t worst_alignment = UINT_MAX;
+static pthread_mutex_t worst_alignment_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+static int scan (guestfs_h *g, const char *prefix, FILE *fp);
+
+#ifdef HAVE_LIBVIRT
+static int scan_work (guestfs_h *g, size_t i, FILE *fp);
+#endif

 /* These globals are shared with options.c. */
 guestfs_h *g;
@@ -53,12 +65,7 @@ const char *libvirt_uri = NULL;
 int inspector = 0;

 static int quiet = 0;           /* --quiet */
-
-static inline char *
-bad_cast (char const *s)
-{
-  return (char *) s;
-}
+static int uuid = 0;            /* --uuid */

 static void __attribute__((noreturn))
 usage (int status)
@@ -79,6 +86,7 @@ usage (int status)
             "  -d|--domain guest    Add disks from libvirt guest\n"
             "  --format[=raw|..]    Force disk format for -a option\n"
             "  --help               Display brief help\n"
+             "  -P nr_threads        Use at most nr_threads\n"
             "  -q|--quiet           No output, just exit code\n"
             "  -v|--verbose         Verbose messages\n"
             "  -V|--version         Display version and exit\n"
@@ -102,13 +110,14 @@ main (int argc, char *argv[])

  enum { HELP_OPTION = CHAR_MAX + 1 };

-  static const char *options = "a:c:d:qvVx";
+  static const char *options = "a:c:d:P:qvVx";
  static const struct option long_options[] = {
    { "add", 1, 0, 'a' },
    { "connect", 1, 0, 'c' },
    { "domain", 1, 0, 'd' },
    { "format", 2, 0, 0 },
    { "help", 0, 0, HELP_OPTION },
+    { "long-options", 0, 0, 0 },
    { "quiet", 0, 0, 'q' },
    { "uuid", 0, 0, 0, },
    { "verbose", 0, 0, 'v' },
@@ -120,10 +129,9 @@ main (int argc, char *argv[])
  const char *format = NULL;
  int c;
  int option_index;
-  int uuid = 0;
-  /* This just needs to be larger than any alignment we care about. */
-  size_t worst_alignment = UINT_MAX;
  int exit_code;
+  size_t max_threads = 0;
+  int r;

  g = guestfs_create ();
  if (g == NULL) {
@@ -131,7 +139,7 @@ main (int argc, char *argv[])
    exit (EXIT_FAILURE);
  }

-  argv[0] = bad_cast (program_name);
+  argv[0] = (char *) program_name;

  for (;;) {
    c = getopt_long (argc, argv, options, long_options, &option_index);
@@ -139,7 +147,9 @@ main (int argc, char *argv[])

    switch (c) {
    case 0:			/* options which are long only */
-      if (STREQ (long_options[option_index].name, "format")) {
+      if (STREQ (long_options[option_index].name, "long-options"))
+        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "format")) {
        if (!optarg || STREQ (optarg, ""))
          format = NULL;
        else
@@ -165,6 +175,13 @@ main (int argc, char *argv[])
      OPTION_d;
      break;

+    case 'P':
+      if (sscanf (optarg, "%zu", &max_threads) != 1) {
+        fprintf (stderr, _("%s: -P option is not numeric\n"), program_name);
+        exit (EXIT_FAILURE);
+      }
+      break;
+
    case 'q':
      quiet = 1;
      break;
@@ -201,16 +218,25 @@ main (int argc, char *argv[])
  if (optind != argc)
    usage (EXIT_FAILURE);

-  /* The user didn't specify any drives to scan. */
+  /* virt-alignment-scan has two modes.  If the user didn't specify
+   * any drives, then we do the scan on every libvirt guest.  That's
+   * the if-clause below.  If the user specified domains/drives, then
+   * we assume they belong to a single guest.  That's the else-clause
+   * below.
+   */
  if (drvs == NULL) {
 #if defined(HAVE_LIBVIRT) && defined(HAVE_LIBXML2)
-    get_domains_from_libvirt (uuid, &worst_alignment);
+    get_all_libvirt_domains (libvirt_uri);
+    r = start_threads (max_threads, g, scan_work);
+    free_domains ();
+    if (r == -1)
+      exit (EXIT_FAILURE);
 #else
    fprintf (stderr, _("%s: compiled without support for libvirt and/or libxml2.\n"),
             program_name);
    exit (EXIT_FAILURE);
 #endif
-  } else {
+  } else {                      /* Single guest. */
    if (uuid) {
      fprintf (stderr, _("%s: --uuid option cannot be used with -a or -d\n"),
               program_name);
@@ -227,9 +253,12 @@ main (int argc, char *argv[])
    free_drives (drvs);

    /* Perform the scan. */
-    scan (&worst_alignment, NULL);
+    r = scan (g, NULL, stdout);

    guestfs_close (g);
+
+    if (r == -1)
+      exit (EXIT_FAILURE);
  }

  /* Decide on an appropriate exit code. */
@@ -243,30 +272,30 @@ main (int argc, char *argv[])
  exit (exit_code);
 }

-void
-scan (size_t *worst_alignment, const char *prefix)
+static int
+scan (guestfs_h *g, const char *prefix, FILE *fp)
 {
-  char **devices;
  size_t i, j;
  size_t alignment;
  uint64_t start;
-  struct guestfs_partition_list *parts;
+  int err;

-  devices = guestfs_list_devices (g);
+  CLEANUP_FREE_STRING_LIST char **devices = guestfs_list_devices (g);
  if (devices == NULL)
-    exit (EXIT_FAILURE);
+    return -1;

  for (i = 0; devices[i] != NULL; ++i) {
-    parts = guestfs_part_list (g, devices[i]);
+    CLEANUP_FREE char *name = NULL;
+
+    CLEANUP_FREE_PARTITION_LIST struct guestfs_partition_list *parts =
+      guestfs_part_list (g, devices[i]);
    if (parts == NULL)
-      exit (EXIT_FAILURE);
+      return -1;

    /* Canonicalize the name of the device for printing. */
-    if (STRPREFIX (devices[i], "/dev/") &&
-        (devices[i][5] == 'h' || devices[i][5] == 'v') &&
-        devices[i][6] == 'd' &&
-        c_isalpha (devices[i][7]))
-      devices[i][5] = 's';
+    name = guestfs_canonical_device_name (g, devices[i]);
+    if (name == NULL)
+      return -1;

    for (j = 0; j < parts->len; ++j) {
      /* Start offset of the partition in bytes. */
@@ -274,10 +303,10 @@ scan (size_t *worst_alignment, const char *prefix)

      if (!quiet) {
        if (prefix)
-          printf ("%s:", prefix);
+          fprintf (fp, "%s:", prefix);

-        printf ("%s%d %12" PRIu64 " ",
-                devices[i], (int) parts->val[j].part_num, start);
+        fprintf (fp, "%s%d %12" PRIu64 " ",
+                 name, (int) parts->val[j].part_num, start);
      }

      /* What's the alignment? */
@@ -289,30 +318,60 @@ scan (size_t *worst_alignment, const char *prefix)

      if (!quiet) {
        if (alignment < 10)
-          printf ("%12" PRIu64 "    ", UINT64_C(1) << alignment);
+          fprintf (fp, "%12" PRIu64 "    ", UINT64_C(1) << alignment);
        else if (alignment < 64)
-          printf ("%12" PRIu64 "K   ", UINT64_C(1) << (alignment - 10));
+          fprintf (fp, "%12" PRIu64 "K   ", UINT64_C(1) << (alignment - 10));
        else
-          printf ("- ");
+          fprintf (fp, "- ");
      }

-      if (alignment < *worst_alignment)
-        *worst_alignment = alignment;
+      err = pthread_mutex_lock (&worst_alignment_mutex);
+      assert (err == 0);
+      if (alignment < worst_alignment)
+        worst_alignment = alignment;
+      err = pthread_mutex_unlock (&worst_alignment_mutex);
+      assert (err == 0);

      if (alignment < 12) {     /* Bad in general: < 4K alignment */
        if (!quiet)
-          printf ("bad (%s)\n", _("alignment < 4K"));
+          fprintf (fp, "bad (%s)\n", _("alignment < 4K"));
      } else if (alignment < 16) { /* Bad on NetApps: < 64K alignment */
        if (!quiet)
-          printf ("bad (%s)\n", _("alignment < 64K"));
+          fprintf (fp, "bad (%s)\n", _("alignment < 64K"));
      } else {
        if (!quiet)
-          printf ("ok\n");
+          fprintf (fp, "ok\n");
      }
    }
-
-    guestfs_free_partition_list (parts);
-    free (devices[i]);
  }
-  free (devices);
+
+  return 0;
 }
+
+#if defined(HAVE_LIBVIRT)
+
+/* The multi-threaded version.  This callback is called from the code
+ * in "parallel.c".
+ */
+
+static int
+scan_work (guestfs_h *g, size_t i, FILE *fp)
+{
+  struct guestfs___add_libvirt_dom_argv optargs;
+
+  optargs.bitmask =
+    GUESTFS___ADD_LIBVIRT_DOM_READONLY_BITMASK |
+    GUESTFS___ADD_LIBVIRT_DOM_READONLYDISK_BITMASK;
+  optargs.readonly = 1;
+  optargs.readonlydisk = "read";
+
+  if (guestfs___add_libvirt_dom (g, domains[i].dom, &optargs) == -1)
+    return -1;
+
+  if (guestfs_launch (g) == -1)
+    return -1;
+
+  return scan (g, !uuid ? domains[i].name : domains[i].uuid, fp);
+}
+
+#endif /* HAVE_LIBVIRT */
--- a/align/test-virt-alignment-scan-guests.sh
+++ b/align/test-virt-alignment-scan-guests.sh
@@ -0,0 +1,35 @@
+#!/bin/bash -
+# libguestfs
+# Copyright (C) 2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+export LANG=C
+
+if [ -n "$SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH" ]; then
+    echo "$0: skipping test because SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH is set."
+    exit 77
+fi
+
+guestsdir="$(cd ../tests/guests && pwd)"
+libvirt_uri="test://$guestsdir/guests-all-good.xml"
+
+$VG ./virt-alignment-scan -c "$libvirt_uri"
+r=$?
+
+# 0, 2 and 3 are reasonable non-error exit codes.  Others are errors.
+if [ $r -ne 0 -a $r -ne 2 -a $r -ne 3 ]; then
+    exit $r
+fi
--- a/align/test-virt-alignment-scan.sh
+++ b/align/test-virt-alignment-scan.sh
@@ -0,0 +1,27 @@
+#!/bin/bash -
+# libguestfs
+# Copyright (C) 2012 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+export LANG=C
+
+$VG ./virt-alignment-scan -a ../tests/guests/fedora.img
+r=$?
+
+# 0, 2 and 3 are reasonable non-error exit codes.  Others are errors.
+if [ $r -ne 0 -a $r -ne 2 -a $r -ne 3 ]; then
+    exit $r
+fi
--- a/align/virt-alignment-scan.pod
+++ b/align/virt-alignment-scan.pod
@@ -158,6 +158,18 @@ If you have untrusted raw-format guest disk images, you should use
 this option to specify the disk format.  This avoids a possible
 security problem with malicious guests (CVE-2010-3851).

+=item B<-P> nr_threads
+
+Since libguestfs 1.22, virt-alignment-scan is multithreaded and
+examines guests in parallel.  By default the number of threads to use
+is chosen based on the amount of free memory available at the time
+that virt-alignment-scan is started.  You can force
+virt-alignment-scan to use at most C<nr_threads> by using the I<-P>
+option.
+
+Note that I<-P 0> means to autodetect, and I<-P 1> means to use a
+single thread.
+
 =item B<-q>

 =item B<--quiet>
@@ -388,17 +400,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT

 Copyright (C) 2011 Red Hat Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- a/appliance/99-guestfs-serial.rules
+++ b/appliance/99-guestfs-serial.rules
@@ -0,0 +1,17 @@
+# For libguestfs, create /dev/disk/guestfs/<serial>
+# and /dev/disk/guestfs/<serial><partnum>
+
+KERNEL=="sd*[!0-9]", ENV{DEVTYPE}=="disk", ENV{ID_SCSI_SERIAL}=="?*", \
+  SYMLINK+="disk/guestfs/$env{ID_SCSI_SERIAL}"
+KERNEL=="sd*", ENV{DEVTYPE}=="partition", ENV{ID_SCSI_SERIAL}=="?*", \
+  SYMLINK+="disk/guestfs/$env{ID_SCSI_SERIAL}%n"
+
+# As written, it's likely the above only works with virtio-scsi
+# because ID_SCSI_SERIAL is specific to the output of the 'scsi_id'
+# program.  The following will not work because ID_SERIAL contains
+# some unwanted text.
+
+#KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", \
+#  SYMLINK+="disk/guestfs/$env{ID_SERIAL}"
+#KERNEL=="vd*[0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", \
+#  SYMLINK+="disk/guestfs/$env{ID_SERIAL}%n"
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -15,9 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+# Old RHEL 5 autoconf doesn't have builddir.
+builddir ?= .
+
 include $(top_srcdir)/subdir-rules.mk

 EXTRA_DIST = \
+	99-guestfs-serial.rules \
 	excludelist.in \
 	guestfsd.suppressions \
 	init \
@@ -31,34 +35,46 @@ superminfsdir = $(libdir)/guestfs/supermin.d

 fs_DATA =
 superminfs_DATA = \
-	supermin.d/base.img \
-	supermin.d/daemon.img \
 	supermin.d/init.img \
-	supermin.d/hostfiles
+	supermin.d/udev-rules.img

-# This used to be a configure-generated file (as is update.sh still).
-# However config.status always touches the destination file, which
-# means the appliance got rebuilt too often.
-make.sh: make.sh.in
+if ENABLE_DAEMON
+superminfs_DATA += \
+	supermin.d/daemon.img
+endif
+
+if ENABLE_APPLIANCE
+superminfs_DATA += \
+	supermin.d/base.img \
+	supermin.d/hostfiles
+endif
+
+# This used to be a configure-generated file.  However config.status
+# always touches the destination file, which means the appliance got
+# rebuilt too often.
+make.sh: make.sh.in $(top_builddir)/config.log $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  ./config.status --file=appliance/$@-t:appliance/$<
 	chmod +x $@-t
-	mv $@-t $@
+	cmp -s $@ $@-t || mv $@-t $@
+	rm -f $@-t

-PACKAGELIST_CPP_FLAGS = -D$(DISTRO)=1
+PACKAGELIST_CPP_FLAGS = -D$(DISTRO)=1 -DEXTRA_PACKAGES="$(EXTRA_PACKAGES)"
 if VALGRIND_DAEMON
 PACKAGELIST_CPP_FLAGS += -DVALGRIND_DAEMON=1
 endif

-packagelist: packagelist.in
+packagelist: packagelist.in Makefile
 	cpp -undef $(PACKAGELIST_CPP_FLAGS) < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
-	mv $@-t $@
+	cmp -s $@ $@-t || mv $@-t $@
+	rm -f $@-t

-excludelist: excludelist.in
+excludelist: excludelist.in Makefile
 	cpp -undef $(PACKAGELIST_CPP_FLAGS) < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
-	mv $@-t $@
+	cmp -s $@ $@-t || mv $@-t $@
+	rm -f $@-t

 supermin.d/base.img supermin.d/hostfiles: stamp-supermin
 stamp-supermin: make.sh packagelist excludelist
@@ -70,12 +86,12 @@ stamp-supermin: make.sh packagelist excludelist
 supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions
 	mkdir -p supermin.d
 	rm -f $@ $@-t
-	rm -rf tmp
-	mkdir -p tmp$(DAEMON_SUPERMIN_DIR) tmp/etc
-	ln ../daemon/guestfsd tmp$(DAEMON_SUPERMIN_DIR)/guestfsd
-	ln $(srcdir)/guestfsd.suppressions tmp/etc/guestfsd.suppressions
-	( cd tmp && find | cpio --quiet -o -H newc ) > $@-t
-	rm -rf tmp
+	rm -rf tmp-d
+	mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc
+	ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd
+	ln $(srcdir)/guestfsd.suppressions tmp-d/etc/guestfsd.suppressions
+	( cd tmp-d && find | cpio --quiet -o -H newc ) > $@-t
+	rm -rf tmp-d
 	mv $@-t $@

 supermin.d/init.img: init
@@ -85,6 +101,25 @@ supermin.d/init.img: init
 	echo "init" | cpio --quiet -o -H newc > $@-t
 	mv $@-t $@

+# We should put this file in /lib/udev/rules.d, but put it in /etc so
+# we don't have to deal with all the UsrMove crap in Fedora.
+supermin.d/udev-rules.img: 99-guestfs-serial.rules
+	mkdir -p supermin.d
+	rm -f $@ $@-t
+	rm -rf tmp-u
+	mkdir -p tmp-u/etc/udev/rules.d
+	for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done
+	( cd tmp-u && find | cpio --quiet -o -H newc ) > $@-t
+	rm -rf tmp-u
+	mv $@-t $@
+
+# If installing the daemon, install the udev rules too.
+
+if INSTALL_DAEMON
+udevrulesdir = /lib/udev/rules.d
+udevrules_DATA = 99-guestfs-serial.rules
+endif
+
 # libguestfs-make-fixed-appliance script and man page.

 sbin_SCRIPTS = libguestfs-make-fixed-appliance
@@ -94,9 +129,10 @@ man_MANS = libguestfs-make-fixed-appliance.1
 libguestfs-make-fixed-appliance.1 $(top_builddir)/html/libguestfs-make-fixed-appliance.1.html: stamp-libguestfs-make-fixed-appliance.pod

 stamp-libguestfs-make-fixed-appliance.pod: libguestfs-make-fixed-appliance.pod
-	$(top_builddir)/podwrapper.sh \
+	$(PODWRAPPER) \
 	  --man libguestfs-make-fixed-appliance.1 \
 	  --html $(top_builddir)/html/libguestfs-make-fixed-appliance.1.html \
+	  --license GPLv2+ \
 	  $<
 	touch $@

--- a/appliance/excludelist.in
+++ b/appliance/excludelist.in
@@ -32,19 +32,24 @@
 /* Plymouth is a graphical boot thing - not needed. */
 ^plymouth

-/* Linux firmware.  Note that febootstrap itself excludes the kernel
- * which is also not needed since we get the kernel, modules etc
- * from the host at appliance boot.
- */
+/* Linux firmware. */
 ^linux-firmware

 /* Keyboard maps - appliance is not interactive. */
 ^kbd-misc

 #ifdef REDHAT
+
+/* Linux kernel.  febootstrap <= 3.18 used to exclude the kernel
+ * package (only) by default, but since 3.19 it doesn't do this any
+ * longer.
+ */
+^kernel
+
 ^fedora-logos
 ^redhat-logos
 ^dracut
+
 #endif

 #ifdef DEBIAN
--- a/appliance/init
+++ b/appliance/init
@@ -10,6 +10,16 @@ RUNLEVEL=S
 PREVLEVEL=N
 export RUNLEVEL PREVLEVEL

+# Try to print a stack trace for segfaults inside the appliance.
+for d in /lib64 /lib; do
+  f=$d/libSegFault.so
+  if [ -f "$f" ]; then
+    LD_PRELOAD=$f
+    export LD_PRELOAD
+    break
+  fi
+done
+
 mkdir -p /sysroot

 if [ ! -d /proc ]; then rm -f /proc; fi
@@ -18,6 +28,9 @@ mount -t proc /proc /proc
 if [ ! -d /sys ]; then rm -f /sys; fi
 mkdir -p /sys
 mount -t sysfs /sys /sys
+# taken from initramfs-tools/init --Hilko Bengen
+mkdir -p /run
+mount -t tmpfs -o "nosuid,size=20%,mode=0755" tmpfs /run
 mkdir -p /run/lock

 # devtmpfs is required since udev 176
@@ -31,36 +44,39 @@ if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
  fi
 elif [ -x /sbin/start_udev ] && /sbin/start_udev; then
  :
-elif [ -x /sbin/udevd ]; then
-  echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-  /sbin/udevd --daemon
-  udevadm trigger
-  udevadm settle
-elif [ -x /lib/udev/udevd ]; then
-  echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-  /lib/udev/udevd --daemon
-  udevadm trigger
-  udevadm settle
 else
-  echo No udev, creating /dev manually
-  mount -t tmpfs none /dev
-  mkdir /dev/pts /dev/shm /dev/mapper
-  mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
-  # Must do each MAKEDEV individually, because if one device fails,
-  # MAKEDEV will quit without creating the rest (RHBZ#507374).
-  for dev in mem null port zero core full ram tty console fd \
-    hda hdb hdc hdd sda sdb sdc sdd loop sd; do
-    MAKEDEV $dev ||:
+  # Find udevd and run it directly.
+  for f in /sbin/udevd /lib/udev/udevd \
+      /lib/systemd/systemd-udevd /usr/lib/systemd/systemd-udevd \
+      /usr/lib/udev/udevd; do
+    if [ -x "$f" ]; then UDEVD="$f"; fi
  done
-  mknod /dev/ptmx c 5 2;    chmod 0666 /dev/ptmx
-  mknod /dev/random c 1 8;  chmod 0666 /dev/random
-  mknod /dev/urandom c 1 9; chmod 0444 /dev/urandom
-  ln -sf /proc/self/fd/0 /dev/stdin
-  ln -sf /proc/self/fd/1 /dev/stdout
-  ln -sf /proc/self/fd/2 /dev/stderr
+  if [ -n "$UDEVD" ]; then
+    echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+    $UDEVD --daemon
+    udevadm trigger
+    udevadm settle --timeout=600
+  else
+    echo No udevd, creating /dev manually.
+    mount -t tmpfs none /dev
+    mkdir /dev/pts /dev/shm /dev/mapper
+    mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts
+    # Must do each MAKEDEV individually, because if one device fails,
+    # MAKEDEV will quit without creating the rest (RHBZ#507374).
+    for dev in mem null port zero core full ram tty console fd \
+      hda hdb hdc hdd sda sdb sdc sdd loop sd; do
+      MAKEDEV $dev ||:
+    done
+    mknod /dev/ptmx c 5 2;    chmod 0666 /dev/ptmx
+    mknod /dev/random c 1 8;  chmod 0666 /dev/random
+    mknod /dev/urandom c 1 9; chmod 0444 /dev/urandom
+    ln -sf /proc/self/fd/0 /dev/stdin
+    ln -sf /proc/self/fd/1 /dev/stdout
+    ln -sf /proc/self/fd/2 /dev/stderr

-  modprobe virtio_pci
-  modprobe virtio_net
+    modprobe virtio_pci
+    modprobe virtio_net
+  fi
 fi

 if grep -sq selinux=1 /proc/cmdline; then
@@ -88,6 +104,9 @@ modprobe dm_mod ||:
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure

+# Scan for Windows dynamic disks.
+ldmtool create all
+
 # Improve virtio-blk performance (RHBZ#509383).
 for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done

--- a/appliance/libguestfs-make-fixed-appliance.in
+++ b/appliance/libguestfs-make-fixed-appliance.in
@@ -103,11 +103,9 @@ mkdir -p "$outputdir"
 guestfish -a /dev/null run

 # Find the location of the appliance.
-if [ -n "$TMPDIR" ]; then
-    appliancedir="$TMPDIR/.guestfs-$(id -u)"
-else
-    appliancedir="/var/tmp/.guestfs-$(id -u)"
-fi
+cachedir="$(guestfish get-cachedir)"
+euid="$(id -u)"
+appliancedir="$cachedir/.guestfs-$euid"

 cp "$appliancedir/kernel" "$outputdir/kernel"
 cp "$appliancedir/initrd" "$outputdir/initrd"
@@ -130,7 +128,7 @@ Then copy all four files:

 into a directory somewhere, eg. /usr/local/lib/guestfs/appliance/

-Then build libguestfs (>= 1.16.7 or >= 1.17.10) from source, disabling
+Then build libguestfs (>= 1.16.7 or >= 1.18) from source, disabling
 the normal appliance and daemon:

  ./configure --disable-appliance --disable-daemon
--- a/appliance/libguestfs-make-fixed-appliance.pod
+++ b/appliance/libguestfs-make-fixed-appliance.pod
@@ -15,11 +15,33 @@ libguestfs-make-fixed-appliance - Make a "fixed appliance" for libguestfs
 libguestfs-make-fixed-appliance lets you make a pre-built binary
 appliance for libguestfs.

-B<Note that ordinary users should not need to run this tool>.  The
-only reason to use it is if you want to make a self-contained
-libguestfs appliance that can be copied to another machine or platform
-that doesn't support L<febootstrap(8)>.  To understand why you might
-need to use this tool, read the section L</FIXED APPLIANCE> below.
+B<Note that ordinary users should not need to run this tool>.
+
+Some reasons why you I<might> want to use this include:
+
+=over 4
+
+=item *
+
+You want to make a self-contained libguestfs appliance that can be
+copied to another machine or platform that doesn't support
+L<supermin(8)>.
+
+=item *
+
+You have multiple users on the same machine and want to avoid the
+storage duplication and start-up overhead of having multiple cached
+copies of the appliance.
+
+=item *
+
+You want to have very predictable performance from libguestfs (see
+L<guestfs-performance(1)>).
+
+=back
+
+For deeper understanding of why you might need this tool, read the
+section L</FIXED APPLIANCE> below.

 Instead of running this tool, you can download fixed appliances from
 L<http://libguestfs.org/download/binaries/appliance/>.  These
@@ -107,21 +129,21 @@ looking for an appliance.  The path is built into libguestfs, or can
 be set using the C<LIBGUESTFS_PATH> environment variable.

 Normally a supermin appliance is located on this path (see
-L<febootstrap(8)/SUPERMIN APPLIANCE>).  libguestfs reconstructs this
-into a full appliance by running L<febootstrap-supermin-helper(8)>.
+L<supermin(8)/SUPERMIN APPLIANCE>).  libguestfs reconstructs this
+into a full appliance by running L<supermin-helper(8)>.

 However, a simpler "fixed appliance" can also be used.  libguestfs
 detects this by looking for a directory on the path containing four
 files called C<kernel>, C<initrd>, C<root> and C<README.fixed> (note
 the C<README.fixed> file must be present as well).

-If the fixed appliance is found, libguestfs skips febootstrap entirely
+If the fixed appliance is found, libguestfs skips supermin entirely
 and just runs qemu with the kernel, initrd and root disk from the
 fixed appliance.

 Thus the fixed appliance can be used when a platform or Linux distro
-does not support febootstrap.  You build the fixed appliance on a
-platform that does support febootstrap, and copy it over, and use that
+does not support supermin.  You build the fixed appliance on a
+platform that does support supermin, and copy it over, and use that
 to run libguestfs.

 =head1 LICENSING
@@ -144,8 +166,8 @@ libguestfs, please see the L<guestfs(3)> manual page.
 =head1 SEE ALSO

 L<guestfs(3)>,
-L<febootstrap(8)>,
-L<febootstrap-supermin-helper(8)>,
+L<supermin(8)>,
+L<supermin-helper(8)>,
 L<xz(1)>,
 L<http://libguestfs.org/>,
 L<http://qemu.org/>.
@@ -156,19 +178,4 @@ Richard W.M. Jones (C<rjones at redhat dot com>)

 =head1 COPYRIGHT

-Copyright (C) 2009-2012 Red Hat Inc.
-L<http://libguestfs.org/>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+Copyright (C) 2009-2013 Red Hat Inc.
--- a/appliance/make.sh.in
+++ b/appliance/make.sh.in
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # @configure_input@
-# Copyright (C) 2009-2012 Red Hat Inc.
+# Copyright (C) 2009-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,13 +27,15 @@ while read regexp <&5; do
 done
 exec 5<&-

-# Run febootstrap on the package list.
-if [ "x@FEBOOTSTRAP_YUM_CONFIG@" != "xno" ]; then
-    extra="--yum-config @FEBOOTSTRAP_YUM_CONFIG@"
+# Run supermin on the package list.
+# NB: Keep using --yum-config (deprecated alias) here since both old
+# and new supermin still support it.
+if [ "x@SUPERMIN_PACKAGER_CONFIG@" != "xno" ]; then
+    extra="--yum-config @SUPERMIN_PACKAGER_CONFIG@"
 fi

-echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
-@FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
+echo @SUPERMIN@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
+@SUPERMIN@ -v -o supermin.d --names $(< packagelist ) $excludes $extra

 # Remove some things that we don't want in the appliance.  This is
 # copied from the old febootstrap-minimize.  However minimization is
@@ -41,10 +43,6 @@ echo @FEBOOTSTRAP@ -v -o supermin.d --names $(< packagelist ) $excludes $extra
 < supermin.d/hostfiles \
 grep -v '^/usr/lib/locale' |
 grep -v '^/usr/share/locale' |
-grep -v '^/usr/lib/gconv' |
-grep -v '^/usr/lib64/gconv' |
-grep -v '^/usr/bin/localedef' |
-grep -v '^/usr/sbin/build-locale-archive' |
 grep -v '^/usr/share/man/' |
 grep -v '^/usr/share/doc/' |
 grep -v '^/usr/share/info/' |
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -11,6 +11,10 @@
 *
 * There is also a list of packages which are excluded if they appear
 * as dependencies of the packages below.  See: excludelist.in
+ *
+ * To add arbitrary extra packages, use:
+ *
+ *   ./configure --with-extra-packages="gdb valgrind [etc]"
 */

 /* Basically the same with a few minor tweaks. */
@@ -23,27 +27,33 @@
  btrfs-progs
  cryptsetup
  cryptsetup-luks /* old name used before Fedora 17 */
-  diffutils
  e2fsprogs
  /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
  e4fsprogs
+  genisoimage
  gfs-utils
  gfs2-utils
  grub
  hfsplus-tools
+  hivex
+  iproute
  iputils
  kernel
+  libcap
+  libldm /* only Fedora has this for now, but we should add it to others later*/
  MAKEDEV
  nilfs-utils
  ntfsprogs
  ntfs-3g
+  openssh-clients
+  pcre
  reiserfs-utils
  libselinux
-  systemd /* for /sbin/reboot */
-  udev
-  util-linux-ng
+  syslinux-extlinux
+  systemd /* for /sbin/reboot and udevd */
  vim-minimal
  xz
+  yajl
  zfs-fuse
 #endif /* REDHAT */

@@ -51,64 +61,78 @@
  bsdmainutils
  btrfs-tools
  cryptsetup
-  diff
  e2fsprogs
+  extlinux
+  genisoimage
  gfs-tools
  gfs2-tools
  grub-pc
  hfsplus
  iproute
  libaugeas0
+  libcap2
+  libhivex0
+  libpcre3
+  libyajl2
  linux-image
  nilfs-tools
  ntfs-3g
  ntfsprogs
+  openssh-client
  reiserfsprogs
-  udev
+  sysvinit /* for /sbin/reboot */
  ufsutils
-  util-linux
  vim-tiny
  xz-utils
  zfs-fuse
 #endif /* DEBIAN */

 #ifdef ARCHLINUX
-  linux
-  vim
-  btrfs-progs-unstable
-  cryptsetup
-  diffutils
  augeas
-  zfs-fuse
+  btrfs-progs
+  cdrkit
+  cryptsetup
  e2fsprogs
  grub
+  hivex
+  iproute2
  iputils
+  libcap
+  linux
+  lrzip
  nilfs-utils
  ntfsprogs
  ntfs-3g
+  pcre
  reiserfsprogs
-  udev
-  util-linux-ng
+  systemd
+  vim
  xz
+  yajl
+  zfs-fuse
 #endif /* ARCHLINUX */

 acl
 attr
 bash
 binutils
+bzip2
 coreutils
 cpio
+diffutils
 dosfstools
 file
 findutils
 gawk
-genisoimage
+gdisk
 grep
 gzip
-iproute
 jfsutils
+kmod
+less
 libxml2
 lsof
+lsscsi
 lvm2
 lzop
 mdadm
@@ -120,10 +144,17 @@ ocfs2-tools
 */
 parted
 procps
+procps-ng
 psmisc
+rsync
 scrub
+sed
 strace
+syslinux
 tar
+udev
+util-linux
+util-linux-ng
 #ifndef UBUNTU
 /* on Ubuntu contains a file in /lib64 which conflicts with libc6 that has
 * /lib64 as a symbolic link
@@ -135,3 +166,6 @@ zerofree
 #ifdef VALGRIND_DAEMON
 valgrind
 #endif
+
+/* Define this by doing: ./configure --with-extra-packages="..." */
+EXTRA_PACKAGES
--- a/autogen.sh
+++ b/autogen.sh
@@ -44,7 +44,7 @@ fi

 # If no arguments were specified and configure has run before, use the previous
 # arguments
-if test $# == 0 && test -x ./config.status; then
+if test $# -eq 0 && test -x ./config.status; then
    ./config.status --recheck
 else
    $CONFIGUREDIR/configure "$@"
--- a/bash/Makefile.am
+++ b/bash/Makefile.am
@@ -0,0 +1,68 @@
+# libguestfs
+# Copyright (C) 2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+include $(top_srcdir)/subdir-rules.mk
+
+scripts = \
+	guestfish \
+	guestmount \
+	virt-alignment-scan \
+	virt-cat \
+	virt-df \
+	virt-edit \
+	virt-filesystems \
+	virt-format \
+	virt-inspector \
+	virt-ls \
+	virt-rescue \
+	virt-resize \
+	virt-sparsify \
+	virt-sysprep
+
+EXTRA_DIST = \
+	README \
+	$(scripts)
+
+# Some of the scripts are simply symbolic links.
+virt-cat:
+	ln -sf virt-alignment-scan $@
+virt-df:
+	ln -sf virt-alignment-scan $@
+virt-edit:
+	ln -sf virt-alignment-scan $@
+virt-filesystems:
+	ln -sf virt-alignment-scan $@
+virt-format:
+	ln -sf virt-alignment-scan $@
+virt-inspector:
+	ln -sf virt-alignment-scan $@
+virt-ls:
+	ln -sf virt-alignment-scan $@
+virt-sysprep:
+	ln -sf virt-alignment-scan $@
+
+virt-sparsify:
+	ln -sf virt-resize $@
+
+if HAVE_BASH_COMPLETION
+
+# Bash completion script.
+
+bashcompletiondir = $(BASH_COMPLETIONS_DIR)
+bashcompletion_DATA = $(scripts)
+
+endif
--- a/bash/README
+++ b/bash/README
@@ -0,0 +1,3 @@
+This directory contains the scripts for tab-completing commands in
+bash.  Note these new-style demand-loaded scripts require
+'bash-completion' >= 1.99.
--- a/bash/guestfish
+++ b/bash/guestfish
@@ -0,0 +1,72 @@
+# guestfish bash completion script -*- shell-script -*-
+# Copyright (C) 2010-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# List all local libvirt domains.
+_guestfs_virsh_list ()
+{
+    local flag_ro=$1 flags
+
+    if [ "$flag_ro" -eq 1 ]; then
+        flags="--all"
+    else
+        flags="--inactive"
+    fi
+    virsh list $flags | head -n -1 | tail -n +3 | awk '{print $2}'
+}
+
+_guestfish ()
+{
+    local cur prev words cword split
+    local longopts flag_ro=0 c=1 word cmds doms
+
+    _init_completion -s || return
+
+    longopts="$(guestfish --long-options)"
+
+    # See if user has specified certain options anywhere on the
+    # command line before the current word.
+    while [ $c -lt $COMP_CWORD ]; do
+        word="${COMP_WORDS[c]}"
+        case "$word" in
+            -r|--ro) flag_ro=1 ;;
+        esac
+        c=$((++c))
+    done
+
+    case "$prev" in
+        -a|--add)
+            COMPREPLY=( $(compgen "$cur") )
+            return ;;
+        -d|--domain)
+            doms=$(_guestfs_virsh_list "$flag_ro")
+            COMPREPLY=( $(compgen -W "$doms" -- "$cur") )
+            return ;;
+    esac
+
+    case "$cur" in
+        --*)
+            # --options
+            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
+            return ;;
+        *)
+            # Might be a guestfish command.
+            cmds=$(guestfish -h| head -n -1 | tail -n +2 | awk '{print $1}')
+            COMPREPLY=( $(compgen -W "$cmds" -- "$cur") )
+            return ;;
+    esac
+} &&
+complete -o default -F _guestfish guestfish
--- a/bash/guestmount
+++ b/bash/guestmount
@@ -0,0 +1,67 @@
+# guestmount bash completion script -*- shell-script -*-
+# Copyright (C) 2010-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# List all local libvirt domains.
+_guestfs_virsh_list ()
+{
+    local flag_ro=$1 flags
+
+    if [ "$flag_ro" -eq 1 ]; then
+        flags="--all"
+    else
+        flags="--inactive"
+    fi
+    virsh list $flags | head -n -1 | tail -n +3 | awk '{print $2}'
+}
+
+_guestmount ()
+{
+    local cur prev words cword split
+    local longopts flag_ro=0 c=1 word doms
+
+    _init_completion -s || return
+
+    longopts="$(guestmount --long-options)"
+
+    # See if user has specified certain options anywhere on the
+    # command line before the current word.
+    while [ $c -lt $COMP_CWORD ]; do
+        word="${COMP_WORDS[c]}"
+        case "$word" in
+            -r|--ro) flag_ro=1 ;;
+        esac
+        c=$((++c))
+    done
+
+    case "$prev" in
+        -d|--domain)
+            doms=$(_guestfs_virsh_list "$flag_ro")
+            COMPREPLY=( $(compgen -W "$doms" -- "$cur") )
+            return ;;
+    esac
+
+    case "$cur" in
+        --*)
+            # --options
+            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
+            return ;;
+        *)
+            COMPREPLY=( $(compgen "$cur") )
+            return ;;
+    esac
+} &&
+complete -o default -F _guestmount guestmount
--- a/bash/virt-alignment-scan
+++ b/bash/virt-alignment-scan
@@ -0,0 +1,108 @@
+# virt-tools bash completion script -*- shell-script -*-
+# Copyright (C) 2010-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# List all local libvirt domains.
+_guestfs_virsh_list ()
+{
+    local flag_ro=$1 flags
+
+    if [ "$flag_ro" -eq 1 ]; then
+        flags="--all"
+    else
+        flags="--inactive"
+    fi
+    virsh list $flags | head -n -1 | tail -n +3 | awk '{print $2}'
+}
+
+_guestfs_virttools ()
+{
+    local cur prev words cword split
+    local longopts="$1" flag_ro="$2" doms
+
+    _init_completion -s || return
+
+    case "$prev" in
+        -d|--domain)
+            doms=$(_guestfs_virsh_list "$flag_ro")
+            COMPREPLY=( $(compgen -W "$doms" -- "$cur") )
+            return ;;
+    esac
+
+    case "$cur" in
+        --*)
+            # --options
+            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
+            return ;;
+        *)
+            COMPREPLY=( $(compgen "$cur") )
+            return ;;
+    esac
+}
+
+_virt_alignment_scan ()
+{
+    _guestfs_virttools "$(virt-alignment-scan --long-options)" 1
+} &&
+complete -o default -F _virt_alignment_scan virt-alignment-scan
+
+_virt_cat ()
+{
+    _guestfs_virttools "$(virt-cat --long-options)" 1
+} &&
+complete -o default -F _virt_cat virt-cat
+
+_virt_df ()
+{
+    _guestfs_virttools "$(virt-df --long-options)" 1
+} &&
+complete -o default -F _virt_df virt-df
+
+_virt_edit ()
+{
+    _guestfs_virttools "$(virt-edit --long-options)" 0
+} &&
+complete -o default -F _virt_edit virt-edit
+
+_virt_filesystems ()
+{
+    _guestfs_virttools "$(virt-filesystems --long-options)" 1
+} &&
+complete -o default -F _virt_filesystems virt-filesystems
+
+_virt_format ()
+{
+    _guestfs_virttools "$(virt-format --long-options)" 0
+} &&
+complete -o default -F _virt_format virt-format
+
+_virt_inspector ()
+{
+    _guestfs_virttools "$(virt-inspector --long-options)" 1
+} &&
+complete -o default -F _virt_inspector virt-inspector
+
+_virt_ls ()
+{
+    _guestfs_virttools "$(virt-ls --long-options)" 1
+} &&
+complete -o default -F _virt_ls virt-ls
+
+_virt_sysprep ()
+{
+    _guestfs_virttools "$(virt-sysprep --long-options)" 0
+} &&
+complete -o default -F _virt_sysprep virt-sysprep
--- a/bash/virt-rescue
+++ b/bash/virt-rescue
@@ -0,0 +1,67 @@
+# virt-rescue bash completion script -*- shell-script -*-
+# Copyright (C) 2010-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# List all local libvirt domains.
+_guestfs_virsh_list ()
+{
+    local flag_ro=$1 flags
+
+    if [ "$flag_ro" -eq 1 ]; then
+        flags="--all"
+    else
+        flags="--inactive"
+    fi
+    virsh list $flags | head -n -1 | tail -n +3 | awk '{print $2}'
+}
+
+_virt_rescue ()
+{
+    local cur prev words cword split
+    local longopts flag_ro=0 c=1 word doms
+
+    _init_completion -s || return
+
+    longopts="$(virt-rescue --long-options)"
+
+    # See if user has specified certain options anywhere on the
+    # command line before the current word.
+    while [ $c -lt $COMP_CWORD ]; do
+        word="${COMP_WORDS[c]}"
+        case "$word" in
+            -r|--ro) flag_ro=1 ;;
+        esac
+        c=$((++c))
+    done
+
+    case "$prev" in
+        -d|--domain)
+            doms=$(_guestfs_virsh_list "$flag_ro")
+            COMPREPLY=( $(compgen -W "$doms" -- "$cur") )
+            return ;;
+    esac
+
+    case "$cur" in
+        --*)
+            # --options
+            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
+            return ;;
+        *)
+            COMPREPLY=( $(compgen "$cur") )
+            return ;;
+    esac
+} &&
+complete -o default -F _virt_rescue virt-rescue
--- a/bash/virt-resize
+++ b/bash/virt-resize
@@ -0,0 +1,46 @@
+# virt-resize, virt-sparsify bash completion script -*- shell-script -*-
+# Copyright (C) 2010-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+_guestfs_options_only ()
+{
+    local cur prev words cword split
+    local longopts="$1"
+
+    _init_completion -s || return
+
+    case "$cur" in
+        --*)
+            # --options
+            COMPREPLY=( $(compgen -W "$longopts" -- "$cur") )
+            return ;;
+        *)
+            COMPREPLY=( $(compgen "$cur") )
+            return ;;
+    esac
+}
+
+_virt_resize ()
+{
+    _guestfs_options_only "$(virt-resize --long-options)"
+} &&
+complete -o default -F _virt_resize virt-resize
+
+_virt_sparsify ()
+{
+    _guestfs_options_only "$(virt-sparsify --long-options)"
+} &&
+complete -o default -F _virt_sparsify virt-sparsify
--- a/77
+++ b/77
@@ -9,8 +9,9 @@ false
 <61><62><63><00><61><62><63>
 obool: true
 oint: 1
-oint64: unset
+oint64: 9223372036854775807
 ostring: unset
+ostringlist: unset
 abc
 null
 []
@@ -24,6 +25,7 @@ obool: unset
 oint: unset
 oint64: 1
 ostring: string
+ostringlist: unset

 def
 []
@@ -35,8 +37,9 @@ false
 <61><62><63><00><61><62><63>
 obool: false
 oint: unset
-oint64: unset
+oint64: -9223372036854775808
 ostring: unset
+ostringlist: unset


 []
@@ -50,6 +53,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
@@ -63,6 +67,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1", "2"]
@@ -76,6 +81,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
@@ -89,6 +95,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
@@ -102,6 +109,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
@@ -115,6 +123,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
@@ -128,6 +137,7 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
@@ -141,12 +151,13 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
 false
 4095
-4095
+9223372036854775807
 123
 456
 <61><62><63><00><61><62><63>
@@ -154,12 +165,13 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
 abc
 def
 ["1"]
 false
 0
-0
+-9223372036854775808


 <61><62><63><00><61><62><63>
@@ -167,4 +179,61 @@ obool: unset
 oint: unset
 oint64: unset
 ostring: unset
+ostringlist: unset
+abc
+def
+[]
+false
+0
+0
+123
+456
+<61><62><63><00><61><62><63>
+obool: unset
+oint: unset
+oint64: unset
+ostring: unset
+ostringlist: []
+abc
+def
+[]
+false
+0
+0
+123
+456
+<61><62><63><00><61><62><63>
+obool: unset
+oint: unset
+oint64: unset
+ostring: unset
+ostringlist: ["optelem1"]
+abc
+def
+[]
+false
+0
+0
+123
+456
+<61><62><63><00><61><62><63>
+obool: unset
+oint: unset
+oint64: unset
+ostring: unset
+ostringlist: ["optelem1", "optelem2"]
+abc
+def
+[]
+false
+0
+0
+123
+456
+<61><62><63><00><61><62><63>
+obool: unset
+oint: unset
+oint64: unset
+ostring: unset
+ostringlist: ["optelem1", "optelem2", "optelem3"]
 EOF
--- a/13
+++ b/13
@@ -38,6 +38,8 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool

 modules='
 accept4
+areadlink
+areadlinkat
 arpa_inet
 byteswap
 c-ctype
@@ -47,6 +49,7 @@ connect
 dup3
 error
 filevercmp
+fstatat
 fsusage
 fts
 full-read
@@ -65,11 +68,14 @@ ignore-value
 lock
 maintainer-makefile
 manywarnings
+memmem
 mkdtemp
+mkstemps
 netdb
 netinet_in
 openat
 perror
+pipe2
 pread
 progname
 read-file
@@ -78,6 +84,7 @@ select
 setenv
 sleep
 socket
+stat-time
 strchrnul
 strerror
 strndup
@@ -94,8 +101,12 @@ xstrtoll
 xvasprintf
 '

+# If any tests fail, avoid including them by adding them to
+# this list.
+avoid="--avoid=dummy --avoid=getlogin_r-tests"
+
 $gnulib_tool			\
-  --avoid=dummy			\
+  $avoid			\
  --with-tests			\
  --m4-base=m4			\
  --source-base=gnulib/lib	\
--- a/bugs-in-changelog.sh
+++ b/bugs-in-changelog.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # bugs-in-changelog.sh
-# Copyright (C) 2009-2012 Red Hat Inc.
+# Copyright (C) 2009-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,10 +16,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-# Used when preparing the RELEASE-NOTES file.  This script looks at
-# the bugs noted in the git changelog since the last stable release
-# (or any release).  To use it, the only parameter should be the git
-# commit range, eg:
+# Used when preparing the guestfs-release-notes(1) man page.  This
+# script looks at the bugs noted in the git changelog since the last
+# stable release (or any release).  To use it, the only parameter
+# should be the git commit range, eg:
 #
 #   ./bugs-in-changelog.sh "1.0.89.."

@@ -42,5 +42,10 @@ bugids=$(
 # Filter out any bugs which may still be in NEW or ASSIGNED:
 bugzilla query -b "$bugids" \
    -t MODIFIED,POST,ON_QA,PASSES_QA,VERIFIED,RELEASE_PENDING,CLOSED \
-    --outputformat=' - %{bug_id} %{short_desc}' |
-    sort -n -r
+    --outputformat='%{bug_id} %{short_desc}' |
+    sort -n -r |
+    perl -pe '
+        s{([0-9]+)\s+(.*)}{
+        sprintf ("=item L<https://bugzilla.redhat.com/%s>\n\n%s\n",
+                 $1, $2)
+        }xe'
--- a/cat/Makefile.am
+++ b/cat/Makefile.am
@@ -31,64 +31,82 @@ bin_PROGRAMS = virt-cat virt-filesystems virt-ls

 SHARED_SOURCE_FILES = \
 	../fish/config.c \
+	../fish/domain.c \
 	../fish/inspect.c \
 	../fish/keys.c \
 	../fish/options.h \
-	../fish/options.c \
-	../fish/virt.c
+	../fish/options.c

 virt_cat_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
 	virt-cat.c

-virt_cat_CFLAGS = \
+virt_cat_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
+	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/fish \
-	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+	-I$(srcdir)/../gnulib/lib -I../gnulib/lib
+
+virt_cat_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(GPROF_CFLAGS) $(GCOV_CFLAGS) \
 	$(LIBCONFIG_CFLAGS)

 virt_cat_LDADD = \
 	$(LIBCONFIG_LIBS) \
+	$(top_builddir)/src/libutils.la \
 	$(top_builddir)/src/libguestfs.la \
+	$(LIBXML2_LIBS) \
+	$(LIBVIRT_LIBS) \
 	../gnulib/lib/libgnu.la

 virt_filesystems_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
 	virt-filesystems.c

-virt_filesystems_CFLAGS = \
+virt_filesystems_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
+	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/fish \
-	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+	-I$(srcdir)/../gnulib/lib -I../gnulib/lib
+
+virt_filesystems_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(GPROF_CFLAGS) $(GCOV_CFLAGS) \
 	$(LIBCONFIG_CFLAGS)

 virt_filesystems_LDADD = \
 	$(LIBCONFIG_LIBS) \
+	$(top_builddir)/src/libutils.la \
 	$(top_builddir)/src/libguestfs.la \
+	$(LIBXML2_LIBS) \
+	$(LIBVIRT_LIBS) \
 	../gnulib/lib/libgnu.la

 virt_ls_SOURCES = \
 	$(SHARED_SOURCE_FILES) \
 	virt-ls.c

-virt_ls_CFLAGS = \
+virt_ls_CPPFLAGS = \
 	-DGUESTFS_WARN_DEPRECATED=1 \
+	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	-I$(top_srcdir)/fish \
-	-I$(srcdir)/../gnulib/lib -I../gnulib/lib \
-	-DLOCALEBASEDIR=\""$(datadir)/locale"\" \
+	-I$(srcdir)/../gnulib/lib -I../gnulib/lib
+
+virt_ls_CFLAGS = \
 	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(GPROF_CFLAGS) $(GCOV_CFLAGS) \
 	$(LIBCONFIG_CFLAGS)

 virt_ls_LDADD = \
 	$(LIBCONFIG_LIBS) \
+	$(top_builddir)/src/libutils.la \
 	$(top_builddir)/src/libguestfs.la \
+	$(LIBXML2_LIBS) \
+	$(LIBVIRT_LIBS) \
 	../gnulib/lib/libgnu.la

 # Manual pages and HTML files for the website.
@@ -102,38 +120,48 @@ noinst_DATA = \
 virt-cat.1 $(top_builddir)/html/virt-cat.1.html: stamp-virt-cat.pod

 stamp-virt-cat.pod: virt-cat.pod
-	$(top_builddir)/podwrapper.sh \
+	$(PODWRAPPER) \
 	  --man virt-cat.1 \
 	  --html $(top_builddir)/html/virt-cat.1.html \
+	  --license GPLv2+ \
 	  $<
 	touch $@

 virt-ls.1 $(top_builddir)/html/virt-ls.1.html: stamp-virt-ls.pod

 stamp-virt-ls.pod: virt-ls.pod
-	$(top_builddir)/podwrapper.sh \
+	$(PODWRAPPER) \
 	  --man virt-ls.1 \
 	  --html $(top_builddir)/html/virt-ls.1.html \
+	  --license GPLv2+ \
 	  $<
 	touch $@

 virt-filesystems.1 $(top_builddir)/html/virt-filesystems.1.html: stamp-virt-filesystems.pod

 stamp-virt-filesystems.pod: virt-filesystems.pod
-	$(top_builddir)/podwrapper.sh \
+	$(PODWRAPPER) \
 	  --man virt-filesystems.1 \
 	  --html $(top_builddir)/html/virt-filesystems.1.html \
+	  --license GPLv2+ \
 	  $<
 	touch $@

 # Tests.

-random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
-
-TESTS_ENVIRONMENT = \
-	MALLOC_PERTURB_=$(random_val) \
-	$(top_builddir)/run
+TESTS_ENVIRONMENT = $(top_builddir)/run --test

 if ENABLE_APPLIANCE
-TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh
+TESTS = \
+	test-virt-cat.sh \
+	test-virt-filesystems.sh \
+	test-virt-ls.sh
 endif ENABLE_APPLIANCE
+
+check-valgrind:
+	$(MAKE) VG="$(top_builddir)/run @VG@" check
+
+check-valgrind-local-guests:
+	for g in $(GUESTS); do \
+	  $(top_builddir)/run --test @VG@ ./virt-filesystems -c "$(libvirt_ro_uri)" -d "$$g" --all --long -h --uuid || exit $$?; \
+	done
--- a/cat/test-virt-cat.sh
+++ b/cat/test-virt-cat.sh
@@ -1,14 +1,30 @@
 #!/bin/bash -
+# libguestfs
+# Copyright (C) 2009-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 export LANG=C
 set -e

 # Read out the test files from the image using virt-cat.
-if [ "$(./virt-cat ../tests/guests/fedora.img /etc/test1)" != "abcdefg" ]; then
+if [ "$($VG ./virt-cat ../tests/guests/fedora.img /etc/test1)" != "abcdefg" ]; then
    echo "$0: error: mismatch in file test1"
    exit 1
 fi
-if [ "$(./virt-cat ../tests/guests/fedora.img /etc/test2)" != "" ]; then
+if [ "$($VG ./virt-cat ../tests/guests/fedora.img /etc/test2)" != "" ]; then
    echo "$0: error: mismatch in file test2"
    exit 1
 fi
--- a/cat/test-virt-filesystems.sh
+++ b/cat/test-virt-filesystems.sh
@@ -1,9 +1,25 @@
 #!/bin/bash -
+# libguestfs
+# Copyright (C) 2009-2013 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 export LANG=C
 set -e

-output="$(./virt-filesystems -a ../tests/guests/fedora.img | sort)"
+output="$($VG ./virt-filesystems -a ../tests/guests/fedora.img | sort)"
 expected="/dev/VG/LV1
 /dev/VG/LV2
 /dev/VG/LV3
@@ -16,7 +32,7 @@ if [ "$output" != "$expected" ]; then
    exit 1
 fi

-output="$(./virt-filesystems -a ../tests/guests/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)"
+output="$($VG ./virt-filesystems -a ../tests/guests/fedora.img --all --long --uuid -h --no-title | awk '{print $1}' | sort -u)"
 expected="/dev/VG
 /dev/VG/LV1
 /dev/VG/LV2
--- a/cat/test-virt-ls.sh
+++ b/cat/test-virt-ls.sh
@@ -1,10 +1,26 @@
 #!/bin/bash -
+# libguestfs
+# Copyright (C) 2012 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 export LANG=C
 set -e

 # Read out the test directory using virt-ls.
-if [ "$(./virt-ls ../tests/guests/fedora.img /bin)" != "ls
+if [ "$($VG ./virt-ls ../tests/guests/fedora.img /bin)" != "ls
 test1
 test2
 test3
@@ -17,7 +33,7 @@ test7" ]; then
 fi

 # Try the -lR option.
-output="$(./virt-ls -lR ../tests/guests/fedora.img /boot | awk '{print $1 $2 $4}')"
+output="$($VG ./virt-ls -lR ../tests/guests/fedora.img /boot | awk '{print $1 $2 $4}')"
 expected="d0755/boot
 d0755/boot/grub
 -0644/boot/grub/grub.conf
@@ -31,3 +47,7 @@ if [ "$output" != "$expected" ]; then
    echo "--------------------------------------------------"
    exit 1
 fi
+
+# Try the -l and -R options.   XXX Should check the output.
+$VG ./virt-ls -l ../tests/guests/fedora.img /
+$VG ./virt-ls -R ../tests/guests/fedora.img /
--- a/cat/virt-cat.c
+++ b/cat/virt-cat.c
@@ -45,15 +45,10 @@ int echo_keys = 0;
 const char *libvirt_uri = NULL;
 int inspector = 1;

+static int do_cat (int argc, char *argv[]);
 static int is_windows (guestfs_h *g, const char *root);
 static char *windows_path (guestfs_h *g, const char *root, const char *filename);

-static inline char *
-bad_cast (char const *s)
-{
-  return (char *) s;
-}
-
 static void __attribute__((noreturn))
 usage (int status)
 {
@@ -106,6 +101,7 @@ main (int argc, char *argv[])
    { "format", 2, 0, 0 },
    { "help", 0, 0, HELP_OPTION },
    { "keys-from-stdin", 0, 0, 0 },
+    { "long-options", 0, 0, 0 },
    { "verbose", 0, 0, 'v' },
    { "version", 0, 0, 'V' },
    { 0, 0, 0, 0 }
@@ -114,6 +110,7 @@ main (int argc, char *argv[])
  struct drv *drv;
  const char *format = NULL;
  int c;
+  int r;
  int option_index;

  g = guestfs_create ();
@@ -122,7 +119,7 @@ main (int argc, char *argv[])
    exit (EXIT_FAILURE);
  }

-  argv[0] = bad_cast (program_name);
+  argv[0] = (char *) program_name;

  for (;;) {
    c = getopt_long (argc, argv, options, long_options, &option_index);
@@ -130,7 +127,9 @@ main (int argc, char *argv[])

    switch (c) {
    case 0:			/* options which are long only */
-      if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
+      if (STREQ (long_options[option_index].name, "long-options"))
+        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
@@ -158,9 +157,6 @@ main (int argc, char *argv[])
      OPTION_d;
      break;

-    case 'h':
-      usage (EXIT_SUCCESS);
-
    case 'v':
      OPTION_v;
      break;
@@ -243,24 +239,34 @@ main (int argc, char *argv[])
  /* Free up data structures, no longer needed after this point. */
  free_drives (drvs);

+  r = do_cat (argc - optind, &argv[optind]);
+
+  guestfs_close (g);
+
+  exit (r == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+
+static int
+do_cat (int argc, char *argv[])
+{
  unsigned errors = 0;
-  int windows;
-  char *root, **roots;
+  int windows, i;
+  char *root;

  /* Get root mountpoint.  See: fish/inspect.c:inspect_mount */
-  roots = guestfs_inspect_get_roots (g);
+  CLEANUP_FREE_STRING_LIST char **roots = guestfs_inspect_get_roots (g);
+
  assert (roots);
  assert (roots[0] != NULL);
  assert (roots[1] == NULL);
  root = roots[0];
-  free (roots);

  /* Windows?  Special handling is required. */
  windows = is_windows (g, root);

-  for (; optind < argc; optind++) {
-    char *filename_to_free = NULL;
-    const char *filename = argv[optind];
+  for (i = 0; i < argc; ++i) {
+    CLEANUP_FREE char *filename_to_free = NULL;
+    const char *filename = argv[i];

    if (windows) {
      filename = filename_to_free = windows_path (g, root, filename);
@@ -272,15 +278,9 @@ main (int argc, char *argv[])

    if (guestfs_download (g, filename, "/dev/stdout") == -1)
      errors++;
-
-    free (filename_to_free);
  }

-  free (root);
-
-  guestfs_close (g);
-
-  exit (errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
+  return errors == 0 ? 0 : -1;
 }

 static int
--- a/cat/virt-cat.pod
+++ b/cat/virt-cat.pod
@@ -256,17 +256,3 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>
 =head1 COPYRIGHT

 Copyright (C) 2010-2012 Red Hat Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--- a/cat/virt-filesystems.c
+++ b/cat/virt-filesystems.c
@@ -36,15 +36,6 @@
 #include "guestfs.h"
 #include "options.h"

-#define DISABLE_GUESTFS_ERRORS_FOR(stmt) do {                           \
-    guestfs_error_handler_cb old_error_cb;                              \
-    void *old_error_data;                                               \
-    old_error_cb = guestfs_get_error_handler (g, &old_error_data);      \
-    guestfs_set_error_handler (g, NULL, NULL);                          \
-    stmt;                                                               \
-    guestfs_set_error_handler (g, old_error_cb, old_error_data);        \
-  } while (0)
-
 /* These globals are shared with options.c. */
 guestfs_h *g;

@@ -82,8 +73,6 @@ static int output = 0;
 #define NR_COLUMNS                8
 static int columns;

-static char *canonical_device (const char *dev);
-
 static void do_output_title (void);
 static void do_output (void);
 static void do_output_end (void);
@@ -91,12 +80,6 @@ static void do_output_end (void);
 static struct guestfs_lvm_pv_list *get_pvs (void);
 static void free_pvs (void);

-static inline char *
-bad_cast (char const *s)
-{
-  return (char *) s;
-}
-
 static void __attribute__((noreturn))
 usage (int status)
 {
@@ -173,9 +156,10 @@ main (int argc, char *argv[])
    { "help", 0, 0, HELP_OPTION },
    { "human-readable", 0, 0, 'h' },
    { "keys-from-stdin", 0, 0, 0 },
-    { "long", 0, 0, 'l' },
    { "logical-volumes", 0, 0, 0 },
    { "logvols", 0, 0, 0 },
+    { "long", 0, 0, 'l' },
+    { "long-options", 0, 0, 0 },
    { "lvs", 0, 0, 0 },
    { "no-title", 0, 0, 0 },
    { "parts", 0, 0, 0 },
@@ -208,7 +192,7 @@ main (int argc, char *argv[])
    exit (EXIT_FAILURE);
  }

-  argv[0] = bad_cast (program_name);
+  argv[0] = (char *) program_name;

  for (;;) {
    c = getopt_long (argc, argv, options, long_options, &option_index);
@@ -216,7 +200,9 @@ main (int argc, char *argv[])

    switch (c) {
    case 0:			/* options which are long only */
-      if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
+      if (STREQ (long_options[option_index].name, "long-options"))
+        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
@@ -390,9 +376,6 @@ static int is_md (char *device);
 static char **parents_of_md (char *device);
 static char **parents_of_vg (char *vg);

-static void free_strings (char **strings);
-static size_t count_strings (char **strings);
-
 static void
 do_output_title (void)
 {
@@ -449,32 +432,33 @@ do_output (void)
 static void
 do_output_filesystems (void)
 {
-  char **fses;
  size_t i;

-  fses = guestfs_list_filesystems (g);
+  CLEANUP_FREE_STRING_LIST char **fses = guestfs_list_filesystems (g);
  if (fses == NULL)
    exit (EXIT_FAILURE);

  for (i = 0; fses[i] != NULL; i += 2) {
-    char *dev, *vfs_label = NULL, *vfs_uuid = NULL;
-    char **parents;
+    CLEANUP_FREE char *dev = NULL, *vfs_label = NULL, *vfs_uuid = NULL;
+    CLEANUP_FREE_STRING_LIST char **parents = NULL;
    int64_t size = -1;

    /* Skip swap and unknown, unless --extra flag was given. */
    if (!(output & OUTPUT_FILESYSTEMS_EXTRA) &&
        (STREQ (fses[i+1], "swap") || STREQ (fses[i+1], "unknown")))
-      goto next;
+      continue;

-    dev = canonical_device (fses[i]);
+    dev = guestfs_canonical_device_name (g, fses[i]);
+    if (dev == NULL)
+      exit (EXIT_FAILURE);

    /* Only bother to look these up if we will be displaying them,
     * otherwise pass them as NULL.
     */
    if ((columns & COLUMN_VFS_LABEL)) {
-      DISABLE_GUESTFS_ERRORS_FOR (
-        vfs_label = guestfs_vfs_label (g, fses[i]);
-      );
+      guestfs_push_error_handler (g, NULL, NULL);
+      vfs_label = guestfs_vfs_label (g, fses[i]);
+      guestfs_pop_error_handler (g);
      if (vfs_label == NULL) {
        vfs_label = strdup ("");
        if (!vfs_label) {
@@ -484,9 +468,9 @@ do_output_filesystems (void)
      }
    }
    if ((columns & COLUMN_UUID)) {
-      DISABLE_GUESTFS_ERRORS_FOR (
-        vfs_uuid = guestfs_vfs_uuid (g, fses[i]);
-      );
+      guestfs_push_error_handler (g, NULL, NULL);
+      vfs_uuid = guestfs_vfs_uuid (g, fses[i]);
+      guestfs_pop_error_handler (g);
      if (vfs_uuid == NULL) {
        vfs_uuid = strdup ("");
        if (!vfs_uuid) {
@@ -508,32 +492,20 @@ do_output_filesystems (void)

    write_row (dev, "filesystem",
               fses[i+1], vfs_label, -1, size, parents, vfs_uuid);
-
-    free_strings (parents);
-    free (dev);
-    free (vfs_label);
-    free (vfs_uuid);
-
-  next:
-    free (fses[i]);
-    free (fses[i+1]);
  }
-
-  free (fses);
 }

 static void
 do_output_lvs (void)
 {
-  char **lvs;
  size_t i;

-  lvs = guestfs_lvs (g);
+  CLEANUP_FREE_STRING_LIST char **lvs = guestfs_lvs (g);
  if (lvs == NULL)
    exit (EXIT_FAILURE);

  for (i = 0; lvs[i] != NULL; ++i) {
-    char *uuid = NULL, *parent_name = NULL;
+    CLEANUP_FREE char *uuid = NULL, *parent_name = NULL;
    const char *parents[2];
    int64_t size = -1;

@@ -562,32 +534,28 @@ do_output_lvs (void)

    write_row (lvs[i], "lv",
               NULL, NULL, -1, size, (char **) parents, uuid);
-
-    free (uuid);
-    free (parent_name);
-    free (lvs[i]);
  }
-
-  free (lvs);
 }

 static void
 do_output_vgs (void)
 {
-  struct guestfs_lvm_vg_list *vgs;
  size_t i;

-  vgs = guestfs_vgs_full (g);
+  CLEANUP_FREE_LVM_VG_LIST struct guestfs_lvm_vg_list *vgs =
+    guestfs_vgs_full (g);
  if (vgs == NULL)
    exit (EXIT_FAILURE);

  for (i = 0; i < vgs->len; ++i) {
-    char name[PATH_MAX];
+    CLEANUP_FREE char *name = NULL;
    char uuid[33];
-    char **parents;
+    CLEANUP_FREE_STRING_LIST char **parents = NULL;

-    strcpy (name, "/dev/");
-    strcpy (&name[5], vgs->val[i].vg_name);
+    if (asprintf (&name, "/dev/%s", vgs->val[i].vg_name) == -1) {
+      perror ("asprintf");
+      exit (EXIT_FAILURE);
+    }

    memcpy (uuid, vgs->val[i].vg_uuid, 32);
    uuid[32] = '\0';
@@ -596,11 +564,7 @@ do_output_vgs (void)

    write_row (name, "vg",
               NULL, NULL, -1, (int64_t) vgs->val[i].vg_size, parents, uuid);
-
-    free_strings (parents);
  }
-
-  guestfs_free_lvm_vg_list (vgs);
 }

 /* Cache the output of guestfs_pvs_full, since we use it in a few places. */
@@ -635,44 +599,39 @@ do_output_pvs (void)
  struct guestfs_lvm_pv_list *pvs = get_pvs ();

  for (i = 0; i < pvs->len; ++i) {
-    char *dev;
    char uuid[33];
    const char *parents[1] = { NULL };

-    dev = canonical_device (pvs->val[i].pv_name);
+    CLEANUP_FREE char *dev =
+      guestfs_canonical_device_name (g, pvs->val[i].pv_name);
+    if (!dev)
+      exit (EXIT_FAILURE);

    memcpy (uuid, pvs->val[i].pv_uuid, 32);
    uuid[32] = '\0';
    write_row (dev, "pv",
               NULL, NULL, -1, (int64_t) pvs->val[i].pv_size,
               (char **) parents, uuid);
-
-    free (dev);
  }
 }

 static int
 get_mbr_id (const char *dev, const char *parent_name)
 {
-  char *parttype = NULL;
+  CLEANUP_FREE char *parttype = NULL;
  int mbr_id = -1, partnum;

-  DISABLE_GUESTFS_ERRORS_FOR (
-    parttype = guestfs_part_get_parttype (g, parent_name);
-  );
+  guestfs_push_error_handler (g, NULL, NULL);
+
+  parttype = guestfs_part_get_parttype (g, parent_name);

  if (parttype && STREQ (parttype, "msdos")) {
-    DISABLE_GUESTFS_ERRORS_FOR (
-      partnum = guestfs_part_to_partnum (g, dev);
-    );
-    if (partnum >= 0) {
-      DISABLE_GUESTFS_ERRORS_FOR (
-        mbr_id = guestfs_part_get_mbr_id (g, parent_name, partnum);
-      );
-    }
+    partnum = guestfs_part_to_partnum (g, dev);
+    if (partnum >= 0)
+      mbr_id = guestfs_part_get_mbr_id (g, parent_name, partnum);
  }

-  free (parttype);
+  guestfs_pop_error_handler (g);

  return mbr_id;
 }
@@ -680,20 +639,21 @@ get_mbr_id (const char *dev, const char *parent_name)
 static void
 do_output_partitions (void)
 {
-  char **parts;
  size_t i;

-  parts = guestfs_list_partitions (g);
+  CLEANUP_FREE_STRING_LIST char **parts = guestfs_list_partitions (g);
  if (parts == NULL)
    exit (EXIT_FAILURE);

  for (i = 0; parts[i] != NULL; ++i) {
-    char *dev, *parent_name = NULL;
+    CLEANUP_FREE char *dev = NULL, *parent_name = NULL, *canonical_name = NULL;
    const char *parents[2];
    int64_t size = -1;
    int mbr_id = -1;

-    dev = canonical_device (parts[i]);
+    dev = guestfs_canonical_device_name (g, parts[i]);
+    if (!dev)
+      exit (EXIT_FAILURE);

    if ((columns & COLUMN_SIZE)) {
      size = guestfs_blockdev_getsize64 (g, parts[i]);
@@ -708,41 +668,36 @@ do_output_partitions (void)
      if ((columns & COLUMN_MBR))
        mbr_id = get_mbr_id (parts[i], parent_name);

-      char *p = canonical_device (parent_name);
-      free (parent_name);
-      parent_name = p;
+      canonical_name = guestfs_canonical_device_name (g, parent_name);
+      if (!canonical_name)
+        exit (EXIT_FAILURE);

-      parents[0] = parent_name;
+      parents[0] = canonical_name;
      parents[1] = NULL;
    }

    write_row (dev, "partition",
               NULL, NULL, mbr_id, size, (char **) parents, NULL);
-
-    free (dev);
-    free (parent_name);
-    free (parts[i]);
  }
-
-  free (parts);
 }

 static void
 do_output_blockdevs (void)
 {
-  char **devices;
  size_t i;

-  devices = guestfs_list_devices (g);
+  CLEANUP_FREE_STRING_LIST char **devices = guestfs_list_devices (g);
  if (devices == NULL)
    exit (EXIT_FAILURE);

  for (i = 0; devices[i] != NULL; ++i) {
    int64_t size = -1;
-    char *dev;
-    char **parents;
+    CLEANUP_FREE_STRING_LIST char **parents = NULL;
+    CLEANUP_FREE char *dev;

-    dev = canonical_device (devices[i]);
+    dev = guestfs_canonical_device_name (g, devices[i]);
+    if (!dev)
+      exit (EXIT_FAILURE);

    if ((columns & COLUMN_SIZE)) {
      size = guestfs_blockdev_getsize64 (g, devices[i]);
@@ -757,38 +712,10 @@ do_output_blockdevs (void)

    write_row (dev, "device",
               NULL, NULL, -1, size, parents, NULL);
-
-    free (dev);
-    free (devices[i]);
-    free_strings (parents);
  }
-
-  free (devices);
 }

-/* /dev/vda1 -> /dev/sda.  Returns a string which the caller must free. */
-static char *
-canonical_device (const char *dev)
-{
-  char *ret = strdup (dev);
-  if (ret == NULL) {
-    perror ("strdup");
-    exit (EXIT_FAILURE);
-  }
-
-  if (STRPREFIX (ret, "/dev/") &&
-      (ret[5] == 'h' || ret[5] == 'v') &&
-      ret[6] == 'd' &&
-      c_isalpha (ret[7]) &&
-      (c_isdigit (ret[8]) || ret[8] == '\0'))
-    ret[5] = 's';
-
-  return ret;
-}
-
-/* Returns an empty list of parents.  Note this must be freed using
- * free_strings.
- */
+/* Returns an empty list of parents.  Note this must be freed. */
 static char **
 no_parents (void)
 {
@@ -827,11 +754,11 @@ is_md (char *device)
 static char **
 parents_of_md (char *device)
 {
-  struct guestfs_mdstat_list *stats;
  char **ret;
  size_t i;

-  stats = guestfs_md_stat (g, device);
+  CLEANUP_FREE_MDSTAT_LIST struct guestfs_mdstat_list *stats =
+    guestfs_md_stat (g, device);
  if (!stats)
    exit (EXIT_FAILURE);

@@ -841,13 +768,14 @@ parents_of_md (char *device)
    exit (EXIT_FAILURE);
  }

-  for (i = 0; i < stats->len; ++i)
-    ret[i] = canonical_device (stats->val[i].mdstat_device);
+  for (i = 0; i < stats->len; ++i) {
+    ret[i] = guestfs_canonical_device_name (g, stats->val[i].mdstat_device);
+    if (!ret[i])
+      exit (EXIT_FAILURE);
+  }

  ret[stats->len] = NULL;

-  guestfs_free_mdstat_list (stats);
-
  return ret;
 }

@@ -879,15 +807,14 @@ static char **
 parents_of_vg (char *vg)
 {
  struct guestfs_lvm_pv_list *pvs = get_pvs ();
-  char **pvuuids;
  char **ret;
  size_t n, i, j;

-  pvuuids = guestfs_vgpvuuids (g, vg);
+  CLEANUP_FREE_STRING_LIST char **pvuuids = guestfs_vgpvuuids (g, vg);
  if (!pvuuids)
    exit (EXIT_FAILURE);

-  n = count_strings (pvuuids);
+  n = guestfs___count_strings (pvuuids);

  ret = malloc ((n + 1) * sizeof (char *));
  if (!ret) {
@@ -902,8 +829,11 @@ parents_of_vg (char *vg)
        break;
    }

-    if (j < pvs->len)
-      ret[i] = canonical_device (pvs->val[j].pv_name);
+    if (j < pvs->len) {
+      ret[i] = guestfs_canonical_device_name (g, pvs->val[j].pv_name);
+      if (!ret[i])
+        exit (EXIT_FAILURE);
+    }
    else {
      fprintf (stderr, "%s: warning: unknown PV UUID ignored\n", __func__);
      ret[i] = strndup (pvuuids[i], 32);
@@ -916,8 +846,6 @@ parents_of_vg (char *vg)

  ret[i] = NULL;

-  free_strings (pvuuids);
-
  return ret;
 }

@@ -956,7 +884,7 @@ write_row (const char *name, const char *type,
           int64_t size, char **parents, const char *uuid)
 {
  const char *strings[NR_COLUMNS];
-  char *parents_str = NULL;
+  CLEANUP_FREE char *parents_str = NULL;
  size_t len = 0;
  char hum[LONGEST_HUMAN_READABLE];
  char num[256];
@@ -1004,8 +932,6 @@ write_row (const char *name, const char *type,
  assert (len <= NR_COLUMNS);

  write_row_strings ((char **) strings, len);
-
-  free (parents_str);
 }

 static void add_row (char **strings, size_t len);
@@ -1174,23 +1100,3 @@ do_output_end (void)
  }
  free (rows);
 }
-
-static void
-free_strings (char **strings)
-{
-  size_t i;
-
-  for (i = 0; strings[i] != NULL; ++i)
-    free (strings[i]);
-  free (strings);
-}
-
-static size_t
-count_strings (char **strings)
-{
-  size_t i;
-
-  for (i = 0; strings[i] != NULL; ++i)
-    ;
-  return i;
-}
--- a/cat/virt-filesystems.pod
+++ b/cat/virt-filesystems.pod
@@ -403,18 +403,4 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>

 =head1 COPYRIGHT

-Copyright (C) 2010 Red Hat Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+Copyright (C) 2010-2012 Red Hat Inc.
--- a/cat/virt-ls.c
+++ b/cat/virt-ls.c
@@ -36,10 +36,6 @@
 #include "guestfs.h"
 #include "options.h"

-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
 /* Currently open libguestfs handle. */
 guestfs_h *g;

@@ -86,16 +82,6 @@ static int is_fifo (int64_t mode);
 static int is_lnk (int64_t mode);
 static int is_sock (int64_t mode);

-static size_t count_strings (char **);
-static void free_strings (char **);
-static char **take_strings (char **, size_t n, char ***);
-
-static inline char *
-bad_cast (char const *s)
-{
-  return (char *) s;
-}
-
 static void __attribute__((noreturn))
 usage (int status)
 {
@@ -169,6 +155,7 @@ main (int argc, char *argv[])
    { "human-readable", 0, 0, 'h' },
    { "keys-from-stdin", 0, 0, 0 },
    { "long", 0, 0, 'l' },
+    { "long-options", 0, 0, 0 },
    { "recursive", 0, 0, 'R' },
    { "time", 0, 0, 0 },
    { "times", 0, 0, 0 },
@@ -197,7 +184,7 @@ main (int argc, char *argv[])
    exit (EXIT_FAILURE);
  }

-  argv[0] = bad_cast (program_name);
+  argv[0] = (char *) program_name;

  for (;;) {
    c = getopt_long (argc, argv, options, long_options, &option_index);
@@ -205,7 +192,9 @@ main (int argc, char *argv[])

    switch (c) {
    case 0:			/* options which are long only */
-      if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
+      if (STREQ (long_options[option_index].name, "long-options"))
+        display_long_options (long_options);
+      else if (STREQ (long_options[option_index].name, "keys-from-stdin")) {
        keys_from_stdin = 1;
      } else if (STREQ (long_options[option_index].name, "echo-keys")) {
        echo_keys = 1;
@@ -414,18 +403,14 @@ main (int argc, char *argv[])
 static int
 do_ls (const char *dir)
 {
-  char **lines;
  size_t i;
+  CLEANUP_FREE_STRING_LIST char **lines = guestfs_ls (g, dir);

-  if ((lines = guestfs_ls (g, dir)) == NULL) {
+  if (lines == NULL)
    return -1;
-  }

-  for (i = 0; lines[i] != NULL; ++i) {
+  for (i = 0; lines[i] != NULL; ++i)
    printf ("%s\n", lines[i]);
-    free (lines[i]);
-  }
-  free (lines);

  return 0;
 }
@@ -433,13 +418,12 @@ do_ls (const char *dir)
 static int
 do_ls_l (const char *dir)
 {
-  char *out;
+  CLEANUP_FREE char *out = guestfs_ll (g, dir);

-  if ((out = guestfs_ll (g, dir)) == NULL)
+  if (out == NULL)
    return -1;

  printf ("%s", out);
-  free (out);

  return 0;
 }
@@ -447,71 +431,22 @@ do_ls_l (const char *dir)
 static int
 do_ls_R (const char *dir)
 {
-  /* This is TMP_TEMPLATE_ON_STACK expanded from fish.h. */
-  const char *tmpdir = guestfs_tmpdir ();
-  char tmpfile[strlen (tmpdir) + 32];
-  sprintf (tmpfile, "%s/virtlsXXXXXX", tmpdir);
+  size_t i;
+  CLEANUP_FREE_STRING_LIST char **dirs = guestfs_find (g, dir);

-  int fd = mkstemp (tmpfile);
-  if (fd == -1) {
-    perror ("mkstemp");
-    exit (EXIT_FAILURE);
-  }
-
-  char buf[BUFSIZ]; /* also used below */
-  snprintf (buf, sizeof buf, "/dev/fd/%d", fd);
-
-  if (guestfs_find0 (g, dir, buf) == -1)
+  if (dirs == NULL)
    return -1;

-  if (close (fd) == -1) {
-    perror (tmpfile);
-    exit (EXIT_FAILURE);
-  }
+  for (i = 0; dirs[i] != NULL; ++i)
+    puts (dirs[i]);

-  /* The output of find0 is a \0-separated file.  Turn each \0 into
-   * a \n character.
-   */
-  fd = open (tmpfile, O_RDONLY|O_CLOEXEC);
-  if (fd == -1) {
-    perror (tmpfile);
-    exit (EXIT_FAILURE);
-  }
-
-  ssize_t r;
-  while ((r = read (fd, buf, sizeof buf)) > 0) {
-    size_t i;
-    for (i = 0; i < (size_t) r; ++i)
-      if (buf[i] == '\0')
-        buf[i] = '\n';
-
-    size_t n = r;
-    while (n > 0) {
-      r = write (1, buf, n);
-      if (r == -1) {
-        perror ("write");
-        exit (EXIT_FAILURE);
-      }
-      n -= r;
-    }
-  }
-
-  if (r == -1 || close (fd) == -1) {
-    perror (tmpfile);
-    exit (EXIT_FAILURE);
-  }
-
- unlink (tmpfile);
-
- return 0;
+  return 0;
 }

 /* Adapted from
 https://rwmj.wordpress.com/2010/12/15/tip-audit-virtual-machine-for-setuid-files/
 */
 static char *full_path (const char *dir, const char *name);
-static struct guestfs_stat_list *lstatlist (const char *dir, char **names);
-static struct guestfs_xattr_list *lxattrlist (const char *dir, char **names);
 static int show_file (const char *dir, const char *name, const struct guestfs_stat *stat, const struct guestfs_xattr_list *xattrs);

 typedef int (*visitor_function) (const char *dir, const char *name, const struct guestfs_stat *stat, const struct guestfs_xattr_list *xattrs);
@@ -524,8 +459,8 @@ visit (int depth, const char *dir, visitor_function f)
   * case.
   */
  if (depth == 0) {
-    struct guestfs_stat *stat;
-    struct guestfs_xattr_list *xattrs;
+    CLEANUP_FREE_STAT struct guestfs_stat *stat = NULL;
+    CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;
    int r;

    stat = guestfs_lstat (g, dir);
@@ -533,40 +468,35 @@ visit (int depth, const char *dir, visitor_function f)
      return -1;

    xattrs = guestfs_lgetxattrs (g, dir);
-    if (xattrs == NULL) {
-      guestfs_free_stat (stat);
+    if (xattrs == NULL)
      return -1;
-    }

    r = f (dir, NULL, stat, xattrs);
-    guestfs_free_stat (stat);
-    guestfs_free_xattr_list (xattrs);

    if (r == -1)
      return -1;
  }

-  int ret = -1;
-  char **names = NULL;
-  char *path = NULL;
  size_t i, xattrp;
-  struct guestfs_stat_list *stats = NULL;
-  struct guestfs_xattr_list *xattrs = NULL;
+  CLEANUP_FREE_STRING_LIST char **names = NULL;
+  CLEANUP_FREE_STAT_LIST struct guestfs_stat_list *stats = NULL;
+  CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;

  names = guestfs_ls (g, dir);
  if (names == NULL)
-    goto out;
+    return -1;

-  stats = lstatlist (dir, names);
+  stats = guestfs_lstatlist (g, dir, names);
  if (stats == NULL)
-    goto out;
+    return -1;

-  xattrs = lxattrlist (dir, names);
+  xattrs = guestfs_lxattrlist (g, dir, names);
  if (xattrs == NULL)
-    goto out;
+    return -1;

  /* Call function on everything in this directory. */
  for (i = 0, xattrp = 0; names[i] != NULL; ++i, ++xattrp) {
+    CLEANUP_FREE char *path = NULL;
    struct guestfs_xattr_list file_xattrs;
    size_t nr_xattrs;

@@ -579,13 +509,17 @@ visit (int depth, const char *dir, visitor_function f)
    if (xattrs->val[xattrp].attrval_len == 0) {
      fprintf (stderr, _("%s: error getting extended attrs for %s %s\n"),
               program_name, dir, names[i]);
-      goto out;
+      return -1;
    }
-    /* lxattrlist function made sure attrval was \0-terminated, so we can do */
-    if (sscanf (xattrs->val[xattrp].attrval, "%zu", &nr_xattrs) != 1) {
+    /* attrval is not \0-terminated. */
+    char attrval[xattrs->val[xattrp].attrval_len+1];
+    memcpy (attrval, xattrs->val[xattrp].attrval,
+            xattrs->val[xattrp].attrval_len);
+    attrval[xattrs->val[xattrp].attrval_len] = '\0';
+    if (sscanf (attrval, "%zu", &nr_xattrs) != 1) {
      fprintf (stderr, _("%s: error: cannot parse xattr count for %s %s\n"),
               program_name, dir, names[i]);
-      goto out;
+      return -1;
    }

    file_xattrs.len = nr_xattrs;
@@ -594,28 +528,17 @@ visit (int depth, const char *dir, visitor_function f)

    /* Call the function. */
    if (f (dir, names[i], &stats->val[i], &file_xattrs) == -1)
-      goto out;
+      return -1;

    /* Recursively call visit, but only on directories. */
    if (is_dir (stats->val[i].mode)) {
      path = full_path (dir, names[i]);
      if (visit (depth + 1, path, f) == -1)
-        goto out;
-      free (path); path = NULL;
+        return -1;
    }
  }

-  ret = 0;
-
- out:
-  free (path);
-  if (names)
-    free_strings (names);
-  if (stats)
-    guestfs_free_stat_list (stats);
-  if (xattrs)
-    guestfs_free_xattr_list (xattrs);
-  return ret;
+  return 0;
 }

 static char *
@@ -639,129 +562,6 @@ full_path (const char *dir, const char *name)
  return path;
 }

-/* This calls guestfs_lstatlist, but it splits the names list up so that we
- * don't overrun the libguestfs protocol limit.
- */
-#define LSTATLIST_MAX 1000
-
-static struct guestfs_stat_list *
-lstatlist (const char *dir, char **names)
-{
-  size_t len = count_strings (names);
-  char **first;
-  size_t old_len;
-  struct guestfs_stat_list *ret, *stats;
-
-  ret = malloc (sizeof *ret);
-  if (ret == NULL) {
-    perror ("malloc");
-    exit (EXIT_FAILURE);
-  }
-  ret->len = 0;
-  ret->val = NULL;
-
-  while (len > 0) {
-    first = take_strings (names, LSTATLIST_MAX, &names);
-    len = len <= LSTATLIST_MAX ? 0 : len - LSTATLIST_MAX;
-
-    stats = guestfs_lstatlist (g, dir, first);
-    /* Note we don't need to free up the strings because take_strings
-     * does not do a deep copy.
-     */
-    free (first);
-
-    if (stats == NULL) {
-      free (ret);
-      return NULL;
-    }
-
-    /* Append stats to ret. */
-    old_len = ret->len;
-    ret->len += stats->len;
-    ret->val = realloc (ret->val, ret->len * sizeof (struct guestfs_stat));
-    if (ret->val == NULL) {
-      perror ("realloc");
-      exit (EXIT_FAILURE);
-    }
-    memcpy (&ret->val[old_len], stats->val,
-            stats->len * sizeof (struct guestfs_stat));
-
-    guestfs_free_stat_list (stats);
-  }
-
-  return ret;
-}
-
-/* Same as above, for lxattrlist.  Note the rather peculiar format
- * used to return the list of extended attributes (see
- * guestfs_lxattrlist documentation).
- */
-#define LXATTRLIST_MAX 1000
-
-static struct guestfs_xattr_list *
-lxattrlist (const char *dir, char **names)
-{
-  size_t len = count_strings (names);
-  char **first;
-  size_t i, old_len;
-  struct guestfs_xattr_list *ret, *xattrs;
-
-  ret = malloc (sizeof *ret);
-  if (ret == NULL) {
-    perror ("malloc");
-    exit (EXIT_FAILURE);
-  }
-  ret->len = 0;
-  ret->val = NULL;
-
-  while (len > 0) {
-    first = take_strings (names, LXATTRLIST_MAX, &names);
-    len = len <= LXATTRLIST_MAX ? 0 : len - LXATTRLIST_MAX;
-
-    xattrs = guestfs_lxattrlist (g, dir, first);
-    /* Note we don't need to free up the strings because take_strings
-     * does not do a deep copy.
-     */
-    free (first);
-
-    if (xattrs == NULL) {
-      free (ret);
-      return NULL;
-    }
-
-    /* Append xattrs to ret. */
-    old_len = ret->len;
-    ret->len += xattrs->len;
-    ret->val = realloc (ret->val, ret->len * sizeof (struct guestfs_xattr));
-    if (ret->val == NULL) {
-      perror ("realloc");
-      exit (EXIT_FAILURE);
-    }
-    for (i = 0; i < xattrs->len; ++i, ++old_len) {
-      /* We have to make a deep copy of the attribute name and value.
-       * The attrval contains 8 bit data.  However make sure also that
-       * it is \0-terminated, because that makes the calling code
-       * simpler.
-       */
-      ret->val[old_len].attrname = strdup (xattrs->val[i].attrname);
-      ret->val[old_len].attrval = malloc (xattrs->val[i].attrval_len + 1);
-      if (ret->val[old_len].attrname == NULL ||
-          ret->val[old_len].attrval == NULL) {
-        perror ("malloc");
-        exit (EXIT_FAILURE);
-      }
-      ret->val[old_len].attrval_len = xattrs->val[i].attrval_len;
-      memcpy (ret->val[old_len].attrval, xattrs->val[i].attrval,
-              xattrs->val[i].attrval_len);
-      ret->val[i].attrval[ret->val[i].attrval_len] = '\0';
-    }
-
-    guestfs_free_xattr_list (xattrs);
-  }
-
-  return ret;
-}
-
 static int
 do_ls_lR (const char *dir)
 {
@@ -781,7 +581,7 @@ show_file (const char *dir, const char *name,
           const struct guestfs_xattr_list *xattrs)
 {
  char filetype[2];
-  char *path, *csum = NULL, *link = NULL;
+  CLEANUP_FREE char *path = NULL, *csum = NULL, *link = NULL;

  /* Display the basic fields. */
  output_start_line ();
@@ -853,10 +653,6 @@ show_file (const char *dir, const char *name,

  output_end_line ();

-  free (path);
-  free (csum);
-  free (link);
-
  return 0;
 }

@@ -1136,50 +932,3 @@ is_sock (int64_t mode)
 {
  return (mode & 0170000) == 0140000;
 }
-
-/* String functions. */
-static size_t
-count_strings (char **names)
-{
-  size_t ret = 0;
-
-  while (names[ret] != NULL)
-    ret++;
-  return ret;
-}
-
-static void
-free_strings (char **names)
-{
-  size_t i;
-
-  for (i = 0; names[i] != NULL; ++i)
-    free (names[i]);
-  free (names);
-}
-
-/* Take the first 'n' names, returning a newly allocated list.  The
- * strings themselves are not duplicated.  If 'lastp' is not NULL,
- * then it is updated with the pointer to the list of remaining names.
- */
-static char **
-take_strings (char **names, size_t n, char ***lastp)
-{
-  size_t i;
-
-  char **ret = malloc ((n+1) * sizeof (char *));
-  if (ret == NULL) {
-    perror ("malloc");
-    exit (EXIT_FAILURE);
-  }
-
-  for (i = 0; names[i] != NULL && i < n; ++i)
-    ret[i] = names[i];
-
-  ret[i] = NULL;
-
-  if (lastp)
-    *lastp = &names[i];
-
-  return ret;
-}
--- a/cat/virt-ls.pod
+++ b/cat/virt-ls.pod
@@ -499,9 +499,6 @@ L<guestfish(1)>,
 L<virt-cat(1)>,
 L<virt-copy-out(1)>,
 L<virt-tar-out(1)>,
-L<Sys::Guestfs(3)>,
-L<Sys::Guestfs::Lib(3)>,
-L<Sys::Virt(3)>,
 L<http://libguestfs.org/>.

 =head1 AUTHOR
@@ -510,18 +507,4 @@ Richard W.M. Jones L<http://people.redhat.com/~rjones/>

 =head1 COPYRIGHT

-Copyright (C) 2009-2012 Red Hat Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+Copyright (C) 2009-2013 Red Hat Inc.
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize Makefile.maint.                           -*- makefile -*-
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,6 +24,17 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
 url_dir_list = \
  ftp://$(gnu_rel_host)/gnu/coreutils

+# Exclude some filenames.
+exclude_file_name_regexp--sc_bindtextdomain = ^(daemon|erlang|examples|tests)/
+exclude_file_name_regexp--sc_error_message_period = ^php/
+exclude_file_name_regexp--sc_prohibit_always-defined_macros = ^examples/
+exclude_file_name_regexp--sc_prohibit_doubled_word = ^po/
+exclude_file_name_regexp--sc_prohibit_magic_number_exit = ^(po|po-docs)/|\.pod$
+exclude_file_name_regexp--sc_prohibit_strcmp = ^examples/
+exclude_file_name_regexp--sc_prohibit_strcmp_and_strncmp = ^examples/
+exclude_file_name_regexp--sc_prohibit_strncpy = ^src/launch-.*\.c$
+exclude_file_name_regexp--sc_require_config_h = ^examples/|^tests/c-api/test-just-header\.c$
+
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =			\
  sc_po_check				\
@@ -41,7 +52,8 @@ local-checks-to-skip =			\
  sc_error_message_uppercase		\
  sc_program_name			\
  $(disable_temporarily)		\
-  sc_useless_cpp_parens
+  sc_useless_cpp_parens			\
+  sc_cast_of_argument_to_free

 disable_temporarily =			\
  sc_makefile_check			\
@@ -82,14 +94,6 @@ sc_prohibit_ctype_h:
 	  { echo "$(ME): don't use ctype.h; instead, use c-ctype.h"	\
 		1>&2; exit 1; } || :

-# Ensure that no C source file uses TABs for indentation.
-# Exclude some version-controlled symlinks.
-sc_TAB_in_indentation:
-	@grep -lE '^ *	' /dev/null					\
-	     $$($(VC_LIST_EXCEPT)) &&					\
-	  { echo '$(ME): found TAB(s) used for indentation in C sources;'\
-	      'use spaces' 1>&2; exit 1; } || :
-
 ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\
 |isprint|ispunct|isspace|isupper|isxdigit|tolower|toupper

@@ -111,16 +115,6 @@ sc_prohibit_gethostby:
 	halt='use getaddrinfo, not gethostby*'				\
 	  $(_sc_search_regexp)

-# Disallow trailing blank lines.
-sc_prohibit_trailing_blank_lines:
-	@$(VC_LIST_EXCEPT)						\
-	  | xargs perl -ln -0777 -e					\
-	      '-f $$ARGV or next; /\n\n+$$/ and print $$ARGV' > $@-t
-	@found=0; test -s $@-t && { found=1; cat $@-t 1>&2;		\
-	  echo '$(ME): found trailing blank line(s)' 1>&2; };		\
-	rm -f $@-t;							\
-	test $$found = 0
-
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null

--- a/configure.ac
+++ b/configure.ac
--- a/contrib/README
+++ b/contrib/README
@@ -22,6 +22,11 @@ make-check-on-installed.pl
        we release them.  Note that a checked out copy of the source
        from git is required.  Read the top of the file before using.

+windows-icons.pl
+        This script lets you extract all the icons from a Windows
+        guest.  We use this to locate the Windows logo in new releases
+        of Windows (see src/inspect-icon.c).
+
 visualize-alignment/
        Tests for visualizing block device reads and writes and
        alignment using a patched qemu.  See the README file in that
--- a/contrib/autobuild/autobuild.sh
+++ b/contrib/autobuild/autobuild.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -
 # libguestfs autobuild script
-# Copyright (C) 2009-2012 Red Hat Inc.
+# Copyright (C) 2009-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/contrib/intro/libguestfs-intro.html
+++ b/contrib/intro/libguestfs-intro.html
@@ -119,6 +119,7 @@ char *
  return get_blkid_tag (device, "TYPE");
 }

+GUESTFSD_EXT_CMD(str_blkid, blkid);
 static char *
 get_blkid_tag (const char *device, const char *tag)
 {
@@ -126,7 +127,7 @@ get_blkid_tag (const char *device, const char *tag)
  int r;

  r = commandr (&amp;out, &amp;err,
-                "blkid",
+                str_blkid,
                "-c", "/dev/null",
                "-o", "value", "-s", tag, device, NULL);
  if (r != 0 &amp;&amp; r != 2) {
@@ -182,9 +183,9 @@ get_blkid_tag (const char *device, const char *tag)
      <tr><td valign="top" style="padding-bottom: 1.5em;" colspan="2">
 <pre>
 <b>guestfish -N bootrootlv:/dev/VG/LV:ext4:ext4:10G:256M &lt;&lt;EOF</b>
-  <font style="color: green;">mount-options "" /dev/VG/LV /
+  <font style="color: green;">mount /dev/VG/LV /
  mkdir /boot
-  mount-options "" /dev/sda1 /boot
+  mount /dev/sda1 /boot
  txz-in filesystem.tar.xz /
  write /etc/HOSTNAME "test01.example.com\n"
  upload /etc/resolv.conf /etc/resolv.conf</font>
--- a/contrib/intro/talk.txt
+++ b/contrib/intro/talk.txt
@@ -159,4 +159,3 @@ screenshots shown.  But many people will simply want to mount
 a filesystem on the host using guestmount, and then use
 ordinary tools.  At the bottom is a screenshot of GNOME
 Nautilus browsing into a guest filesystem.
-
--- a/contrib/make-check-on-installed.pl
+++ b/contrib/make-check-on-installed.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # libguestfs
-# Copyright (C) 2009-2012 Red Hat Inc.
+# Copyright (C) 2009-2013 Red Hat Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--- a/contrib/visualize-alignment/tracetops.ml
+++ b/contrib/visualize-alignment/tracetops.ml
@@ -1,7 +1,7 @@
 #!/usr/bin/ocamlrun /usr/bin/ocaml

 (* Convert *.qtr (qemu block device trace) to Postscript.
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 * By Richard W.M. Jones <rjones@redhat.com>.
 *
 * This program is free software; you can redistribute it and/or modify
--- a/contrib/windows-icons.pl
+++ b/contrib/windows-icons.pl
@@ -0,0 +1,120 @@
+#!/usr/bin/perl -w
+# libguestfs
+# Copyright (C) 2012 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# This script lets you extract all the icons from a Windows guest.  We
+# use this to locate the Windows logo in new releases of Windows (see
+# src/inspect-icon.c).
+#
+# Use it like this:
+#   ./run ./contrib/windows-icons.pl /path/to/windows-disk.img
+
+use strict;
+
+use Sys::Guestfs;
+use File::Temp qw{tempdir};
+
+# Check that the tools we need are installed.
+system ("wrestool --help >/dev/null 2>&1") == 0 or
+    die "'wrestool' program is not installed\n";
+#system ("icotool --help >/dev/null 2>&1") == 0 or
+#    die "'icotool' program is not installed\n";
+
+# Check user provided disk image argument(s).
+if (@ARGV == 0) {
+    print STDERR "usage: $0 /path/to/windows-disk.img\n";
+    exit 1
+}
+
+# Assume libguestfs >= 1.19.32, because that means we don't
+# have to worry about protocol limits in various calls.
+my $g = Sys::Guestfs->new;
+my %version = $g->version ();
+unless ($version{minor} >= 20 ||
+        $version{minor} >= 19 && $version{release} >= 32) {
+    die "$0: version of libguestfs is too old, use >= 1.19.32\n"
+}
+
+# Open the disk image(s).
+$g->add_drive ($_, readonly => 1) foreach @ARGV;
+$g->launch ();
+
+# Check it's Windows.
+my @roots = $g->inspect_os ();
+if (@roots == 0) {
+    die "$0: no operating system found in disk image\n"
+}
+
+my $root = $roots[0];
+
+if ($g->inspect_get_type ($root) ne "windows") {
+    die "$0: disk image is not Windows (type = ", $g->inspect_get_type ($root),
+        ")\n"
+}
+
+# Mount it up.
+my %mps = $g->inspect_get_mountpoints ($root);
+my @mps = sort { length $a <=> length $b } (keys %mps);
+for my $mp (@mps) {
+    eval { $g->mount_ro ($mps{$mp}, $mp) };
+    if ($@) {
+        print "$@ (ignored)\n"
+    }
+}
+
+# Create an output directory.
+my $output = tempdir (CLEANUP => 0);
+print "writing icons to $output\n";
+chdir $output or die "chdir: $output: $!";
+
+# Get a list of all files.
+my @files = $g->find ("/");
+@files = map { "/$_" } @files;
+
+print "writing list of files to $output/files\n";
+open FILES, ">files" or die "open: files: $!";
+print FILES join("\n", @files) or die "write: files: $!";
+close FILES or die "close: files: $!";
+
+# Find all *.exe files.  (XXX Can other file types contain resources?)
+my @exe_files = grep { $_ =~ /\.exe$/i && $g->is_file ($_) } @files;
+
+foreach (@exe_files) {
+    # Download each *.exe file.
+    my $basename = $_;
+    $basename =~ s{.*/}{};
+    $g->download ($_, $basename);
+
+    # Extract any icon (2) or group-icon (14) resources it may contain.
+    system ("wrestool", "-x", "--type=2", "-o", "./", $basename);
+    system ("wrestool", "-x", "--type=14", "-o", "./", $basename);
+
+    unlink $basename;
+}
+
+# Find and download all other image files.
+foreach (@files) {
+    my $basename = $_;
+    $basename =~ s{.*/}{};
+
+    if ($g->is_file ($_) &&
+        $basename =~ /\.(png|git|jpeg|jpg|bmp|ico)$/i) {
+        $g->download ($_, $basename);
+    }
+}
+
+$g->close;
--- a/daemon/9p.c
+++ b/daemon/9p.c
@@ -33,6 +33,7 @@
 #include "actions.h"

 #define BUS_PATH "/sys/bus/virtio/drivers/9pnet_virtio"
+GUESTFSD_EXT_CMD(str_mount, mount);

 static char *read_whole_file (const char *filename);

@@ -47,8 +48,10 @@ do_list_9p (void)
  dir = opendir (BUS_PATH);
  if (!dir) {
    perror ("opendir: " BUS_PATH);
-    if (errno != ENOENT)
+    if (errno != ENOENT) {
+      reply_with_perror ("opendir: " BUS_PATH);
      return NULL;
+    }

    /* If this directory doesn't exist, it probably means that
     * the virtio driver isn't loaded.  Don't return an error
@@ -74,17 +77,14 @@ do_list_9p (void)
       * the mount tag length to be unlimited (or up to 65536 bytes).
       * See: linux/include/linux/virtio_9p.h
       */
-      char *mount_tag = read_whole_file (mount_tag_path);
+      CLEANUP_FREE char *mount_tag = read_whole_file (mount_tag_path);
      if (mount_tag == 0)
        continue;

      if (add_string (&r, mount_tag) == -1) {
-        free (mount_tag);
        closedir (dir);
        return NULL;
      }
-
-      free (mount_tag);
    }
  }

@@ -147,7 +147,7 @@ read_whole_file (const char *filename)
     */
    ssize_t n = read (fd, r + size, alloc - size - 1);
    if (n == -1) {
-      perror (filename);
+      fprintf (stderr, "read: %s: %m\n", filename);
      free (r);
      close (fd);
      return NULL;
@@ -158,7 +158,7 @@ read_whole_file (const char *filename)
  }

  if (close (fd) == -1) {
-    perror (filename);
+    fprintf (stderr, "close: %s: %m\n", filename);
    free (r);
    return NULL;
  }
@@ -172,26 +172,26 @@ read_whole_file (const char *filename)
 int
 do_mount_9p (const char *mount_tag, const char *mountpoint, const char *options)
 {
-  char *mp = NULL, *opts = NULL, *err = NULL;
+  CLEANUP_FREE char *mp = NULL, *opts = NULL, *err = NULL;
  struct stat statbuf;
-  int r = -1;
+  int r;

  ABS_PATH (mountpoint, , return -1);

  mp = sysroot_path (mountpoint);
  if (!mp) {
    reply_with_perror ("malloc");
-    goto out;
+    return -1;
  }

  /* Check the mountpoint exists and is a directory. */
  if (stat (mp, &statbuf) == -1) {
    reply_with_perror ("%s", mountpoint);
-    goto out;
+    return -1;
  }
  if (!S_ISDIR (statbuf.st_mode)) {
    reply_with_perror ("%s: mount point is not a directory", mountpoint);
-    goto out;
+    return -1;
  }

  /* Add trans=virtio to the options. */
@@ -199,28 +199,23 @@ do_mount_9p (const char *mount_tag, const char *mountpoint, const char *options)
      STRNEQ (options, "")) {
    if (asprintf (&opts, "trans=virtio,%s", options) == -1) {
      reply_with_perror ("asprintf");
-      goto out;
+      return -1;
    }
  }
  else {
    opts = strdup ("trans=virtio");
    if (opts == NULL) {
      reply_with_perror ("strdup");
-      goto out;
+      return -1;
    }
  }

  r = command (NULL, &err,
-               "mount", "-o", opts, "-t", "9p", mount_tag, mp, NULL);
+               str_mount, "-o", opts, "-t", "9p", mount_tag, mp, NULL);
  if (r == -1) {
    reply_with_error ("%s on %s: %s", mount_tag, mountpoint, err);
-    goto out;
+    return -1;
  }

-  r = 0;
- out:
-  free (err);
-  free (opts);
-  free (mp);
-  return r;
+  return 0;
 }
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -17,23 +17,32 @@

 include $(top_srcdir)/subdir-rules.mk

-libsrcdir = $(top_builddir)/src
+CLEANFILES = stamp-guestfsd.pod

 generator_built = \
 	actions.h \
 	stubs.c \
 	names.c

-BUILT_SOURCES = \
-	$(generator_built) \
+shared_with_library = \
 	guestfs_protocol.c \
 	guestfs_protocol.h \
-	errnostring_gperf.c \
-	errnostring_gperf.gperf \
+	errnostring-gperf.gperf \
 	errnostring.c \
 	errnostring.h

-EXTRA_DIST = $(BUILT_SOURCES)
+BUILT_SOURCES = \
+	$(generator_built) \
+	$(shared_with_library) \
+	errnostring-gperf.c
+
+EXTRA_DIST = \
+	$(BUILT_SOURCES) \
+	guestfsd.pod
+
+$(shared_with_library): %: $(top_srcdir)/src/%
+	rm -f $@
+	ln $< $@

 noinst_LIBRARIES = libprotocol.a

@@ -42,39 +51,24 @@ noinst_LIBRARIES = libprotocol.a
 libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
 libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing

-guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
-	rm -f $@
-	ln $< $@
-guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h
-	rm -f $@
-	ln $< $@
-$(libsrcdir)/guestfs_protocol.c: force
-	$(MAKE) -C $(libsrcdir) guestfs_protocol.c
-$(libsrcdir)/guestfs_protocol.h: force
-	$(MAKE) -C $(libsrcdir) guestfs_protocol.h
+$(top_builddir)/src/guestfs_protocol.c: force
+	$(MAKE) -C $(top_builddir)/src guestfs_protocol.c
+$(top_builddir)/src/guestfs_protocol.h: force
+	$(MAKE) -C $(top_builddir)/src guestfs_protocol.h

 # Build the errnostring perfect hash code.  The generated code has lots
 # of warnings so we must compile it in a separate mini-library.
 noinst_LIBRARIES += liberrnostring.a
 liberrnostring_a_SOURCES = \
-	errnostring_gperf.c \
+	errnostring-gperf.c \
 	errnostring.h \
 	errnostring.c
 liberrnostring_a_CFLAGS =

-errnostring_gperf.c: errnostring_gperf.gperf
+errnostring-gperf.c: errnostring-gperf.gperf
 	rm -f $@
 	$(GPERF) -t $< > $@-t
 	mv $@-t $@
-errnostring_gperf.gperf: $(libsrcdir)/errnostring_gperf.gperf
-	rm -f $@
-	ln $< $@
-errnostring.c: $(libsrcdir)/errnostring.c
-	rm -f $@
-	ln $< $@
-errnostring.h: $(libsrcdir)/errnostring.h
-	rm -f $@
-	ln $< $@

 if INSTALL_DAEMON
 sbin_PROGRAMS = guestfsd
@@ -84,6 +78,7 @@ endif

 guestfsd_SOURCES = \
 	9p.c \
+	acl.c \
 	actions.h \
 	available.c \
 	augeas.c \
@@ -91,6 +86,7 @@ guestfsd_SOURCES = \
 	blkid.c \
 	blockdev.c \
 	btrfs.c \
+	cap.c \
 	checksum.c \
 	cmp.c \
 	command.c \
@@ -106,7 +102,7 @@ guestfsd_SOURCES = \
 	dmesg.c \
 	dropcaches.c \
 	du.c \
-	echo_daemon.c \
+	echo-daemon.c \
 	ext2.c \
 	fallocate.c \
 	file.c \
@@ -114,12 +110,15 @@ guestfsd_SOURCES = \
 	fill.c \
 	find.c \
 	fsck.c \
+	fstrim.c \
 	glob.c \
 	grep.c \
 	grub.c \
 	guestfsd.c \
 	headtail.c \
 	hexdump.c \
+	hotplug.c \
+	hivex.c \
 	htonl.c \
 	initrd.c \
 	inotify.c \
@@ -127,6 +126,7 @@ guestfsd_SOURCES = \
 	is.c \
 	isoinfo.c \
 	labels.c \
+	ldm.c \
 	link.c \
 	ls.c \
 	luks.c \
@@ -135,8 +135,10 @@ guestfsd_SOURCES = \
 	md.c \
 	mkfs.c \
 	mknod.c \
+	mktemp.c \
 	modprobe.c \
 	mount.c \
+	mountable.c \
 	names.c \
 	ntfs.c \
 	ntfsclone.c \
@@ -147,6 +149,8 @@ guestfsd_SOURCES = \
 	proto.c \
 	readdir.c \
 	realpath.c \
+	rename.c \
+	rsync.c \
 	scrub.c \
 	selinux.c \
 	sfdisk.c \
@@ -157,20 +161,28 @@ guestfsd_SOURCES = \
 	stubs.c \
 	swap.c \
 	sync.c \
+	syslinux.c \
 	tar.c \
 	truncate.c \
 	umask.c \
 	upload.c \
 	utimens.c \
+	utsname.c \
 	wc.c \
 	xattr.c \
+	xfs.c \
 	zero.c \
 	zerofree.c
+
 guestfsd_LDADD = \
 	liberrnostring.a \
 	libprotocol.a \
+	$(ACL_LIBS) \
+	$(CAP_LIBS) \
+	$(YAJL_LIBS) \
 	$(SELINUX_LIB) \
 	$(AUGEAS_LIBS) \
+	$(HIVEX_LIBS) \
 	$(top_builddir)/gnulib/lib/.libs/libgnu.a \
 	$(GETADDRINFO_LIB) \
 	$(HOSTENT_LIB) \
@@ -178,9 +190,34 @@ guestfsd_LDADD = \
 	$(LIBSOCKET) \
 	$(LIB_CLOCK_GETTIME) \
 	$(LIBINTL) \
-	$(SERVENT_LIB)
+	$(SERVENT_LIB) \
+	$(PCRE_LIBS)

-guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
+guestfsd_CPPFLAGS = \
+	-I$(top_srcdir)/gnulib/lib \
+	-I$(top_builddir)/gnulib/lib \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src
+guestfsd_CFLAGS = \
+	$(WARN_CFLAGS) $(WERROR_CFLAGS) \
+	$(AUGEAS_CFLAGS) \
+	$(HIVEX_CFLAGS) \
+	$(YAJL_CFLAGS) \
+	$(PCRE_CFLAGS)
+
+# Manual pages and HTML files for the website.
+man_MANS = guestfsd.8
+noinst_DATA = $(top_builddir)/html/guestfsd.8.html
+
+guestfsd.8 $(top_builddir)/html/guestfsd.8.html: stamp-guestfsd.pod
+
+stamp-guestfsd.pod: guestfsd.pod
+	$(PODWRAPPER) \
+	  --section 8 \
+	  --man guestfsd.8 \
+	  --html $(top_builddir)/html/guestfsd.8.html \
+	  --license GPLv2+ \
+	  $<
+	touch $@

 .PHONY: force
--- a/daemon/acl.c
+++ b/daemon/acl.c
@@ -0,0 +1,149 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2012 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include "guestfs_protocol.h"
+#include "daemon.h"
+#include "actions.h"
+#include "optgroups.h"
+
+#if defined(HAVE_ACL)
+
+#include <sys/types.h>
+#include <sys/acl.h>
+
+int
+optgroup_acl_available (void)
+{
+  return 1;
+}
+
+char *
+do_acl_get_file (const char *path, const char *acltype)
+{
+  acl_type_t t;
+  acl_t acl;
+  char *r, *ret;
+
+  if (STREQ (acltype, "access"))
+    t = ACL_TYPE_ACCESS;
+  else if (STREQ (acltype, "default"))
+    t = ACL_TYPE_DEFAULT;
+  else {
+    reply_with_error ("invalid acltype parameter: %s", acltype);
+    return NULL;
+  }
+
+  CHROOT_IN;
+  acl = acl_get_file (path, t);
+  CHROOT_OUT;
+
+  if (acl == NULL) {
+    reply_with_perror ("%s", path);
+    return NULL;
+  }
+
+  r = acl_to_text (acl, NULL);
+  if (r == NULL) {
+    reply_with_perror ("acl_to_text");
+    acl_free (acl);
+    return NULL;
+  }
+
+  acl_free (acl);
+
+  /* 'r' is not an ordinary pointer that can be freed with free(3)!
+   * In the current implementation of libacl, if you try to do that it
+   * will segfault.  We have to duplicate this into an ordinary
+   * buffer, then call acl_free (r).
+   */
+  ret = strdup (r);
+  if (ret == NULL) {
+    reply_with_perror ("strdup");
+    acl_free (r);
+    return NULL;
+  }
+  acl_free (r);
+
+  return ret;                   /* caller frees */
+}
+
+int
+do_acl_set_file (const char *path, const char *acltype, const char *aclstr)
+{
+  acl_type_t t;
+  acl_t acl;
+  int r;
+
+  if (STREQ (acltype, "access"))
+    t = ACL_TYPE_ACCESS;
+  else if (STREQ (acltype, "default"))
+    t = ACL_TYPE_DEFAULT;
+  else {
+    reply_with_error ("invalid acltype parameter: %s", acltype);
+    return -1;
+  }
+
+  acl = acl_from_text (aclstr);
+  if (acl == NULL) {
+    reply_with_perror ("could not parse acl string: %s: acl_from_text", aclstr);
+    return -1;
+  }
+
+  CHROOT_IN;
+  r = acl_set_file (path, t, acl);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    reply_with_perror ("%s", path);
+    acl_free (acl);
+    return -1;
+  }
+
+  acl_free (acl);
+
+  return 0;
+}
+
+int
+do_acl_delete_def_file (const char *dir)
+{
+  int r;
+
+  CHROOT_IN;
+  r = acl_delete_def_file (dir);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    reply_with_perror ("%s", dir);
+    return -1;
+  }
+
+  return 0;
+}
+
+#else /* no acl library */
+
+OPTGROUP_ACL_NOT_AVAILABLE
+
+#endif /* no acl library */
--- a/daemon/augeas.c
+++ b/daemon/augeas.c
@@ -68,7 +68,7 @@ optgroup_augeas_available (void)
 int
 do_aug_init (const char *root, int flags)
 {
-  char *buf;
+  CLEANUP_FREE char *buf = NULL;

  if (aug) {
    aug_close (aug);
@@ -82,7 +82,6 @@ do_aug_init (const char *root, int flags)
  }

  aug = aug_init (buf, NULL, flags);
-  free (buf);

  if (!aug) {
    reply_with_error ("Augeas initialization failed");
@@ -338,7 +337,6 @@ char **
 do_aug_ls (const char *path)
 {
  char **matches;
-  char *buf;
  size_t len;

  NEED_AUG (NULL);
@@ -358,6 +356,8 @@ do_aug_ls (const char *path)
  if (STREQ (path, "/"))
    matches = do_aug_match ("/*");
  else {
+    CLEANUP_FREE char *buf;
+
    len += 3;			/* / * + terminating \0 */
    buf = malloc (len);
    if (buf == NULL) {
@@ -367,7 +367,6 @@ do_aug_ls (const char *path)

    snprintf (buf, len, "%s/*", path);
    matches = do_aug_match (buf);
-    free (buf);
  }

  if (matches == NULL)
@@ -379,98 +378,6 @@ do_aug_ls (const char *path)

 #else /* !HAVE_AUGEAS */

-/* Note that the wrapper code (daemon/stubs.c) ensures that the
- * functions below are never called because optgroup_augeas_available
- * returns false.
- */
-int
-optgroup_augeas_available (void)
-{
-  return 0;
-}
-
-int
-do_aug_init (const char *root, int flags)
-{
-  abort ();
-}
-
-int
-do_aug_close (void)
-{
-  abort ();
-}
-
-int
-do_aug_defvar (const char *name, const char *expr)
-{
-  abort ();
-}
-
-guestfs_int_int_bool *
-do_aug_defnode (const char *name, const char *expr, const char *val)
-{
-  abort ();
-}
-
-char *
-do_aug_get (const char *path)
-{
-  abort ();
-}
-
-int
-do_aug_set (const char *path, const char *val)
-{
-  abort ();
-}
-
-int
-do_aug_clear (const char *path)
-{
-  abort ();
-}
-
-int
-do_aug_insert (const char *path, const char *label, int before)
-{
-  abort ();
-}
-
-int
-do_aug_rm (const char *path)
-{
-  abort ();
-}
-
-int
-do_aug_mv (const char *src, const char *dest)
-{
-  abort ();
-}
-
-char **
-do_aug_match (const char *path)
-{
-  abort ();
-}
-
-int
-do_aug_save (void)
-{
-  abort ();
-}
-
-int
-do_aug_load (void)
-{
-  abort ();
-}
-
-char **
-do_aug_ls (const char *path)
-{
-  abort ();
-}
+OPTGROUP_AUGEAS_NOT_AVAILABLE

 #endif
--- a/daemon/available.c
+++ b/daemon/available.c
@@ -22,12 +22,19 @@
 #include <stdlib.h>
 #include <string.h>

+#include "c-ctype.h"
+#include "ignore-value.h"
+
 #include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"
+#include "optgroups.h"

-int
-do_available (char *const *groups)
+GUESTFSD_EXT_CMD(str_grep, grep);
+GUESTFSD_EXT_CMD(str_modprobe, modprobe);
+
+static int
+available (char *const *groups, int error_on_unavailable)
 {
  int av;
  size_t i, j;
@@ -37,8 +44,12 @@ do_available (char *const *groups)
      if (STREQ (groups[i], optgroups[j].group)) {
        av = optgroups[j].available ();
        if (!av) {
-          reply_with_error ("%s: group not available", optgroups[j].group);
-          return -1;
+          if (error_on_unavailable) {
+            reply_with_error ("%s: group not available", optgroups[j].group);
+            return -1;
+          }
+          else
+            return 0;
        }
        break; /* out of for (j) loop */
      }
@@ -51,6 +62,23 @@ do_available (char *const *groups)
    }
  }

+  /* All specified groups available. */
+  return 1;
+}
+
+int
+do_feature_available (char *const *groups)
+{
+  return available (groups, 0);
+}
+
+int
+do_available (char *const *groups)
+{
+  if (available (groups, 1) == -1)
+    return -1;
+
+  /* No error, so all groups available, just returns no error. */
  return 0;
 }

@@ -70,3 +98,77 @@ do_available_all_groups (void)

  return groups.argv;           /* caller frees */
 }
+
+/* Search for filesystem in /proc/filesystems, ignoring "nodev". */
+static int
+test_proc_filesystems (const char *filesystem)
+{
+  size_t len = strlen (filesystem) + 32;
+  char regex[len];
+  CLEANUP_FREE char *err = NULL;
+  int r;
+
+  snprintf (regex, len, "^[[:space:]]*%s$", filesystem);
+
+  r = commandr (NULL, &err, str_grep, regex, "/proc/filesystems", NULL);
+  if (r == -1 || r >= 2) {
+    fprintf (stderr, "grep /proc/filesystems: %s", err);
+    return -1;
+  }
+
+  return r == 0;
+}
+
+/* Do modprobe, ignore any errors. */
+static void
+modprobe (const char *module)
+{
+  ignore_value (command (NULL, NULL, str_modprobe, module, NULL));
+}
+
+/* Internal function for testing if a filesystem is available.  Note
+ * this must not call reply_with_error functions.
+ */
+int
+filesystem_available (const char *filesystem)
+{
+  int r;
+
+  r = test_proc_filesystems (filesystem);
+  if (r == -1 || r > 0)
+    return r;
+
+  /* Not found: try to modprobe the module, then test again. */
+  if (optgroup_linuxmodules_available ()) {
+    modprobe (filesystem);
+
+    r = test_proc_filesystems (filesystem);
+    if (r == -1)
+      return -1;
+  }
+
+  return r;
+}
+
+int
+do_filesystem_available (const char *filesystem)
+{
+  size_t i, len = strlen (filesystem);
+  int r;
+
+  for (i = 0; i < len; ++i) {
+    if (!c_isalnum (filesystem[i]) && filesystem[i] != '_') {
+      reply_with_error ("filesystem name contains non-alphanumeric characters");
+      return -1;
+    }
+  }
+
+  r = filesystem_available (filesystem);
+  if (r == -1) {
+    reply_with_error ("error testing for filesystem availability; "
+                      "enable verbose mode and look at preceeding output");
+    return -1;
+  }
+
+  return r;
+}
--- a/daemon/base64.c
+++ b/daemon/base64.c
@@ -22,11 +22,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>

 #include "guestfs_protocol.h"
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_base64, base64);
+
 static int
 write_cb (void *fd_ptr, const void *buf, size_t len)
 {
@@ -40,9 +45,9 @@ do_base64_in (const char *file)
 {
  int err, r;
  FILE *fp;
-  char *cmd;
+  CLEANUP_FREE char *cmd = NULL;

-  if (asprintf_nowarn (&cmd, "base64 -d -i > %R", file) == -1) {
+  if (asprintf_nowarn (&cmd, "%s -d -i > %R", str_base64, file) == -1) {
    err = errno;
    cancel_receive ();
    errno = err;
@@ -59,10 +64,8 @@ do_base64_in (const char *file)
    cancel_receive ();
    errno = err;
    reply_with_perror ("%s", cmd);
-    free (cmd);
    return -1;
  }
-  free (cmd);

  /* The semantics of fwrite are too undefined, so write to the
   * file descriptor directly instead.
@@ -97,12 +100,32 @@ do_base64_in (const char *file)
 int
 do_base64_out (const char *file)
 {
+  CLEANUP_FREE char *buf = NULL;
+  struct stat statbuf;
  int r;
  FILE *fp;
-  char *cmd;
-  char buf[GUESTFS_MAX_CHUNK_SIZE];
+  CLEANUP_FREE char *cmd = NULL;
+  char buffer[GUESTFS_MAX_CHUNK_SIZE];

-  if (asprintf_nowarn (&cmd, "base64 %R", file) == -1) {
+  /* Check the filename exists and is not a directory (RHBZ#908322). */
+  buf = sysroot_path (file);
+  if (buf == NULL) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  if (stat (buf, &statbuf) == -1) {
+    reply_with_perror ("stat: %s", file);
+    return -1;
+  }
+
+  if (S_ISDIR (statbuf.st_mode)) {
+    reply_with_error ("%s: is a directory", file);
+    return -1;
+  }
+
+  /* Construct the command. */
+  if (asprintf_nowarn (&cmd, "%s %s", str_base64, buf) == -1) {
    reply_with_perror ("asprintf");
    return -1;
  }
@@ -113,10 +136,8 @@ do_base64_out (const char *file)
  fp = popen (cmd, "r");
  if (fp == NULL) {
    reply_with_perror ("%s", cmd);
-    free (cmd);
    return -1;
  }
-  free (cmd);

  /* Now we must send the reply message, before the file contents.  After
   * this there is no opportunity in the protocol to send any error
@@ -124,22 +145,22 @@ do_base64_out (const char *file)
   */
  reply (NULL, NULL);

-  while ((r = fread (buf, 1, sizeof buf, fp)) > 0) {
-    if (send_file_write (buf, r) < 0) {
+  while ((r = fread (buffer, 1, sizeof buffer, fp)) > 0) {
+    if (send_file_write (buffer, r) < 0) {
      pclose (fp);
      return -1;
    }
  }

  if (ferror (fp)) {
-    perror (file);
+    fprintf (stderr, "fread: %s: %m\n", file);
    send_file_end (1);		/* Cancel. */
    pclose (fp);
    return -1;
  }

  if (pclose (fp) != 0) {
-    perror (file);
+    fprintf (stderr, "pclose: %s: %m\n", file);
    send_file_end (1);		/* Cancel. */
    return -1;
  }
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -27,14 +27,17 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_blkid, blkid);
+
 static char *
 get_blkid_tag (const char *device, const char *tag)
 {
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;
  int r;

  r = commandr (&out, &err,
-                "blkid",
+                str_blkid,
                /* Adding -c option kills all caching, even on RHEL 5. */
                "-c", "/dev/null",
                "-o", "value", "-s", tag, device, NULL);
@@ -44,12 +47,9 @@ get_blkid_tag (const char *device, const char *tag)
    else
      reply_with_error ("%s: %s", device, err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  if (r == 2) {                 /* means UUID etc not found */
    free (out);
    out = strdup ("");
@@ -67,21 +67,21 @@ get_blkid_tag (const char *device, const char *tag)
 }

 char *
-do_vfs_type (const char *device)
+do_vfs_type (const mountable_t *mountable)
 {
-  return get_blkid_tag (device, "TYPE");
+  return get_blkid_tag (mountable->device, "TYPE");
 }

 char *
-do_vfs_label (const char *device)
+do_vfs_label (const mountable_t *mountable)
 {
-  return get_blkid_tag (device, "LABEL");
+  return get_blkid_tag (mountable->device, "LABEL");
 }

 char *
-do_vfs_uuid (const char *device)
+do_vfs_uuid (const mountable_t *mountable)
 {
-  return get_blkid_tag (device, "UUID");
+  return get_blkid_tag (mountable->device, "UUID");
 }

 /* RHEL5 blkid doesn't have the -p (low-level probing) option and the
@@ -94,32 +94,27 @@ static int
 test_blkid_p_i_opt (void)
 {
  int r;
-  char *err;
+  CLEANUP_FREE char *err = NULL, *err2 = NULL;

-  r = commandr (NULL, &err, "blkid", "-p", "/dev/null", NULL);
+  r = commandr (NULL, &err, str_blkid, "-p", "/dev/null", NULL);
  if (r == -1) {
    /* This means we couldn't run the blkid command at all. */
  command_failed:
    reply_with_error ("could not run 'blkid' command: %s", err);
-    free (err);
    return -1;
  }

  if (strstr (err, "invalid option --")) {
-    free (err);
    return 0;
  }
-  free (err);

-  r = commandr (NULL, &err, "blkid", "-i", NULL);
+  r = commandr (NULL, &err2, str_blkid, "-i", NULL);
  if (r == -1)
    goto command_failed;

-  if (strstr (err, "invalid option --")) {
-    free (err);
+  if (strstr (err2, "invalid option --")) {
    return 0;
  }
-  free (err);

  /* We have both options. */
  return 1;
@@ -130,11 +125,11 @@ blkid_with_p_i_opt (const char *device)
 {
  size_t i;
  int r;
-  char *out = NULL, *err = NULL;
-  char **lines = NULL;
+  CLEANUP_FREE char *out = NULL, *err = NULL;
+  CLEANUP_FREE_STRING_LIST char **lines = NULL;
  DECLARE_STRINGSBUF (ret);

-  r = command (&out, &err, "blkid", "-c", "/dev/null",
+  r = command (&out, &err, str_blkid, "-c", "/dev/null",
               "-p", "-i", "-o", "export", device, NULL);
  if (r == -1) {
    reply_with_error ("%s", err);
@@ -182,17 +177,9 @@ blkid_with_p_i_opt (const char *device)

  if (end_stringsbuf (&ret) == -1) goto error;

-  free (out);
-  free (err);
-  free_strings (lines);
-
  return ret.argv;

 error:
-  free (out);
-  free (err);
-  if (lines)
-    free_strings (lines);
  if (ret.argv)
    free_strings (ret.argv);

--- a/daemon/blockdev.c
+++ b/daemon/blockdev.c
@@ -28,6 +28,8 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_blockdev, blockdev);
+
 /* These functions are all about using the blockdev command, so
 * we centralize it in one call.
 */
@@ -36,9 +38,9 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints)
 {
  int r;
  int64_t rv;
-  char *out, *err;
+  CLEANUP_FREE char *out = NULL, *err = NULL;
  const char *argv[] = {
-    "blockdev",
+    str_blockdev,
    switc,
    NULL,
    NULL,
@@ -71,8 +73,6 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints)

  if (r == -1) {
    reply_with_error ("%s: %s", argv[0], err);
-    free (err);
-    free (out);
    return -1;
  }

@@ -81,15 +81,10 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints)
  if (prints) {
    if (sscanf (out, "%" SCNi64, &rv) != 1) {
      reply_with_error ("%s: expected output, but got nothing", argv[0]);
-      free (out);
-      free (err);
      return -1;
    }
  }

-  free (out);
-  free (err);
-
  return rv;
 }

--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -21,17 +21,25 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#include <pcre.h>
 #include <string.h>
 #include <unistd.h>

 #include "daemon.h"
 #include "actions.h"
 #include "optgroups.h"
+#include "xstrtol.h"
+
+GUESTFSD_EXT_CMD(str_btrfs, btrfs);
+GUESTFSD_EXT_CMD(str_btrfstune, btrfstune);
+GUESTFSD_EXT_CMD(str_btrfsck, btrfsck);
+GUESTFSD_EXT_CMD(str_mkfs_btrfs, mkfs.btrfs);
+GUESTFSD_EXT_CMD(str_umount, umount);

 int
 optgroup_btrfs_available (void)
 {
-  return prog_exists ("btrfs");
+  return prog_exists (str_btrfs) && filesystem_available ("btrfs") > 0;
 }

 /* Takes optional arguments, consult optargs_bitmask. */
@@ -39,14 +47,13 @@ int
 do_btrfs_filesystem_resize (const char *filesystem, int64_t size)
 {
  const size_t MAX_ARGS = 64;
-  char *buf;
-  char *err;
+  CLEANUP_FREE char *buf = NULL, *err = NULL;
  int r;
  const char *argv[MAX_ARGS];
  size_t i = 0;
  char size_str[32];

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "filesystem");
  ADD_ARG (argv, i, "resize");

@@ -72,15 +79,12 @@ do_btrfs_filesystem_resize (const char *filesystem, int64_t size)
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (buf);

  if (r == -1) {
    reply_with_error ("%s: %s", filesystem, err);
-    free (err);
    return -1;
  }

-  free (err);
  return 0;
 }

@@ -102,14 +106,14 @@ do_mkfs_btrfs (char *const *devices,
  const char *argv[MAX_ARGS];
  size_t i = 0, j;
  int r;
-  char *err;
+  CLEANUP_FREE char *err = NULL;
  char allocstart_s[64];
  char bytecount_s[64];
  char leafsize_s[64];
  char nodesize_s[64];
  char sectorsize_s[64];

-  ADD_ARG (argv, i, "mkfs.btrfs");
+  ADD_ARG (argv, i, str_mkfs_btrfs);

  /* Optional arguments. */
  if (optargs_bitmask & GUESTFS_MKFS_BTRFS_ALLOCSTART_BITMASK) {
@@ -192,14 +196,15 @@ do_mkfs_btrfs (char *const *devices,

  ADD_ARG (argv, i, NULL);

+  for (j = 0; j < nr_devices; ++j)
+    wipe_device_before_mkfs (devices[j]);
+
  r = commandv (NULL, &err, argv);
  if (r == -1) {
    reply_with_error ("%s: %s", devices[0], err);
-    free (err);
    return -1;
  }

-  free (err);
  return 0;
 }

@@ -209,8 +214,8 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest)
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  size_t i = 0;
-  char *source_buf, *dest_buf;
-  char *err;
+  CLEANUP_FREE char *source_buf = NULL, *dest_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  source_buf = sysroot_path (source);
@@ -221,11 +226,10 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest)
  dest_buf = sysroot_path (dest);
  if (dest_buf == NULL) {
    reply_with_perror ("malloc");
-    free (source_buf);
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "subvolume");
  ADD_ARG (argv, i, "snapshot");
  ADD_ARG (argv, i, source_buf);
@@ -233,14 +237,10 @@ do_btrfs_subvolume_snapshot (const char *source, const char *dest)
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (source_buf);
-  free (dest_buf);
  if (r == -1) {
    reply_with_error ("%s: %s: %s", source, dest, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -251,8 +251,8 @@ do_btrfs_subvolume_delete (const char *subvolume)
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  size_t i = 0;
-  char *subvolume_buf;
-  char *err;
+  CLEANUP_FREE char *subvolume_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  subvolume_buf = sysroot_path (subvolume);
@@ -261,20 +261,17 @@ do_btrfs_subvolume_delete (const char *subvolume)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "subvolume");
  ADD_ARG (argv, i, "delete");
  ADD_ARG (argv, i, subvolume_buf);
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (subvolume_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", subvolume, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -285,8 +282,8 @@ do_btrfs_subvolume_create (const char *dest)
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  size_t i = 0;
-  char *dest_buf;
-  char *err;
+  CLEANUP_FREE char *dest_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  dest_buf = sysroot_path (dest);
@@ -295,118 +292,203 @@ do_btrfs_subvolume_create (const char *dest)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "subvolume");
  ADD_ARG (argv, i, "create");
  ADD_ARG (argv, i, dest_buf);
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (dest_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", dest, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }

 guestfs_int_btrfssubvolume_list *
-do_btrfs_subvolume_list (const char *fs)
+do_btrfs_subvolume_list (const mountable_t *fs)
 {
-  const size_t MAX_ARGS = 64;
-  guestfs_int_btrfssubvolume_list *ret;
-  char *fs_buf;
-  const char *argv[MAX_ARGS];
-  size_t i = 0;
-  char *out, *err, **lines, *pos;
-  size_t nr_subvolumes;
-  int r;
+  char **lines;

-  fs_buf = sysroot_path (fs);
-  if (fs_buf == NULL) {
-    reply_with_perror ("malloc");
-    return NULL;
+  /* Execute 'btrfs subvolume list <fs>', and split the output into lines */
+  {
+    CLEANUP_FREE char *fs_buf = NULL;
+
+    if (fs->type == MOUNTABLE_PATH) {
+      fs_buf = sysroot_path (fs->device);
+      if (fs_buf == NULL) {
+        reply_with_perror ("malloc");
+
+      cmderror:
+        if (fs->type != MOUNTABLE_PATH && fs_buf) {
+          CLEANUP_FREE char *err = NULL;
+          if (command (NULL, &err, str_umount, fs_buf, NULL) == -1)
+            fprintf (stderr, "%s\n", err);
+
+          if (rmdir (fs_buf) == -1 && errno != ENOENT)
+            fprintf (stderr, "rmdir: %m\n");
+        }
+        return NULL;
+      }
+    }
+
+    else {
+      fs_buf = strdup ("/tmp/btrfs.XXXXXX");
+      if (fs_buf == NULL) {
+        reply_with_perror ("strdup");
+        goto cmderror;
+      }
+
+      if (mkdtemp (fs_buf) == NULL) {
+        reply_with_perror ("mkdtemp");
+        goto cmderror;
+      }
+
+      if (mount_vfs_nochroot ("", NULL, fs, fs_buf, "<internal>") == -1) {
+        goto cmderror;
+      }
+    }
+
+    size_t i = 0;
+    const size_t MAX_ARGS = 64;
+    const char *argv[MAX_ARGS];
+    ADD_ARG (argv, i, str_btrfs);
+    ADD_ARG (argv, i, "subvolume");
+    ADD_ARG (argv, i, "list");
+    ADD_ARG (argv, i, fs_buf);
+    ADD_ARG (argv, i, NULL);
+
+    CLEANUP_FREE char *out = NULL, *errout = NULL;
+    int r = commandv (&out, &errout, argv);
+
+    if (fs->type != MOUNTABLE_PATH) {
+      CLEANUP_FREE char *err = NULL;
+      if (command (NULL, &err, str_umount, fs_buf, NULL) == -1) {
+        reply_with_error ("%s", err ? err : "malloc");
+        goto cmderror;
+      }
+
+      if (rmdir (fs_buf) == -1 && errno != ENOENT) {
+        reply_with_error ("rmdir: %m\n");
+        goto cmderror;
+      }
+    }
+
+    if (r == -1) {
+      CLEANUP_FREE char *fs_desc = mountable_to_string (fs);
+      if (fs_desc == NULL) {
+        fprintf (stderr, "malloc: %m");
+      }
+      reply_with_error ("%s: %s", fs_desc ? fs_desc : "malloc", errout);
+      goto cmderror;
+    }
+
+    lines = split_lines (out);
+    if (!lines) return NULL;
  }

-  ADD_ARG (argv, i, "btrfs");
-  ADD_ARG (argv, i, "subvolume");
-  ADD_ARG (argv, i, "list");
-  ADD_ARG (argv, i, fs_buf);
-  ADD_ARG (argv, i, NULL);
-
-  r = commandv (&out, &err, argv);
-  free (fs_buf);
-  if (r == -1) {
-    reply_with_error ("%s: %s", fs, err);
-    free (err);
-    return NULL;
-  }
-  free (err);
-
-  lines = split_lines (out);
-  free (out);
-  if (!lines)
-    return NULL;
-
  /* Output is:
   *
-   * ID 256 top level 5 path test1
-   * ID 257 top level 5 path dir/test2
-   * ID 258 top level 5 path test3
+   * ID 256 gen 30 top level 5 path test1
+   * ID 257 gen 30 top level 5 path dir/test2
+   * ID 258 gen 30 top level 5 path test3
   *
-   * "ID <n>" is the subvolume ID.  "top level <n>" is the top level
-   * subvolume ID.  "path <str>" is the subvolume path, relative to
-   * the top of the filesystem.
+   * "ID <n>" is the subvolume ID.
+   * "gen <n>" is the generation when the root was created or last
+   * updated.
+   * "top level <n>" is the top level subvolume ID.
+   * "path <str>" is the subvolume path, relative to the top of the
+   * filesystem.
+   *
+   * Note that the order that each of the above is fixed, but
+   * different versions of btrfs may display different sets of data.
+   * Specifically, older versions of btrfs do not display gen.
   */
-  nr_subvolumes = count_strings (lines);
+
+  guestfs_int_btrfssubvolume_list *ret = NULL;
+  pcre *re = NULL;
+
+  size_t nr_subvolumes = count_strings (lines);

  ret = malloc (sizeof *ret);
  if (!ret) {
    reply_with_perror ("malloc");
-    free_stringslen (lines, nr_subvolumes);
-    return NULL;
+    goto error;
  }
+
  ret->guestfs_int_btrfssubvolume_list_len = nr_subvolumes;
  ret->guestfs_int_btrfssubvolume_list_val =
    calloc (nr_subvolumes, sizeof (struct guestfs_int_btrfssubvolume));
  if (ret->guestfs_int_btrfssubvolume_list_val == NULL) {
    reply_with_perror ("malloc");
-    free (ret);
-    free_stringslen (lines, nr_subvolumes);
-    return NULL;
+    goto error;
  }

-  for (i = 0; i < nr_subvolumes; ++i) {
+  const char *errptr;
+  int erroffset;
+  re = pcre_compile ("ID\\s+(\\d+).*\\s"
+                     "top level\\s+(\\d+).*\\s"
+                     "path\\s(.*)",
+                     0, &errptr, &erroffset, NULL);
+  if (re == NULL) {
+    reply_with_error ("pcre_compile (%i): %s", erroffset, errptr);
+    goto error;
+  }
+
+  for (size_t i = 0; i < nr_subvolumes; ++i) {
    /* To avoid allocations, reuse the 'line' buffer to store the
     * path.  Thus we don't need to free 'line', since it will be
     * freed by the calling (XDR) code.
     */
    char *line = lines[i];
+    #define N_MATCHES 4
+    int ovector[N_MATCHES * 3];

-    if (sscanf (line, "ID %" SCNu64 " top level %" SCNu64 " path ",
-                &ret->guestfs_int_btrfssubvolume_list_val[i].btrfssubvolume_id,
-                &ret->guestfs_int_btrfssubvolume_list_val[i].btrfssubvolume_top_level_id) != 2) {
+    if (pcre_exec (re, NULL, line, strlen (line), 0, 0,
+                   ovector, N_MATCHES * 3) < 0)
+    #undef N_MATCHES
+    {
    unexpected_output:
      reply_with_error ("unexpected output from 'btrfs subvolume list' command: %s", line);
-      free_stringslen (lines, nr_subvolumes);
-      free (ret->guestfs_int_btrfssubvolume_list_val);
-      free (ret);
-      return NULL;
+      goto error;
    }

-    pos = strstr (line, " path ");
-    if (pos == NULL)
-      goto unexpected_output;
-    pos += 6;
+    struct guestfs_int_btrfssubvolume *this  =
+      &ret->guestfs_int_btrfssubvolume_list_val[i];

-    memmove (line, pos, strlen (pos) + 1);
-    ret->guestfs_int_btrfssubvolume_list_val[i].btrfssubvolume_path = line;
+    #if __WORDSIZE == 64
+      #define XSTRTOU64 xstrtoul
+    #else
+      #define XSTRTOU64 xstrtoull
+    #endif
+
+    if (XSTRTOU64 (line + ovector[2], NULL, 10,
+                   &this->btrfssubvolume_id, NULL) != LONGINT_OK)
+      goto unexpected_output;
+    if (XSTRTOU64 (line + ovector[4], NULL, 10,
+                   &this->btrfssubvolume_top_level_id, NULL) != LONGINT_OK)
+      goto unexpected_output;
+
+    #undef XSTRTOU64
+
+    memmove (line, line + ovector[6], ovector[7] + 1);
+    this->btrfssubvolume_path = line;
  }

+  free (lines);
+  pcre_free (re);
+
  return ret;
+
+error:
+  free_stringslen (lines, nr_subvolumes);
+  if (ret) free (ret->guestfs_int_btrfssubvolume_list_val);
+  free (ret);
+  if (re) pcre_free (re);
+
+  return NULL;
 }

 int
@@ -415,9 +497,9 @@ do_btrfs_subvolume_set_default (int64_t id, const char *fs)
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  size_t i = 0;
-  char *fs_buf;
+  CLEANUP_FREE char *fs_buf = NULL;
  char buf[64];
-  char *err;
+  CLEANUP_FREE char *err = NULL;
  int r;

  snprintf (buf, sizeof buf, "%" PRIi64, id);
@@ -428,7 +510,7 @@ do_btrfs_subvolume_set_default (int64_t id, const char *fs)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "subvolume");
  ADD_ARG (argv, i, "set-default");
  ADD_ARG (argv, i, buf);
@@ -436,13 +518,10 @@ do_btrfs_subvolume_set_default (int64_t id, const char *fs)
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (fs_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", fs, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -453,8 +532,8 @@ do_btrfs_filesystem_sync (const char *fs)
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  size_t i = 0;
-  char *fs_buf;
-  char *err;
+  CLEANUP_FREE char *fs_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  fs_buf = sysroot_path (fs);
@@ -463,20 +542,17 @@ do_btrfs_filesystem_sync (const char *fs)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "filesystem");
  ADD_ARG (argv, i, "sync");
  ADD_ARG (argv, i, fs_buf);
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (fs_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", fs, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -487,8 +563,8 @@ do_btrfs_filesystem_balance (const char *fs)
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  size_t i = 0;
-  char *fs_buf;
-  char *err;
+  CLEANUP_FREE char *fs_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  fs_buf = sysroot_path (fs);
@@ -497,20 +573,17 @@ do_btrfs_filesystem_balance (const char *fs)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "filesystem");
  ADD_ARG (argv, i, "balance");
  ADD_ARG (argv, i, fs_buf);
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (fs_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", fs, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -526,8 +599,8 @@ do_btrfs_device_add (char *const *devices, const char *fs)
  size_t MAX_ARGS = nr_devices + 8;
  const char *argv[MAX_ARGS];
  size_t i = 0, j;
-  char *fs_buf;
-  char *err;
+  CLEANUP_FREE char *fs_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  fs_buf = sysroot_path (fs);
@@ -536,7 +609,7 @@ do_btrfs_device_add (char *const *devices, const char *fs)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "device");
  ADD_ARG (argv, i, "add");

@@ -547,13 +620,10 @@ do_btrfs_device_add (char *const *devices, const char *fs)
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (fs_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", fs, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -569,8 +639,8 @@ do_btrfs_device_delete (char *const *devices, const char *fs)
  size_t MAX_ARGS = nr_devices + 8;
  const char *argv[MAX_ARGS];
  size_t i = 0, j;
-  char *fs_buf;
-  char *err;
+  CLEANUP_FREE char *fs_buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  fs_buf = sysroot_path (fs);
@@ -579,7 +649,7 @@ do_btrfs_device_delete (char *const *devices, const char *fs)
    return -1;
  }

-  ADD_ARG (argv, i, "btrfs");
+  ADD_ARG (argv, i, str_btrfs);
  ADD_ARG (argv, i, "device");
  ADD_ARG (argv, i, "delete");

@@ -590,13 +660,10 @@ do_btrfs_device_delete (char *const *devices, const char *fs)
  ADD_ARG (argv, i, NULL);

  r = commandv (NULL, &err, argv);
-  free (fs_buf);
  if (r == -1) {
    reply_with_error ("%s: %s", fs, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -604,19 +671,17 @@ do_btrfs_device_delete (char *const *devices, const char *fs)
 int
 do_btrfs_set_seeding (const char *device, int svalue)
 {
-  char *err;
+  CLEANUP_FREE char *err = NULL;
  int r;

  const char *s_value = svalue ? "1" : "0";

-  r = commandr (NULL, &err, "btrfstune", "-S", s_value, device, NULL);
+  r = commandr (NULL, &err, str_btrfstune, "-S", s_value, device, NULL);
  if (r == -1) {
    reply_with_error ("%s: %s", device, err);
-    free (err);
    return -1;
  }

-  free (err);
  return 0;
 }

@@ -624,14 +689,14 @@ do_btrfs_set_seeding (const char *device, int svalue)
 int
 do_btrfs_fsck (const char *device, int64_t superblock, int repair)
 {
-  char *err;
+  CLEANUP_FREE char *err = NULL;
  int r;
  size_t i = 0;
  const size_t MAX_ARGS = 64;
  const char *argv[MAX_ARGS];
  char super_s[64];

-  ADD_ARG (argv, i, "btrfsck");
+  ADD_ARG (argv, i, str_btrfsck);

  /* Optional arguments. */
  if (optargs_bitmask & GUESTFS_BTRFS_FSCK_SUPERBLOCK_BITMASK) {
@@ -656,10 +721,8 @@ do_btrfs_fsck (const char *device, int64_t superblock, int repair)
  r = commandv (NULL, &err, argv);
  if (r == -1) {
    reply_with_error ("%s: %s", device, err);
-    free (err);
    return -1;
  }

-  free (err);
  return 0;
 }
--- a/daemon/cap.c
+++ b/daemon/cap.c
@@ -0,0 +1,111 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2012 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <limits.h>
+#include <unistd.h>
+
+#include "guestfs_protocol.h"
+#include "daemon.h"
+#include "actions.h"
+#include "optgroups.h"
+
+#if defined(HAVE_CAP)
+
+#include <sys/capability.h>
+
+int
+optgroup_linuxcaps_available (void)
+{
+  return 1;
+}
+
+char *
+do_cap_get_file (const char *path)
+{
+  cap_t cap;
+  char *r, *ret;
+
+  CHROOT_IN;
+  cap = cap_get_file (path);
+  CHROOT_OUT;
+
+  if (cap == NULL) {
+    reply_with_perror ("%s", path);
+    return NULL;
+  }
+
+  r = cap_to_text (cap, NULL);
+  if (r == NULL) {
+    reply_with_perror ("cap_to_text");
+    cap_free (cap);
+    return NULL;
+  }
+
+  cap_free (cap);
+
+  /* 'r' is not an ordinary pointer that can be freed with free(3)!
+   * In the current implementation of libcap, if you try to do that it
+   * will segfault.  We have to duplicate this into an ordinary
+   * buffer, then call cap_free (r).
+   */
+  ret = strdup (r);
+  if (ret == NULL) {
+    reply_with_perror ("strdup");
+    cap_free (r);
+    return NULL;
+  }
+  cap_free (r);
+
+  return ret;                   /* caller frees */
+}
+
+int
+do_cap_set_file (const char *path, const char *capstr)
+{
+  cap_t cap;
+  int r;
+
+  cap = cap_from_text (capstr);
+  if (cap == NULL) {
+    reply_with_perror ("could not parse cap string: %s: cap_from_text", capstr);
+    return -1;
+  }
+
+  CHROOT_IN;
+  r = cap_set_file (path, cap);
+  CHROOT_OUT;
+
+  if (r == -1) {
+    reply_with_perror ("%s", path);
+    cap_free (cap);
+    return -1;
+  }
+
+  cap_free (cap);
+
+  return 0;
+}
+
+#else /* no libcap */
+
+OPTGROUP_LINUXCAPS_NOT_AVAILABLE
+
+#endif /* no libcap */
--- a/daemon/checksum.c
+++ b/daemon/checksum.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,23 +29,33 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_find, find);
+GUESTFSD_EXT_CMD(str_xargs, xargs);
+GUESTFSD_EXT_CMD(str_cksum, cksum);
+GUESTFSD_EXT_CMD(str_md5sum, md5sum);
+GUESTFSD_EXT_CMD(str_sha1sum, sha1sum);
+GUESTFSD_EXT_CMD(str_sha224sum, sha224sum);
+GUESTFSD_EXT_CMD(str_sha256sum, sha256sum);
+GUESTFSD_EXT_CMD(str_sha384sum, sha384sum);
+GUESTFSD_EXT_CMD(str_sha512sum, sha512sum);
+
 static const char *
 program_of_csum (const char *csumtype)
 {
  if (STRCASEEQ (csumtype, "crc"))
-    return "cksum";
+    return str_cksum;
  else if (STRCASEEQ (csumtype, "md5"))
-    return "md5sum";
+    return str_md5sum;
  else if (STRCASEEQ (csumtype, "sha1"))
-    return "sha1sum";
+    return str_sha1sum;
  else if (STRCASEEQ (csumtype, "sha224"))
-    return "sha224sum";
+    return str_sha224sum;
  else if (STRCASEEQ (csumtype, "sha256"))
-    return "sha256sum";
+    return str_sha256sum;
  else if (STRCASEEQ (csumtype, "sha384"))
-    return "sha384sum";
+    return str_sha384sum;
  else if (STRCASEEQ (csumtype, "sha512"))
-    return "sha512sum";
+    return str_sha512sum;
  else {
    reply_with_error ("unknown checksum type, expecting crc|md5|sha1|sha224|sha256|sha384|sha512");
    return NULL;
@@ -56,7 +66,8 @@ static char *
 checksum (const char *csumtype, int fd)
 {
  const char *program;
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;
  int flags, r;
  size_t len;

@@ -74,12 +85,9 @@ checksum (const char *csumtype, int fd)
    pulse_mode_cancel ();
    reply_with_error ("%s: %s", program, err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  /* Split it at the first whitespace. */
  len = strcspn (out, " \t\n");
  out[len] = '\0';
@@ -131,7 +139,7 @@ do_checksums_out (const char *csumtype, const char *dir)
  if (program == NULL)
    return -1;

-  char *sysrootdir = sysroot_path (dir);
+  CLEANUP_FREE char *sysrootdir = sysroot_path (dir);
  if (!sysrootdir) {
    reply_with_perror ("malloc");
    return -1;
@@ -140,23 +148,19 @@ do_checksums_out (const char *csumtype, const char *dir)
  r = stat (sysrootdir, &statbuf);
  if (r == -1) {
    reply_with_perror ("%s", dir);
-    free (sysrootdir);
    return -1;
  }
  if (!S_ISDIR (statbuf.st_mode)) {
    reply_with_error ("%s: not a directory", dir);
-    free (sysrootdir);
    return -1;
  }

-  char *cmd;
-  if (asprintf_nowarn (&cmd, "cd %Q && find -type f -print0 | xargs -0 %s",
-                       sysrootdir, program) == -1) {
+  CLEANUP_FREE char *cmd = NULL;
+  if (asprintf_nowarn (&cmd, "cd %Q && %s -type f -print0 | %s -0 %s",
+                       sysrootdir, str_find, str_xargs, program) == -1) {
    reply_with_perror ("asprintf");
-    free (sysrootdir);
    return -1;
  }
-  free (sysrootdir);

  if (verbose)
    fprintf (stderr, "%s\n", cmd);
@@ -164,10 +168,8 @@ do_checksums_out (const char *csumtype, const char *dir)
  FILE *fp = popen (cmd, "r");
  if (fp == NULL) {
    reply_with_perror ("%s", cmd);
-    free (cmd);
    return -1;
  }
-  free (cmd);

  /* Now we must send the reply message, before the file contents.  After
   * this there is no opportunity in the protocol to send any error
@@ -185,14 +187,14 @@ do_checksums_out (const char *csumtype, const char *dir)
  }

  if (ferror (fp)) {
-    perror (dir);
+    fprintf (stderr, "fread: %s: %m\n", dir);
    send_file_end (1);                /* Cancel. */
    pclose (fp);
    return -1;
  }

  if (pclose (fp) != 0) {
-    perror (dir);
+    fprintf (stderr, "pclose: %s: %m\n", dir);
    send_file_end (1);                /* Cancel. */
    return -1;
  }
--- a/daemon/cmp.c
+++ b/daemon/cmp.c
@@ -27,11 +27,13 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_cmp, cmp);
+
 int
 do_equal (const char *file1, const char *file2)
 {
-  char *file1buf, *file2buf;
-  char *err;
+  CLEANUP_FREE char *file1buf = NULL, *file2buf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  file1buf = sysroot_path (file1);
@@ -43,22 +45,14 @@ do_equal (const char *file1, const char *file2)
  file2buf = sysroot_path (file2);
  if (file2buf == NULL) {
    reply_with_perror ("malloc");
-    free (file1buf);
    return -1;
  }

-  r = commandr (NULL, &err, "cmp", "-s", file1buf, file2buf, NULL);
-
-  free (file1buf);
-  free (file2buf);
-
+  r = commandr (NULL, &err, str_cmp, "-s", file1buf, file2buf, NULL);
  if (r == -1 || r > 1) {
    reply_with_error ("%s", err);
-    free (err);
    return -1;
  }

-  free (err);
-
  return r == 0;
 }
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -28,19 +28,23 @@

 #include "ignore-value.h"

+GUESTFSD_EXT_CMD(str_mount, mount);
+GUESTFSD_EXT_CMD(str_umount, umount);
+
 static inline void
 umount_ignore_fail (const char *path)
 {
-  ignore_value (command (NULL, NULL, "umount", path, NULL));
+  ignore_value (command (NULL, NULL, str_umount, path, NULL));
 }

 char *
 do_command (char *const *argv)
 {
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err;
  int r;
-  char *sysroot_dev, *sysroot_dev_pts, *sysroot_proc,
-    *sysroot_selinux, *sysroot_sys;
+  CLEANUP_FREE char *sysroot_dev = NULL, *sysroot_dev_pts = NULL,
+    *sysroot_proc = NULL, *sysroot_selinux = NULL, *sysroot_sys = NULL;
  int dev_ok, dev_pts_ok, proc_ok, selinux_ok, sys_ok;

  /* We need a root filesystem mounted to do this. */
@@ -73,23 +77,18 @@ do_command (char *const *argv)
      sysroot_proc == NULL || sysroot_selinux == NULL ||
      sysroot_sys == NULL) {
    reply_with_perror ("malloc");
-    free (sysroot_dev);
-    free (sysroot_dev_pts);
-    free (sysroot_proc);
-    free (sysroot_selinux);
-    free (sysroot_sys);
    return NULL;
  }

-  r = command (NULL, NULL, "mount", "--bind", "/dev", sysroot_dev, NULL);
+  r = command (NULL, NULL, str_mount, "--bind", "/dev", sysroot_dev, NULL);
  dev_ok = r != -1;
-  r = command (NULL, NULL, "mount", "--bind", "/dev/pts", sysroot_dev_pts, NULL);
+  r = command (NULL, NULL, str_mount, "--bind", "/dev/pts", sysroot_dev_pts, NULL);
  dev_pts_ok = r != -1;
-  r = command (NULL, NULL, "mount", "--bind", "/proc", sysroot_proc, NULL);
+  r = command (NULL, NULL, str_mount, "--bind", "/proc", sysroot_proc, NULL);
  proc_ok = r != -1;
-  r = command (NULL, NULL, "mount", "--bind", "/selinux", sysroot_selinux, NULL);
+  r = command (NULL, NULL, str_mount, "--bind", "/selinux", sysroot_selinux, NULL);
  selinux_ok = r != -1;
-  r = command (NULL, NULL, "mount", "--bind", "/sys", sysroot_sys, NULL);
+  r = command (NULL, NULL, str_mount, "--bind", "/sys", sysroot_sys, NULL);
  sys_ok = r != -1;

  CHROOT_IN;
@@ -102,28 +101,19 @@ do_command (char *const *argv)
  if (dev_pts_ok) umount_ignore_fail (sysroot_dev_pts);
  if (dev_ok) umount_ignore_fail (sysroot_dev);

-  free (sysroot_dev);
-  free (sysroot_dev_pts);
-  free (sysroot_proc);
-  free (sysroot_selinux);
-  free (sysroot_sys);
-
  if (r == -1) {
    reply_with_error ("%s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;			/* Caller frees. */
 }

 char **
 do_command_lines (char *const *argv)
 {
-  char *out;
+  CLEANUP_FREE char *out = NULL;
  char **lines;

  out = do_command (argv);
@@ -131,7 +121,6 @@ do_command_lines (char *const *argv)
    return NULL;

  lines = split_lines (out);
-  free (out);

  if (lines == NULL)
    return NULL;
--- a/daemon/compress.c
+++ b/daemon/compress.c
@@ -27,13 +27,19 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_compress, compress);
+GUESTFSD_EXT_CMD(str_gzip, gzip);
+GUESTFSD_EXT_CMD(str_bzip2, bzip2);
+GUESTFSD_EXT_CMD(str_xz, xz);
+GUESTFSD_EXT_CMD(str_lzop, lzop);
+
 /* Has one FileOut parameter. */
 static int
 do_compressX_out (const char *file, const char *filter, int is_device)
 {
  int r;
  FILE *fp;
-  char *cmd;
+  CLEANUP_FREE char *cmd = NULL;
  char buf[GUESTFS_MAX_CHUNK_SIZE];

  /* The command will look something like:
@@ -65,10 +71,8 @@ do_compressX_out (const char *file, const char *filter, int is_device)
  fp = popen (cmd, "r");
  if (fp == NULL) {
    reply_with_perror ("%s", cmd);
-    free (cmd);
    return -1;
  }
-  free (cmd);

  /* Now we must send the reply message, before the file contents.  After
   * this there is no opportunity in the protocol to send any error
@@ -84,14 +88,14 @@ do_compressX_out (const char *file, const char *filter, int is_device)
  }

  if (ferror (fp)) {
-    perror (file);
+    fprintf (stderr, "fread: %s: %m\n", file);
    send_file_end (1);		/* Cancel. */
    pclose (fp);
    return -1;
  }

  if (pclose (fp) != 0) {
-    perror (file);
+    fprintf (stderr, "pclose: %s: %m\n", file);
    send_file_end (1);		/* Cancel. */
    return -1;
  }
@@ -103,11 +107,9 @@ do_compressX_out (const char *file, const char *filter, int is_device)
 }

 #define CHECK_SUPPORTED(prog)                                           \
-  if (!prog_exists (prog)) {                                            \
+  if (!prog_exists (prog))                                              \
    /* note: substring "not supported" must appear in this error */     \
-    reply_with_error ("compression type %s is not supported", prog);    \
-    return -1;                                                          \
-  }
+    NOT_SUPPORTED (-1, "compression type %s is not supported, because external program '%s' is not available in the appliance", prog, prog);

 static int
 get_filter (const char *ctype, int level, char *ret, size_t n)
@@ -118,15 +120,15 @@ get_filter (const char *ctype, int level, char *ret, size_t n)
      reply_with_error ("compress: cannot use optional level parameter with this compression type");
      return -1;
    }
-    snprintf (ret, n, "compress -c");
+    snprintf (ret, n, "%s -c", str_compress);
    return 0;
  }
  else if (STREQ (ctype, "gzip")) {
    CHECK_SUPPORTED ("gzip");
    if (level == -1)
-      snprintf (ret, n, "gzip -c");
+      snprintf (ret, n, "%s -c", str_gzip);
    else if (level >= 1 && level <= 9)
-      snprintf (ret, n, "gzip -c -%d", level);
+      snprintf (ret, n, "%s -c -%d", str_gzip, level);
    else {
      reply_with_error ("gzip: incorrect value for level parameter");
      return -1;
@@ -136,9 +138,9 @@ get_filter (const char *ctype, int level, char *ret, size_t n)
  else if (STREQ (ctype, "bzip2")) {
    CHECK_SUPPORTED ("bzip2");
    if (level == -1)
-      snprintf (ret, n, "bzip2 -c");
+      snprintf (ret, n, "%s -c", str_bzip2);
    else if (level >= 1 && level <= 9)
-      snprintf (ret, n, "bzip2 -c -%d", level);
+      snprintf (ret, n, "%s -c -%d", str_bzip2, level);
    else {
      reply_with_error ("bzip2: incorrect value for level parameter");
      return -1;
@@ -148,9 +150,9 @@ get_filter (const char *ctype, int level, char *ret, size_t n)
  else if (STREQ (ctype, "xz")) {
    CHECK_SUPPORTED ("xz");
    if (level == -1)
-      snprintf (ret, n, "xz -c");
+      snprintf (ret, n, "%s -c", str_xz);
    else if (level >= 0 && level <= 9)
-      snprintf (ret, n, "xz -c -%d", level);
+      snprintf (ret, n, "%s -c -%d", str_xz, level);
    else {
      reply_with_error ("xz: incorrect value for level parameter");
      return -1;
@@ -160,9 +162,9 @@ get_filter (const char *ctype, int level, char *ret, size_t n)
  else if (STREQ (ctype, "lzop")) {
    CHECK_SUPPORTED ("lzop");
    if (level == -1)
-      snprintf (ret, n, "lzop -c");
+      snprintf (ret, n, "%s -c", str_lzop);
    else if (level >= 1 && level <= 9)
-      snprintf (ret, n, "lzop -c -%d", level);
+      snprintf (ret, n, "%s -c -%d", str_lzop, level);
    else {
      reply_with_error ("lzop: incorrect value for level parameter");
      return -1;
--- a/daemon/copy.c
+++ b/daemon/copy.c
@@ -42,13 +42,14 @@ static int
 copy (const char *src, const char *src_display,
      const char *dest, const char *dest_display,
      int wrflags, int wrmode,
-      int64_t srcoffset, int64_t destoffset, int64_t size)
+      int64_t srcoffset, int64_t destoffset, int64_t size, int sparse)
 {
  int64_t saved_size = size;
  int src_fd, dest_fd;
  char buf[BUFSIZ];
  size_t n;
  ssize_t r;
+  int err;

  if ((optargs_bitmask & GUESTFS_COPY_DEVICE_TO_DEVICE_SRCOFFSET_BITMASK)) {
    if (srcoffset < 0) {
@@ -77,6 +78,9 @@ copy (const char *src, const char *src_display,
  else
    size = -1;

+  if (! (optargs_bitmask & GUESTFS_COPY_DEVICE_TO_DEVICE_SPARSE_BITMASK))
+    sparse = 0;
+
  /* Open source and destination. */
  src_fd = open (src, O_RDONLY|O_CLOEXEC);
  if (src_fd == -1) {
@@ -116,8 +120,10 @@ copy (const char *src, const char *src_display,

    r = read (src_fd, buf, n);
    if (r == -1) {
+      err = errno;
      if (size == -1)
        pulse_mode_cancel ();
+      errno = err;
      reply_with_perror ("read: %s", src_display);
      close (src_fd);
      close (dest_fd);
@@ -133,14 +139,31 @@ copy (const char *src, const char *src_display,
      return -1;
    }

+    if (sparse && is_zero (buf, r)) {
+      if (lseek (dest_fd, r, SEEK_CUR) == -1) {
+        err = errno;
+        if (size == -1)
+          pulse_mode_cancel ();
+        errno = err;
+        reply_with_perror ("%s: seek (because of sparse flag)", dest_display);
+        close (src_fd);
+        close (dest_fd);
+        return -1;
+      }
+      goto sparse_skip;
+    }
+
    if (xwrite (dest_fd, buf, r) == -1) {
+      err = errno;
      if (size == -1)
        pulse_mode_cancel ();
+      errno = err;
      reply_with_perror ("%s: write", dest_display);
      close (src_fd);
      close (dest_fd);
      return -1;
    }
+  sparse_skip:

    if (size != -1) {
      size -= r;
@@ -167,58 +190,51 @@ copy (const char *src, const char *src_display,

 int
 do_copy_device_to_device (const char *src, const char *dest,
-                          int64_t srcoffset, int64_t destoffset, int64_t size)
+                          int64_t srcoffset, int64_t destoffset, int64_t size,
+                          int sparse)
 {
  return copy (src, src, dest, dest, DEST_DEVICE_FLAGS,
-               srcoffset, destoffset, size);
+               srcoffset, destoffset, size, sparse);
 }

 int
 do_copy_device_to_file (const char *src, const char *dest,
-                        int64_t srcoffset, int64_t destoffset, int64_t size)
+                        int64_t srcoffset, int64_t destoffset, int64_t size,
+                        int sparse)
 {
-  char *dest_buf;
-  int r;
+  CLEANUP_FREE char *dest_buf = sysroot_path (dest);

-  dest_buf = sysroot_path (dest);
  if (!dest_buf) {
    reply_with_perror ("malloc");
    return -1;
  }

-  r = copy (src, src, dest_buf, dest, DEST_FILE_FLAGS,
-            srcoffset, destoffset, size);
-  free (dest_buf);
-
-  return r;
+  return copy (src, src, dest_buf, dest, DEST_FILE_FLAGS,
+               srcoffset, destoffset, size, sparse);
 }

 int
 do_copy_file_to_device (const char *src, const char *dest,
-                        int64_t srcoffset, int64_t destoffset, int64_t size)
+                        int64_t srcoffset, int64_t destoffset, int64_t size,
+                        int sparse)
 {
-  char *src_buf;
-  int r;
+  CLEANUP_FREE char *src_buf = sysroot_path (src);

-  src_buf = sysroot_path (src);
  if (!src_buf) {
    reply_with_perror ("malloc");
    return -1;
  }

-  r = copy (src_buf, src, dest, dest, DEST_DEVICE_FLAGS,
-            srcoffset, destoffset, size);
-  free (src_buf);
-
-  return r;
+  return copy (src_buf, src, dest, dest, DEST_DEVICE_FLAGS,
+               srcoffset, destoffset, size, sparse);
 }

 int
 do_copy_file_to_file (const char *src, const char *dest,
-                      int64_t srcoffset, int64_t destoffset, int64_t size)
+                      int64_t srcoffset, int64_t destoffset, int64_t size,
+                      int sparse)
 {
-  char *src_buf, *dest_buf;
-  int r;
+  CLEANUP_FREE char *src_buf = NULL, *dest_buf = NULL;

  src_buf = sysroot_path (src);
  if (!src_buf) {
@@ -229,14 +245,9 @@ do_copy_file_to_file (const char *src, const char *dest,
  dest_buf = sysroot_path (dest);
  if (!dest_buf) {
    reply_with_perror ("malloc");
-    free (src_buf);
    return -1;
  }

-  r = copy (src_buf, src, dest_buf, dest, DEST_FILE_FLAGS,
-            srcoffset, destoffset, size);
-  free (src_buf);
-  free (dest_buf);
-
-  return r;
+  return copy (src_buf, src, dest_buf, dest, DEST_FILE_FLAGS,
+               srcoffset, destoffset, size, sparse);
 }
--- a/daemon/cpmv.c
+++ b/daemon/cpmv.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,31 +25,34 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_cp, cp);
+GUESTFSD_EXT_CMD(str_mv, mv);
+
 static int cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest);

 int
 do_cp (const char *src, const char *dest)
 {
-  return cpmv_cmd ("cp", NULL, src, dest);
+  return cpmv_cmd (str_cp, NULL, src, dest);
 }

 int
 do_cp_a (const char *src, const char *dest)
 {
-  return cpmv_cmd ("cp", "-a", src, dest);
+  return cpmv_cmd (str_cp, "-a", src, dest);
 }

 int
 do_mv (const char *src, const char *dest)
 {
-  return cpmv_cmd ("mv", NULL, src, dest);
+  return cpmv_cmd (str_mv, NULL, src, dest);
 }

 static int
 cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
 {
-  char *srcbuf, *destbuf;
-  char *err;
+  CLEANUP_FREE char *srcbuf = NULL, *destbuf = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  srcbuf = sysroot_path (src);
@@ -61,7 +64,6 @@ cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
  destbuf = sysroot_path (dest);
  if (destbuf == NULL) {
    reply_with_perror ("malloc");
-    free (srcbuf);
    return -1;
  }

@@ -72,16 +74,11 @@ cpmv_cmd (const char *cmd, const char *flags, const char *src, const char *dest)
  else
    r = command (NULL, &err, cmd, srcbuf, destbuf, NULL);

-  free (srcbuf);
-  free (destbuf);
-
  if (r == -1) {
    pulse_mode_cancel ();
    reply_with_error ("%s", err);
-    free (err);
    return -1;
  }
-  free (err);

  pulse_mode_end ();

--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,9 +30,15 @@

 #include "guestfs_protocol.h"

-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
+#include "guestfs-internal-all.h"
+
+/* Mountables */
+
+typedef struct {
+  mountable_type_t type;
+  const char *device;
+  const char *volume;
+} mountable_t;

 /*-- in guestfsd.c --*/
 extern int verbose;
@@ -51,6 +57,14 @@ extern int xwrite (int sock, const void *buf, size_t len)
 extern int xread (int sock, void *buf, size_t len)
  __attribute__((__warn_unused_result__));

+extern char *mountable_to_string (const mountable_t *mountable);
+
+/*-- in mount.c --*/
+
+extern int mount_vfs_nochroot (const char *options, const char *vfstype,
+                               const mountable_t *mountable,
+                               const char *mp, const char *user_mp);
+
 /* Growable strings buffer. */
 struct stringsbuf {
  char **argv;
@@ -79,6 +93,16 @@ extern void sort_strings (char **argv, size_t len);
 extern void free_strings (char **argv);
 extern void free_stringslen (char **argv, size_t len);

+extern void sort_device_names (char **argv, size_t len);
+extern int compare_device_names (const char *a, const char *b);
+
+/* Concatenate strings, optionally with a separator string between
+ * each.  On error, these return NULL but do NOT call reply_with_* nor
+ * free anything.
+ */
+extern char *concat_strings (char *const *argv);
+extern char *join_strings (const char *separator, char *const *argv);
+
 extern char **split_lines (char *str);

 #define command(out,err,name,...) commandf((out),(err),0,(name),__VA_ARGS__)
@@ -86,14 +110,17 @@ extern char **split_lines (char *str);
 #define commandv(out,err,argv) commandvf((out),(err),0,(argv))
 #define commandrv(out,err,argv) commandrvf((out),(err),0,(argv))

+#define __external_command __attribute__((__section__(".guestfsd_ext_cmds")))
+#define GUESTFSD_EXT_CMD(___ext_cmd_var, ___ext_cmd_str) static const char ___ext_cmd_var[] __external_command = #___ext_cmd_str
+
 #define COMMAND_FLAG_FD_MASK                   (1024-1)
 #define COMMAND_FLAG_FOLD_STDOUT_ON_STDERR     1024
 #define COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN 2048

 extern int commandf (char **stdoutput, char **stderror, int flags,
-                     const char *name, ...);
+                     const char *name, ...) __attribute__((sentinel));
 extern int commandrf (char **stdoutput, char **stderror, int flags,
-                      const char *name, ...);
+                      const char *name, ...) __attribute__((sentinel));
 extern int commandvf (char **stdoutput, char **stderror, int flags,
                      char const *const *argv);
 extern int commandrvf (char **stdoutput, char **stderror, int flags,
@@ -105,14 +132,23 @@ extern void trim (char *str);

 extern int device_name_translation (char *device);

+extern int parse_btrfsvol (char *desc, mountable_t *mountable);
+
 extern int prog_exists (const char *prog);

 extern void udev_settle (void);

+extern int random_name (char *template);
+
 /* This just stops gcc from giving a warning about our custom printf
 * formatters %Q and %R.  See guestfs(3)/EXTENDING LIBGUESTFS for more
- * info about these.
+ * info about these.  In GCC 4.8.0 the warning is even harder to
+ * 'trick', hence the need for the #pragma directives.
 */
+#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4.8.0 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
+#endif
 static inline int
 asprintf_nowarn (char **strp, const char *fmt, ...)
 {
@@ -124,6 +160,14 @@ asprintf_nowarn (char **strp, const char *fmt, ...)
  va_end (args);
  return r;
 }
+#if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40800 /* gcc >= 4.8.0 */
+#pragma GCC diagnostic pop
+#endif
+
+/* Use by the CLEANUP_* macros. */
+extern void cleanup_free (void *ptr);
+extern void cleanup_free_string_list (void *ptr);
+extern void cleanup_unlink_free (void *ptr);

 /*-- in names.c (auto-generated) --*/
 extern const char *function_names[];
@@ -151,13 +195,14 @@ struct optgroup {
 };
 extern struct optgroup optgroups[];

+/*-- in available.c --*/
+extern int filesystem_available (const char *filesystem);
+
 /*-- in sync.c --*/
 /* Use this as a replacement for sync(2). */
 extern int sync_disks (void);

 /*-- in ext2.c --*/
-extern int e2prog (char *name); /* Massive hack for RHEL 5. */
-
 /* Confirmed this is true up to ext4 from the Linux sources. */
 #define EXT2_LABEL_MAX 16

@@ -167,6 +212,9 @@ extern int lv_canonical (const char *device, char **ret);
 /*-- in lvm-filter.c --*/
 extern void copy_lvm (void);

+/*-- in zero.c --*/
+extern void wipe_device_before_mkfs (const char *device);
+
 /*-- in proto.c --*/
 extern void main_loop (int sock) __attribute__((noreturn));

@@ -225,6 +273,11 @@ extern void pulse_mode_start (void);
 extern void pulse_mode_end (void);
 extern void pulse_mode_cancel (void);

+/* Send a progress message without rate-limiting.  This is just
+ * for debugging - DON'T use it in regular code!
+ */
+extern void notify_progress_no_ratelimit (uint64_t position, uint64_t total, const struct timeval *now);
+
 /* Return true iff the buffer is all zero bytes.
 *
 * Note that gcc is smart enough to optimize this properly:
@@ -308,6 +361,33 @@ is_zero (const char *buffer, size_t size)
    }                                                                   \
  } while (0)

+/* All functions that take a mountable argument must call this macro.
+ * It parses the mountable into a mountable_t, ensures any
+ * underlying device exists, and does device name translation
+ * (described in the guestfs(3) manpage).
+ *
+ * Note that the "string" argument may be modified.
+ */
+#define RESOLVE_MOUNTABLE(string,mountable,cancel_stmt,fail_stmt)       \
+  do {                                                                  \
+    if (STRPREFIX ((string), "btrfsvol:")) {                            \
+      if (parse_btrfsvol ((string) + strlen ("btrfsvol:"), &(mountable)) == -1)\
+      {                                                                 \
+        cancel_stmt;                                                    \
+        reply_with_error ("%s: %s: expecting a btrfs volume",           \
+                          __func__, (string));                          \
+        fail_stmt;                                                      \
+      }                                                                 \
+    }                                                                   \
+                                                                        \
+    else {                                                              \
+      (mountable).type = MOUNTABLE_DEVICE;                              \
+      (mountable).device = (string);                                    \
+      (mountable).volume = NULL;                                        \
+      RESOLVE_DEVICE((string), cancel_stmt, fail_stmt);                 \
+    }                                                                   \
+  } while (0)
+
 /* Helper for functions which need either an absolute path in the
 * mounted filesystem, OR a /dev/ device which exists.
 *
@@ -328,6 +408,24 @@ is_zero (const char *buffer, size_t size)
    }									\
  } while (0)

+/* Helper for functions which need either an absolute path in the
+ * mounted filesystem, OR a valid mountable description.
+ */
+#define REQUIRE_ROOT_OR_RESOLVE_MOUNTABLE(string, mountable,            \
+                                          cancel_stmt, fail_stmt)       \
+  do {                                                                  \
+    if (STREQLEN ((string), "/dev/", strlen ("/dev/")) || (string)[0] != '/') {\
+      RESOLVE_MOUNTABLE (string, mountable, cancel_stmt, fail_stmt);    \
+    }                                                                   \
+                                                                        \
+    else {                                                              \
+      NEED_ROOT (cancel_stmt, fail_stmt);                               \
+      (mountable).type = MOUNTABLE_PATH;                                \
+      (mountable).device = (string);                                    \
+    }                                                                   \
+  } while (0)                                                           \
+
+
 /* NB:
 * (1) You must match CHROOT_IN and CHROOT_OUT even along error paths.
 * (2) You must not change directory!  cwd must always be "/", otherwise
@@ -364,24 +462,23 @@ is_zero (const char *buffer, size_t size)
  }									\
  while (0)

-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#  define __attribute__(x) /* empty */
-# endif
-#endif
+/* Marks functions which are not supported. */
+#define NOT_SUPPORTED(errcode,...)                      \
+    do {                                                \
+      reply_with_error_errno (ENOTSUP, __VA_ARGS__);    \
+      return (errcode);                                 \
+    }                                                   \
+    while (0)

-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+#ifdef HAVE_ATTRIBUTE_CLEANUP
+#define CLEANUP_FREE __attribute__((cleanup(cleanup_free)))
+#define CLEANUP_FREE_STRING_LIST                        \
+    __attribute__((cleanup(cleanup_free_string_list)))
+#define CLEANUP_UNLINK_FREE __attribute__((cleanup(cleanup_unlink_free)))
+#else
+#define CLEANUP_FREE
+#define CLEANUP_FREE_STRING_LIST
+#define CLEANUP_UNLINK_FREE
 #endif

-#define STREQ(a,b) (strcmp((a),(b)) == 0)
-#define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0)
-#define STRNEQ(a,b) (strcmp((a),(b)) != 0)
-#define STRCASENEQ(a,b) (strcasecmp((a),(b)) != 0)
-#define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0)
-#define STRCASEEQLEN(a,b,n) (strncasecmp((a),(b),(n)) == 0)
-#define STRNEQLEN(a,b,n) (strncmp((a),(b),(n)) != 0)
-#define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0)
-#define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0)
-
 #endif /* GUESTFSD_DAEMON_H */
--- a/daemon/dd.c
+++ b/daemon/dd.c
@@ -27,12 +27,14 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_dd, dd);
+
 int
 do_dd (const char *src, const char *dest)
 {
  int src_is_dev, dest_is_dev;
-  char *if_arg, *of_arg;
-  char *err;
+  CLEANUP_FREE char *if_arg = NULL, *of_arg = NULL;
+  CLEANUP_FREE char *err = NULL;
  int r;

  src_is_dev = STRPREFIX (src, "/dev/");
@@ -54,20 +56,14 @@ do_dd (const char *src, const char *dest)
    r = asprintf (&of_arg, "of=%s%s", sysroot, dest);
  if (r == -1) {
    reply_with_perror ("asprintf");
-    free (if_arg);
    return -1;
  }

-  r = command (NULL, &err, "dd", "bs=1024K", if_arg, of_arg, NULL);
-  free (if_arg);
-  free (of_arg);
-
+  r = command (NULL, &err, str_dd, "bs=1024K", if_arg, of_arg, NULL);
  if (r == -1) {
    reply_with_error ("%s: %s: %s", src, dest, err);
-    free (err);
    return -1;
  }
-  free (err);

  return 0;
 }
@@ -75,19 +71,17 @@ do_dd (const char *src, const char *dest)
 int
 do_copy_size (const char *src, const char *dest, int64_t ssize)
 {
-  char *buf;
  int src_fd, dest_fd;

  if (STRPREFIX (src, "/dev/"))
    src_fd = open (src, O_RDONLY | O_CLOEXEC);
  else {
-    buf = sysroot_path (src);
+    CLEANUP_FREE char *buf = sysroot_path (src);
    if (!buf) {
      reply_with_perror ("malloc");
      return -1;
    }
    src_fd = open (buf, O_RDONLY | O_CLOEXEC);
-    free (buf);
  }
  if (src_fd == -1) {
    reply_with_perror ("%s", src);
@@ -97,14 +91,13 @@ do_copy_size (const char *src, const char *dest, int64_t ssize)
  if (STRPREFIX (dest, "/dev/"))
    dest_fd = open (dest, O_WRONLY | O_CLOEXEC);
  else {
-    buf = sysroot_path (dest);
+    CLEANUP_FREE char *buf = sysroot_path (dest);
    if (!buf) {
      reply_with_perror ("malloc");
      close (src_fd);
      return -1;
    }
    dest_fd = open (buf, O_WRONLY|O_CREAT|O_TRUNC|O_NOCTTY|O_CLOEXEC, 0666);
-    free (buf);
  }
  if (dest_fd == -1) {
    reply_with_perror ("%s", dest);
--- a/daemon/debug.c
+++ b/daemon/debug.c
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -32,6 +33,15 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_printenv, printenv);
+GUESTFSD_EXT_CMD(str_ldd, ldd);
+GUESTFSD_EXT_CMD(str_ls, ls);
+GUESTFSD_EXT_CMD(str_find, find);
+GUESTFSD_EXT_CMD(str_xargs, xargs);
+GUESTFSD_EXT_CMD(str_file, file);
+GUESTFSD_EXT_CMD(str_grep, grep);
+GUESTFSD_EXT_CMD(str_gawk, gawk);
+
 /* This command exposes debugging information, internals and
 * status.  There is no comprehensive documentation for this
 * command.  You have to look at the source code in this file
@@ -61,7 +71,10 @@ static char *debug_ll (const char *subcmd, size_t argc, char *const *const argv)
 static char *debug_progress (const char *subcmd, size_t argc, char *const *const argv);
 static char *debug_qtrace (const char *subcmd, size_t argc, char *const *const argv);
 static char *debug_segv (const char *subcmd, size_t argc, char *const *const argv);
+static char *debug_setenv (const char *subcmd, size_t argc, char *const *const argv);
 static char *debug_sh (const char *subcmd, size_t argc, char *const *const argv);
+static char *debug_spew (const char *subcmd, size_t argc, char *const *const argv);
+static void deliberately_cause_a_segfault (void);

 static struct cmd cmds[] = {
  { "help", debug_help },
@@ -75,7 +88,9 @@ static struct cmd cmds[] = {
  { "progress", debug_progress },
  { "qtrace", debug_qtrace },
  { "segv", debug_segv },
+  { "setenv", debug_setenv },
  { "sh", debug_sh },
+  { "spew", debug_spew },
  { NULL, NULL }
 };

@@ -198,13 +213,7 @@ debug_fds (const char *subcmd, size_t argc, char *const *const argv)
 static char *
 debug_segv (const char *subcmd, size_t argc, char *const *const argv)
 {
-  /* http://blog.llvm.org/2011/05/what-every-c-programmer-should-know.html
-   * "Dereferencing a NULL Pointer: contrary to popular belief,
-   * dereferencing a null pointer in C is undefined. It is not defined
-   * to trap [...]"
-   */
-  volatile int *ptr = NULL;
-  *ptr = 1;
+  deliberately_cause_a_segfault ();
  return NULL;
 }

@@ -216,7 +225,7 @@ debug_segv (const char *subcmd, size_t argc, char *const *const argv)
 static char *
 debug_sh (const char *subcmd, size_t argc, char *const *const argv)
 {
-  char *cmd;
+  CLEANUP_FREE char *cmd = NULL;
  size_t len, i, j;

  if (argc < 1) {
@@ -255,8 +264,6 @@ debug_sh (const char *subcmd, size_t argc, char *const *const argv)
  char *err;
  int r = commandf (NULL, &err, COMMAND_FLAG_FOLD_STDOUT_ON_STDERR,
                    "/bin/sh", "-c", cmd, NULL);
-  free (cmd);
-
  if (r == -1) {
    reply_with_error ("%s", err);
    free (err);
@@ -271,21 +278,41 @@ static char *
 debug_env (const char *subcmd, size_t argc, char *const *const argv)
 {
  int r;
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;

-  r = command (&out, &err, "printenv", NULL);
+  r = command (&out, &err, str_printenv, NULL);
  if (r == -1) {
    reply_with_error ("printenv: %s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;
 }

+/* Set an environment variable in the daemon and future subprocesses. */
+static char *
+debug_setenv (const char *subcmd, size_t argc, char *const *const argv)
+{
+  char *ret;
+
+  if (argc != 2) {
+    reply_with_error ("setenv: two arguments expected");
+    return NULL;
+  }
+
+  setenv (argv[0], argv[1], 1);
+
+  ret = strdup ("ok");
+  if (NULL == ret) {
+    reply_with_perror ("strdup");
+    return NULL;
+  }
+
+  return ret;
+}
+
 /* Return binaries in the appliance.
 * See tests/regressions/rhbz727178.sh
 */
@@ -293,24 +320,24 @@ static char *
 debug_binaries (const char *subcmd, size_t argc, char *const *const argv)
 {
  int r;
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err;
+  char cmd[256];

-  const char cmd[] =
-    "find / -xdev -type f -executable "
-    "| xargs file -i "
-    "| grep application/x-executable "
-    "| gawk -F: '{print $1}'";
+  snprintf (cmd, sizeof (cmd),
+            "%s / -xdev -type f -executable "
+            "| %s %s -i "
+            "| %s application/x-executable "
+            "| %s -F: '{print $1}'",
+            str_find, str_xargs, str_file, str_grep, str_gawk);

  r = command (&out, &err, "sh", "-c", cmd, NULL);
  if (r == -1) {
    reply_with_error ("find: %s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;
 }

@@ -321,7 +348,8 @@ static char *
 debug_ldd (const char *subcmd, size_t argc, char *const *const argv)
 {
  int r;
-  char *out, *err, *ret;
+  char *out, *ret;
+  CLEANUP_FREE char *err = NULL;

  if (argc != 1) {
    reply_with_error ("ldd: no file argument");
@@ -334,11 +362,10 @@ debug_ldd (const char *subcmd, size_t argc, char *const *const argv)
   * Also 'ldd' randomly sends messages to stderr and errors to stdout
   * depending on the phase of the moon.
   */
-  r = command (&out, &err, "ldd", "-r", argv[0], NULL);
+  r = command (&out, &err, str_ldd, "-r", argv[0], NULL);
  if (r == -1) {
    reply_with_error ("ldd: %s: %s", argv[0], err);
    free (out);
-    free (err);
    return NULL;
  }

@@ -347,12 +374,10 @@ debug_ldd (const char *subcmd, size_t argc, char *const *const argv)
  if (ret == NULL) {
    reply_with_perror ("realloc");
    free (out);
-    free (err);
    return NULL;
  }

  strcat (ret, err);
-  free (err);

  return ret;
 }
@@ -364,26 +389,23 @@ debug_ls (const char *subcmd, size_t argc, char *const *const argv)
  size_t len = count_strings (argv);
  const char *cargv[len+3];
  size_t i;
+  int r;
+  char *out;
+  CLEANUP_FREE char *err;

-  cargv[0] = "ls";
+  cargv[0] = str_ls;
  cargv[1] = "-a";
  for (i = 0; i < len; ++i)
    cargv[2+i] = argv[i];
  cargv[2+len] = NULL;

-  int r;
-  char *out, *err;
-
  r = commandv (&out, &err, (void *) cargv);
  if (r == -1) {
    reply_with_error ("ls: %s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;
 }

@@ -394,26 +416,23 @@ debug_ll (const char *subcmd, size_t argc, char *const *const argv)
  size_t len = count_strings (argv);
  const char *cargv[len+3];
  size_t i;
+  int r;
+  char *out;
+  CLEANUP_FREE char *err;

-  cargv[0] = "ls";
+  cargv[0] = str_ls;
  cargv[1] = "-la";
  for (i = 0; i < len; ++i)
    cargv[2+i] = argv[i];
  cargv[2+len] = NULL;

-  int r;
-  char *out, *err;
-
  r = commandv (&out, &err, (void *) cargv);
  if (r == -1) {
    reply_with_error ("ll: %s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;
 }

@@ -421,29 +440,56 @@ debug_ll (const char *subcmd, size_t argc, char *const *const argv)
 static char *
 debug_progress (const char *subcmd, size_t argc, char *const *const argv)
 {
+  uint64_t secs, rate = 0;
+  char *ret;
+
  if (argc < 1) {
  error:
-    reply_with_error ("progress: expecting arg (time in seconds as string)");
+    reply_with_error ("progress: expecting one or more args: time in seconds [, rate in microseconds]");
    return NULL;
  }

-  char *secs_str = argv[0];
-  unsigned secs;
-  if (sscanf (secs_str, "%u", &secs) != 1)
+  if (sscanf (argv[0], "%" SCNu64, &secs) != 1)
    goto error;
  if (secs == 0 || secs > 1000000) { /* RHBZ#816839 */
    reply_with_error ("progress: argument is 0, less than 0, or too large");
    return NULL;
  }

-  unsigned i;
-  unsigned tsecs = secs * 10;   /* 1/10ths of seconds */
-  for (i = 1; i <= tsecs; ++i) {
-    usleep (100000);
-    notify_progress ((uint64_t) i, (uint64_t) tsecs);
+  if (argc >= 2) {
+    if (sscanf (argv[1], "%" SCNu64, &rate) != 1)
+      goto error;
+    if (rate == 0 || rate > 1000000) {
+      reply_with_error ("progress: rate is 0 or too large");
+      return NULL;
+    }
  }

-  char *ret = strdup ("ok");
+  /* Note the inner loops go to '<= limit' because we want to ensure
+   * that the final 100% completed message is set.
+   */
+  if (rate == 0) {              /* Ordinary rate-limited progress messages. */
+    uint64_t tsecs = secs * 10; /* 1/10ths of seconds */
+    uint64_t i;
+
+    for (i = 1; i <= tsecs; ++i) {
+      usleep (100000);
+      notify_progress (i, tsecs);
+    }
+  }
+  else {                        /* Send messages at a given rate. */
+    uint64_t usecs = secs * 1000000; /* microseconds */
+    uint64_t i;
+    struct timeval now;
+
+    for (i = rate; i <= usecs; i += rate) {
+      usleep (rate);
+      gettimeofday (&now, NULL);
+      notify_progress_no_ratelimit (i, usecs, &now);
+    }
+  }
+
+  ret = strdup ("ok");
  if (ret == NULL) {
    reply_with_perror ("strdup");
    return NULL;
@@ -503,6 +549,42 @@ debug_core_pattern (const char *subcmd, size_t argc, char *const *const argv)
  return ret;
 }

+/* Generate lots of debug messages.  Each line of output is 72
+ * characters long (plus '\n'), so the total size of the output in
+ * bytes is n*73.
+ */
+static char *
+debug_spew (const char *subcmd, size_t argc, char *const *const argv)
+{
+  size_t i, n;
+  char *ret;
+
+  if (argc != 1) {
+    reply_with_error ("spew: expecting number of lines <n>");
+    return NULL;
+  }
+
+  if (sscanf (argv[0], "%zu", &n) != 1) {
+    reply_with_error ("spew: could not parse number of lines '%s'", argv[0]);
+    return NULL;
+  }
+
+  for (i = 0; i < n; ++i)
+    fprintf (stderr,
+             "abcdefghijklmnopqrstuvwxyz" /* 26 */
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ" /* 52 */
+             "01234567890123456789" /* 72 */
+             "\n");
+
+  ret = strdup ("ok");
+  if (!ret) {
+    reply_with_perror ("strdup");
+    return NULL;
+  }
+
+  return ret;
+}
+
 static int
 write_cb (void *fd_ptr, const void *buf, size_t len)
 {
@@ -554,12 +636,13 @@ debug_qtrace (const char *subcmd, size_t argc, char *const *const argv)
    { 2, 15, 21, 2, -1 }, /* disable trace */
    { 2, 21, 15, 2, -1 }  /* enable trace */
  };
-  void *buf;
+  CLEANUP_FREE void *buf = NULL;
  size_t i;

  /* For O_DIRECT, buffer must be aligned too (thanks Matt).
   * Note posix_memalign has this strange errno behaviour.
   */
+  /* coverity[resource_leak] */
  errno = posix_memalign (&buf, QTRACE_SIZE, QTRACE_SIZE);
  if (errno != 0) {
    reply_with_perror ("posix_memalign");
@@ -571,20 +654,17 @@ debug_qtrace (const char *subcmd, size_t argc, char *const *const argv)
    if (lseek (fd, patterns[enable][i]*QTRACE_SIZE, SEEK_SET) == -1) {
      reply_with_perror ("qtrace: %s: lseek", argv[0]);
      close (fd);
-      free (buf);
      return NULL;
    }

    if (read (fd, buf, QTRACE_SIZE) == -1) {
      reply_with_perror ("qtrace: %s: read", argv[0]);
      close (fd);
-      free (buf);
      return NULL;
    }
  }

  close (fd);
-  free (buf);

  /* This does a sync and flushes all caches. */
  if (do_drop_caches (3) == -1)
@@ -641,3 +721,64 @@ do_debug_upload (const char *filename, int mode)

  return 0;
 }
+
+/* Internal function used only when testing
+ * https://bugzilla.redhat.com/show_bug.cgi?id=914931
+ */
+
+static int
+crash_cb (void *countv, const void *buf, size_t len)
+{
+  int *countp = countv;
+
+  (*countp)--;
+  sleep (1);
+
+  if (*countp == 0)
+    deliberately_cause_a_segfault ();
+
+  return 0;
+}
+
+/* Has one FileIn parameter. */
+int
+do_internal_rhbz914931 (int count)
+{
+  int r;
+
+  if (count <= 0 || count > 1000) {
+    reply_with_error ("count out of range");
+    return -1;
+  }
+
+  r = receive_file (crash_cb, &count);
+  if (r == -1) {		/* write error */
+    int err = errno;
+    cancel_receive ();
+    errno = err;
+    reply_with_error ("write error");
+    return -1;
+  }
+  if (r == -2) {		/* cancellation from library */
+    /* This error is ignored by the library since it initiated the
+     * cancel.  Nevertheless we must send an error reply here.
+     */
+    reply_with_error ("file upload cancelled");
+    return -1;
+  }
+
+  return 0;
+}
+
+static void
+deliberately_cause_a_segfault (void)
+{
+  /* http://blog.llvm.org/2011/05/what-every-c-programmer-should-know.html
+   * "Dereferencing a NULL Pointer: contrary to popular belief,
+   * dereferencing a null pointer in C is undefined. It is not defined
+   * to trap [...]"
+   */
+  volatile int *ptr = NULL;
+  /* coverity[var_deref_op] */
+  *ptr = 1;
+}
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <dirent.h>
+#include <limits.h>
 #include <sys/stat.h>

 #include "c-ctype.h"
@@ -38,9 +39,11 @@ static char **
 foreach_block_device (block_dev_func_t func)
 {
  DECLARE_STRINGSBUF (r);
-
  DIR *dir;
  int err = 0;
+  struct dirent *d;
+  char dev_path[256];
+  int fd;

  dir = opendir ("/sys/block");
  if (!dir) {
@@ -48,16 +51,15 @@ foreach_block_device (block_dev_func_t func)
    return NULL;
  }

-  while(1) {
+  for (;;) {
    errno = 0;
-    struct dirent *d = readdir(dir);
-    if(NULL == d) break;
+    d = readdir(dir);
+    if (!d) break;

    if (STREQLEN (d->d_name, "sd", 2) ||
        STREQLEN (d->d_name, "hd", 2) ||
        STREQLEN (d->d_name, "vd", 2) ||
        STREQLEN (d->d_name, "sr", 2)) {
-      char dev_path[256];
      snprintf (dev_path, sizeof dev_path, "/dev/%s", d->d_name);

      /* Ignore the root device. */
@@ -68,7 +70,7 @@ foreach_block_device (block_dev_func_t func)
       * CD-ROM device even though we didn't request it.  Try to
       * detect this by seeing if the device contains media.
       */
-      int fd = open (dev_path, O_RDONLY|O_CLOEXEC);
+      fd = open (dev_path, O_RDONLY|O_CLOEXEC);
      if (fd == -1) {
        perror (dev_path);
        continue;
@@ -76,7 +78,7 @@ foreach_block_device (block_dev_func_t func)
      close (fd);

      /* Call the map function for this device */
-      if((*func)(d->d_name, &r) != 0) {
+      if ((*func)(d->d_name, &r) != 0) {
        err = 1;
        break;
      }
@@ -84,7 +86,7 @@ foreach_block_device (block_dev_func_t func)
  }

  /* Check readdir didn't fail */
-  if(0 != errno) {
+  if (errno != 0) {
    reply_with_perror ("readdir: /sys/block");
    free_stringslen (r.argv, r.size);
    closedir (dir);
@@ -106,7 +108,7 @@ foreach_block_device (block_dev_func_t func)

  /* Sort the devices. */
  if (r.size > 0)
-    sort_strings (r.argv, r.size);
+    sort_device_names (r.argv, r.size);

  /* NULL terminate the list */
  if (end_stringsbuf (&r) == -1) {
@@ -241,3 +243,136 @@ do_part_to_partnum (const char *part)

  return r;
 }
+
+int
+do_is_whole_device (const char *device)
+{
+  /* A 'whole' block device will have a symlink to the device in its
+   * /sys/block directory */
+  CLEANUP_FREE char *devpath = NULL;
+  if (asprintf (&devpath, "/sys/block/%s/device",
+                device + strlen ("/dev/")) == -1)
+  {
+    reply_with_perror ("asprintf");
+    return -1;
+  }
+
+  struct stat statbuf;
+  if (stat (devpath, &statbuf) == -1) {
+    if (errno == ENOENT || errno == ENOTDIR) return 0;
+
+    reply_with_perror ("stat");
+    return -1;
+  }
+
+  return 1;
+}
+
+int
+do_device_index (const char *device)
+{
+  size_t i;
+  int ret = -1;
+  CLEANUP_FREE_STRING_LIST char **devices = do_list_devices ();
+
+  if (devices == NULL)
+    return -1;
+
+  for (i = 0; devices[i] != NULL; ++i) {
+    if (STREQ (device, devices[i]))
+      ret = (int) i;
+  }
+
+  if (ret == -1)
+    reply_with_error ("device not found");
+
+  return ret;
+}
+
+int
+do_nr_devices (void)
+{
+  size_t i;
+  CLEANUP_FREE_STRING_LIST char **devices = do_list_devices ();
+
+  if (devices == NULL)
+    return -1;
+
+  for (i = 0; devices[i] != NULL; ++i)
+    ;
+
+  return (int) i;
+}
+
+#define GUESTFSDIR "/dev/disk/guestfs"
+
+char **
+do_list_disk_labels (void)
+{
+  DIR *dir = NULL;
+  struct dirent *d;
+  char *rawdev = NULL;
+  DECLARE_STRINGSBUF (ret);
+
+  dir = opendir (GUESTFSDIR);
+  if (!dir) {
+    reply_with_perror ("opendir: %s", GUESTFSDIR);
+    return NULL;
+  }
+
+  errno = 0;
+  while ((d = readdir (dir)) != NULL) {
+    CLEANUP_FREE char *path = NULL;
+
+    if (d->d_name[0] == '.')
+      continue;
+
+    if (asprintf (&path, "%s/%s", GUESTFSDIR, d->d_name) == -1) {
+      reply_with_perror ("asprintf");
+      free_stringslen (ret.argv, ret.size);
+      goto error;
+    }
+
+    rawdev = realpath (path, NULL);
+    if (rawdev == NULL) {
+      reply_with_perror ("realpath: %s", path);
+      free_stringslen (ret.argv, ret.size);
+      goto error;
+    }
+
+    if (add_string (&ret, d->d_name) == -1)
+      goto error;
+
+    if (add_string_nodup (&ret, rawdev) == -1)
+      goto error;
+    rawdev = NULL;            /* buffer now owned by the stringsbuf */
+  }
+
+  /* Check readdir didn't fail */
+  if (errno != 0) {
+    reply_with_perror ("readdir: %s", GUESTFSDIR);
+    free_stringslen (ret.argv, ret.size);
+    goto error;
+  }
+
+  /* Close the directory handle */
+  if (closedir (dir) == -1) {
+    reply_with_perror ("closedir: %s", GUESTFSDIR);
+    free_stringslen (ret.argv, ret.size);
+    dir = NULL;
+    goto error;
+  }
+
+  dir = NULL;
+
+  if (end_stringsbuf (&ret) == -1)
+    goto error;
+
+  return ret.argv;              /* caller frees */
+
+ error:
+  if (dir)
+    closedir (dir);
+  free (rawdev);
+  return NULL;
+}
--- a/daemon/df.c
+++ b/daemon/df.c
@@ -27,24 +27,24 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_df, df);
+
 char *
 do_df (void)
 {
  int r;
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;

  NEED_ROOT (, return NULL);

-  r = command (&out, &err, "df", NULL);
+  r = command (&out, &err, str_df, NULL);
  if (r == -1) {
    reply_with_error ("%s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;			/* Caller frees. */
 }

@@ -52,19 +52,17 @@ char *
 do_df_h (void)
 {
  int r;
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;

  NEED_ROOT (, return NULL);

-  r = command (&out, &err, "df", "-h", NULL);
+  r = command (&out, &err, str_df, "-h", NULL);
  if (r == -1) {
    reply_with_error ("%s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  return out;			/* Caller frees. */
 }
--- a/daemon/dir.c
+++ b/daemon/dir.c
@@ -29,6 +29,8 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_rm, rm);
+
 int
 do_rmdir (const char *path)
 {
@@ -54,7 +56,7 @@ int
 do_rm_rf (const char *path)
 {
  int r;
-  char *buf, *err;
+  CLEANUP_FREE char *buf = NULL, *err = NULL;

  if (STREQ (path, "/")) {
    reply_with_error ("cannot remove root directory");
@@ -67,18 +69,13 @@ do_rm_rf (const char *path)
    return -1;
  }

-  r = command (NULL, &err, "rm", "-rf", buf, NULL);
-  free (buf);
-
+  r = command (NULL, &err, str_rm, "-rf", buf, NULL);
  /* rm -rf is never supposed to fail.  I/O errors perhaps? */
  if (r == -1) {
    reply_with_error ("%s: %s", path, err);
-    free (err);
    return -1;
  }

-  free (err);
-
  return 0;
 }

@@ -131,7 +128,7 @@ recursive_mkdir (const char *path)
 {
  int loop = 0;
  int r;
-  char *ppath, *p;
+  char *p;
  struct stat buf;

 again:
@@ -151,14 +148,13 @@ recursive_mkdir (const char *path)
      if (path[0] == '/' && path[1] == '\0') return -1;

      /* Try to make the parent directory first. */
-      ppath = strdup (path);
+      CLEANUP_FREE char *ppath = strdup (path);
      if (ppath == NULL) return -1;

      p = strrchr (ppath, '/');
      if (p) *p = '\0';

      r = recursive_mkdir (ppath);
-      free (ppath);

      if (r != 0) return r;

@@ -189,24 +185,3 @@ do_mkdir_p (const char *path)

  return 0;
 }
-
-char *
-do_mkdtemp (const char *template)
-{
-  char *writable = strdup (template);
-  if (writable == NULL) {
-    reply_with_perror ("strdup");
-    return NULL;
-  }
-
-  CHROOT_IN;
-  char *r = mkdtemp (writable);
-  CHROOT_OUT;
-
-  if (r == NULL) {
-    reply_with_perror ("%s", template);
-    free (writable);
-  }
-
-  return r;
-}
--- a/daemon/dmesg.c
+++ b/daemon/dmesg.c
@@ -27,20 +27,21 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_dmesg, dmesg);
+
 char *
 do_dmesg (void)
 {
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;
  int r;

-  r = command (&out, &err, "dmesg", NULL);
+  r = command (&out, &err, str_dmesg, NULL);
  if (r == -1) {
    reply_with_error ("%s", err);
    free (out);
-    free (err);
    return NULL;
  }
-  free (err);

  return out;			/* caller frees */
 }
--- a/daemon/du.c
+++ b/daemon/du.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -28,13 +28,14 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_du, du);
+
 int64_t
 do_du (const char *path)
 {
  int r;
  int64_t rv;
-  char *out, *err;
-  char *buf;
+  CLEANUP_FREE char *out = NULL, *err = NULL, *buf = NULL;

  /* Make the path relative to /sysroot. */
  buf = sysroot_path (path);
@@ -45,27 +46,19 @@ do_du (const char *path)

  pulse_mode_start ();

-  r = command (&out, &err, "du", "-s", buf, NULL);
-  free (buf);
+  r = command (&out, &err, str_du, "-s", buf, NULL);
  if (r == -1) {
    pulse_mode_cancel ();
    reply_with_error ("%s: %s", path, err);
-    free (out);
-    free (err);
    return -1;
  }

-  free (err);
-
  if (sscanf (out, "%"SCNi64, &rv) != 1) {
    pulse_mode_cancel ();
    reply_with_error ("%s: could not read output: %s", path, out);
-    free (out);
    return -1;
  }

-  free (out);
-
  pulse_mode_end ();

  return rv;
--- a/daemon/echo-daemon.c
+++ b/daemon/echo-daemon.c
@@ -50,7 +50,7 @@ do_echo_daemon (char *const *argv)
    char *out_new = realloc (out, out_len + 1);
    if (NULL == out_new) {
      reply_with_perror ("realloc");
-      free(out);
+      free (out);
      return 0;
    }
    out = out_new;
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,10 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_file, file);
+GUESTFSD_EXT_CMD(str_zcat, zcat);
+GUESTFSD_EXT_CMD(str_bzcat, bzcat);
+
 int
 do_touch (const char *path)
 {
@@ -85,123 +89,6 @@ do_touch (const char *path)
  return 0;
 }

-char *
-do_cat (const char *path)
-{
-  int fd;
-  size_t alloc, size, max;
-  ssize_t r;
-  char *buf, *buf2;
-
-  CHROOT_IN;
-  fd = open (path, O_RDONLY|O_CLOEXEC);
-  CHROOT_OUT;
-
-  if (fd == -1) {
-    reply_with_perror ("open: %s", path);
-    return NULL;
-  }
-
-  /* Read up to GUESTFS_MESSAGE_MAX - <overhead> bytes.  If it's
-   * larger than that, we need to return an error instead (for
-   * correctness).
-   */
-  max = GUESTFS_MESSAGE_MAX - 1000;
-  buf = NULL;
-  size = alloc = 0;
-
-  for (;;) {
-    if (size >= alloc) {
-      alloc += 8192;
-      if (alloc > max) {
-        reply_with_error ("%s: file is too large for message buffer",
-                          path);
-        free (buf);
-        close (fd);
-        return NULL;
-      }
-      buf2 = realloc (buf, alloc);
-      if (buf2 == NULL) {
-        reply_with_perror ("realloc");
-        free (buf);
-        close (fd);
-        return NULL;
-      }
-      buf = buf2;
-    }
-
-    r = read (fd, buf + size, alloc - size);
-    if (r == -1) {
-      reply_with_perror ("read: %s", path);
-      free (buf);
-      close (fd);
-      return NULL;
-    }
-    if (r == 0) {
-      buf[size] = '\0';
-      break;
-    }
-    if (r > 0)
-      size += r;
-  }
-
-  if (close (fd) == -1) {
-    reply_with_perror ("close: %s", path);
-    free (buf);
-    return NULL;
-  }
-
-  return buf;			/* caller will free */
-}
-
-char **
-do_read_lines (const char *path)
-{
-  DECLARE_STRINGSBUF (r);
-  FILE *fp;
-  char *line = NULL;
-  size_t len = 0;
-  ssize_t n;
-
-  CHROOT_IN;
-  fp = fopen (path, "r");
-  CHROOT_OUT;
-
-  if (!fp) {
-    reply_with_perror ("fopen: %s", path);
-    return NULL;
-  }
-
-  while ((n = getline (&line, &len, fp)) != -1) {
-    /* Remove either LF or CRLF. */
-    if (n >= 2 && line[n-2] == '\r' && line[n-1] == '\n')
-      line[n-2] = '\0';
-    else if (n >= 1 && line[n-1] == '\n')
-      line[n-1] = '\0';
-
-    if (add_string (&r, line) == -1) {
-      free (line);
-      fclose (fp);
-      return NULL;
-    }
-  }
-
-  free (line);
-
-  if (end_stringsbuf (&r) == -1) {
-    fclose (fp);
-    return NULL;
-  }
-
-  if (fclose (fp) == EOF) {
-    reply_with_perror ("fclose: %s", path);
-    free_stringslen (r.argv, r.size);
-    return NULL;
-  }
-
-  return r.argv;
-}
-
 int
 do_rm (const char *path)
 {
@@ -219,6 +106,24 @@ do_rm (const char *path)
  return 0;
 }

+int
+do_rm_f (const char *path)
+{
+  int r;
+
+  CHROOT_IN;
+  r = unlink (path);
+  CHROOT_OUT;
+
+  /* Ignore ENOENT. */
+  if (r == -1 && errno != ENOENT) {
+    reply_with_perror ("%s", path);
+    return -1;
+  }
+
+  return 0;
+}
+
 int
 do_chmod (int mode, const char *path)
 {
@@ -328,7 +233,7 @@ do_write_file (const char *path, const char *content, int size)
 }

 int
-do_write (const char *path, const char *content, size_t size)
+do_internal_write (const char *path, const char *content, size_t size)
 {
  int fd;

@@ -356,7 +261,7 @@ do_write (const char *path, const char *content, size_t size)
 }

 int
-do_write_append (const char *path, const char *content, size_t size)
+do_internal_write_append (const char *path, const char *content, size_t size)
 {
  int fd;

@@ -383,65 +288,6 @@ do_write_append (const char *path, const char *content, size_t size)
  return 0;
 }

-char *
-do_read_file (const char *path, size_t *size_r)
-{
-  int fd;
-  struct stat statbuf;
-  char *r;
-
-  CHROOT_IN;
-  fd = open (path, O_RDONLY|O_CLOEXEC);
-  CHROOT_OUT;
-
-  if (fd == -1) {
-    reply_with_perror ("open: %s", path);
-    return NULL;
-  }
-
-  if (fstat (fd, &statbuf) == -1) {
-    reply_with_perror ("fstat: %s", path);
-    close (fd);
-    return NULL;
-  }
-
-  /* The actual limit on messages is smaller than this.  This
-   * check just limits the amount of memory we'll try and allocate
-   * here.  If the message is larger than the real limit, that will
-   * be caught later when we try to serialize the message.
-   */
-  if (statbuf.st_size >= GUESTFS_MESSAGE_MAX) {
-    reply_with_error ("%s: file is too large for the protocol, use guestfs_download instead", path);
-    close (fd);
-    return NULL;
-  }
-  r = malloc (statbuf.st_size);
-  if (r == NULL) {
-    reply_with_perror ("malloc");
-    close (fd);
-    return NULL;
-  }
-
-  if (xread (fd, r, statbuf.st_size) == -1) {
-    reply_with_perror ("read: %s", path);
-    close (fd);
-    free (r);
-    return NULL;
-  }
-
-  if (close (fd) == -1) {
-    reply_with_perror ("close: %s", path);
-    free (r);
-    return NULL;
-  }
-
-  /* Mustn't touch *size_r until we are sure that we won't return any
-   * error (RHBZ#589039).
-   */
-  *size_r = statbuf.st_size;
-  return r;
-}
-
 static char *
 pread_fd (int fd, int count, int64_t offset, size_t *size_r,
          const char *display_path)
@@ -594,7 +440,7 @@ do_pwrite_device (const char *device, const char *content, size_t size,
 char *
 do_file (const char *path)
 {
-  char *buf = NULL;
+  CLEANUP_FREE char *buf = NULL;
  const char *display_path = path;

  int is_dev = STRPREFIX (path, "/dev/");
@@ -613,15 +459,12 @@ do_file (const char *path)
    struct stat statbuf;
    if (lstat (path, &statbuf) == -1) {
      reply_with_perror ("lstat: %s", display_path);
-      free (buf);
      return NULL;
    }

    if (! S_ISREG (statbuf.st_mode)) {
      char *ret;

-      free (buf);
-
      if (S_ISDIR (statbuf.st_mode))
        ret = strdup ("directory");
      else if (S_ISCHR (statbuf.st_mode))
@@ -648,22 +491,27 @@ do_file (const char *path)
   */
  const char *flags = is_dev ? "-zbsL" : "-zb";

-  char *out, *err;
-  int r = command (&out, &err, "file", flags, path, NULL);
-  free (buf);
+  char *out;
+  CLEANUP_FREE char *err;
+  int r = command (&out, &err, str_file, flags, path, NULL);

  if (r == -1) {
    free (out);
    reply_with_error ("%s: %s", display_path, err);
-    free (err);
    return NULL;
  }
-  free (err);

  /* We need to remove the trailing \n from output of file(1). */
  size_t len = strlen (out);
  if (len > 0 && out[len-1] == '\n')
-    out[len-1] = '\0';
+    out[--len] = '\0';
+
+  /* Some upstream versions of file add a space at the end of the
+   * output.  This is fixed in the Fedora version, but we might as
+   * well fix it here too.  (RHBZ#928995).
+   */
+  if (len > 0 && out[len-1] == ' ')
+    out[--len] = '\0';

  return out;			/* caller frees */
 }
@@ -674,14 +522,14 @@ do_zfile (const char *method, const char *path)
 {
  size_t len;
  const char *zcat;
-  char *cmd;
+  CLEANUP_FREE char *cmd = NULL;
  FILE *fp;
  char line[256];

  if (STREQ (method, "gzip") || STREQ (method, "compress"))
-    zcat = "zcat";
+    zcat = str_zcat;
  else if (STREQ (method, "bzip2"))
-    zcat = "bzcat";
+    zcat = str_bzcat;
  else {
    reply_with_error ("unknown method");
    return NULL;
@@ -698,12 +546,9 @@ do_zfile (const char *method, const char *path)
  fp = popen (cmd, "r");
  if (fp == NULL) {
    reply_with_perror ("%s", cmd);
-    free (cmd);
    return NULL;
  }

-  free (cmd);
-
  if (fgets (line, sizeof line, fp) == NULL) {
    reply_with_perror ("fgets");
    fclose (fp);
--- a/daemon/fill.c
+++ b/daemon/fill.c
@@ -123,3 +123,31 @@ do_fill_pattern (const char *pattern, int len, const char *path)

  return 0;
 }
+
+int
+do_fill_dir (const char *dir, int n)
+{
+  size_t len = strlen (dir);
+  char filename[len+10];
+  int fd;
+  int i;
+
+  for (i = 0; i < n; ++i) {
+    snprintf (filename, len+10, "%s/%08d", dir, i);
+
+    CHROOT_IN;
+    fd = open (filename, O_WRONLY|O_CREAT|O_NOCTTY|O_CLOEXEC, 0666);
+    CHROOT_OUT;
+
+    if (fd == -1) {
+      reply_with_perror ("create: %s", filename);
+      return -1;
+    }
+    if (close (fd) == -1) {
+      reply_with_perror ("close: %s", filename);
+      return -1;
+    }
+  }
+
+  return 0;
+}
--- a/daemon/find.c
+++ b/daemon/find.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_find, find);
+
 static int
 input_to_nul (FILE *fp, char *buf, size_t maxlen)
 {
@@ -49,97 +51,6 @@ input_to_nul (FILE *fp, char *buf, size_t maxlen)
  return -1;
 }

-char **
-do_find (const char *dir)
-{
-  struct stat statbuf;
-  int r;
-  size_t sysrootdirlen;
-  size_t len;
-  char *cmd;
-  FILE *fp;
-  DECLARE_STRINGSBUF (ret);
-  char *sysrootdir;
-  char str[PATH_MAX];
-
-  sysrootdir = sysroot_path (dir);
-  if (!sysrootdir) {
-    reply_with_perror ("malloc");
-    return NULL;
-  }
-
-  r = stat (sysrootdir, &statbuf);
-  if (r == -1) {
-    reply_with_perror ("%s", dir);
-    free (sysrootdir);
-    return NULL;
-  }
-  if (!S_ISDIR (statbuf.st_mode)) {
-    reply_with_error ("%s: not a directory", dir);
-    free (sysrootdir);
-    return NULL;
-  }
-
-  sysrootdirlen = strlen (sysrootdir);
-
-  /* Assemble the external find command. */
-  if (asprintf_nowarn (&cmd, "find %Q -print0", sysrootdir) == -1) {
-    reply_with_perror ("malloc");
-    free (sysrootdir);
-    return NULL;
-  }
-  free (sysrootdir);
-
-  if (verbose)
-    fprintf (stderr, "%s\n", cmd);
-
-  fp = popen (cmd, "r");
-  if (fp == NULL) {
-    reply_with_perror ("%s", cmd);
-    free (cmd);
-    return NULL;
-  }
-  free (cmd);
-
-  while ((r = input_to_nul (fp, str, PATH_MAX)) > 0) {
-    len = strlen (str);
-    if (len <= sysrootdirlen)
-      continue;
-
-    /* Remove the directory part of the path when adding it. */
-    if (add_string (&ret, str + sysrootdirlen) == -1) {
-      pclose (fp);
-      return NULL;
-    }
-  }
-  if (pclose (fp) != 0) {
-    reply_with_perror ("pclose");
-    free_stringslen (ret.argv, ret.size);
-    return NULL;
-  }
-
-  if (r == -1) {
-    free_stringslen (ret.argv, ret.size);
-    return NULL;
-  }
-
-  if (ret.size > 0)
-    sort_strings (ret.argv, ret.size);
-
-  if (end_stringsbuf (&ret) == -1)
-    return NULL;
-
-  return ret.argv;              /* caller frees */
-}
-
-/* The code below assumes each path returned can fit into a protocol
- * chunk.  If this turns out not to be true at some point in the
- * future then we'll need to modify the code a bit to handle it.
- */
-#if PATH_MAX > GUESTFS_MAX_CHUNK_SIZE
-#error "PATH_MAX > GUESTFS_MAX_CHUNK_SIZE"
-#endif
-
 /* Has one FileOut parameter. */
 int
 do_find0 (const char *dir)
@@ -147,9 +58,9 @@ do_find0 (const char *dir)
  struct stat statbuf;
  int r;
  FILE *fp;
-  char *cmd;
-  char *sysrootdir;
-  size_t sysrootdirlen, len;
+  CLEANUP_FREE char *cmd = NULL;
+  CLEANUP_FREE char *sysrootdir = NULL;
+  size_t sysrootdirlen;
  char str[GUESTFS_MAX_CHUNK_SIZE];

  sysrootdir = sysroot_path (dir);
@@ -161,23 +72,19 @@ do_find0 (const char *dir)
  r = stat (sysrootdir, &statbuf);
  if (r == -1) {
    reply_with_perror ("%s", dir);
-    free (sysrootdir);
    return -1;
  }
  if (!S_ISDIR (statbuf.st_mode)) {
    reply_with_error ("%s: not a directory", dir);
-    free (sysrootdir);
    return -1;
  }

  sysrootdirlen = strlen (sysrootdir);

-  if (asprintf_nowarn (&cmd, "find %Q -print0", sysrootdir) == -1) {
+  if (asprintf_nowarn (&cmd, "%s %Q -print0", str_find, sysrootdir) == -1) {
    reply_with_perror ("asprintf");
-    free (sysrootdir);
    return -1;
  }
-  free (sysrootdir);

  if (verbose)
    fprintf (stderr, "%s\n", cmd);
@@ -185,10 +92,8 @@ do_find0 (const char *dir)
  fp = popen (cmd, "r");
  if (fp == NULL) {
    reply_with_perror ("%s", cmd);
-    free (cmd);
    return -1;
  }
-  free (cmd);

  /* Now we must send the reply message, before the file contents.  After
   * this there is no opportunity in the protocol to send any error
@@ -196,8 +101,13 @@ do_find0 (const char *dir)
   */
  reply (NULL, NULL);

+  /* The code below assumes each path returned can fit into a protocol
+   * chunk (if not you'll get a runtime protocol error).  If this
+   * turns out not to be a problem at some point in the future then
+   * we'll need to modify the code to handle it.  XXX
+   */
  while ((r = input_to_nul (fp, str, GUESTFS_MAX_CHUNK_SIZE)) > 0) {
-    len = strlen (str);
+    size_t len = strlen (str);
    if (len <= sysrootdirlen)
      continue;

@@ -209,14 +119,14 @@ do_find0 (const char *dir)
  }

  if (ferror (fp)) {
-    perror (dir);
+    fprintf (stderr, "fgetc: %s: %m\n", dir);
    send_file_end (1);                /* Cancel. */
    pclose (fp);
    return -1;
  }

  if (pclose (fp) != 0) {
-    perror (dir);
+    fprintf (stderr, "pclose: %s: %m\n", dir);
    send_file_end (1);                /* Cancel. */
    return -1;
  }
--- a/daemon/findfs.c
+++ b/daemon/findfs.c
@@ -26,9 +26,15 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_findfs, findfs);
+
 static char *
 findfs (const char *tag, const char *label_or_uuid)
 {
+  char *out;
+  CLEANUP_FREE char *err = NULL;
+  int r;
+
  /* Kill the cache file, forcing blkid to reread values from the
   * original filesystems.  In blkid there is a '-p' option which is
   * supposed to do this, but (a) it doesn't work and (b) that option
@@ -41,17 +47,13 @@ findfs (const char *tag, const char *label_or_uuid)
  char arg[len];
  snprintf (arg, len, "%s=%s", tag, label_or_uuid);

-  char *out, *err;
-  int r = command (&out, &err, "findfs", arg, NULL);
+  r = command (&out, &err, str_findfs, arg, NULL);
  if (r == -1) {
    reply_with_error ("%s", err);
    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
  /* Trim trailing \n if present. */
  len = strlen (out);
  if (len > 0 && out[len-1] == '\n')
--- a/daemon/fsck.c
+++ b/daemon/fsck.c
@@ -26,19 +26,19 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_fsck, fsck);
+
 int
 do_fsck (const char *fstype, const char *device)
 {
-  char *err;
+  CLEANUP_FREE char *err = NULL;
  int r;

-  r = commandr (NULL, &err, "fsck", "-a", "-t", fstype, device, NULL);
+  r = commandr (NULL, &err, str_fsck, "-a", "-t", fstype, device, NULL);
  if (r == -1) {
    reply_with_error ("%s: %s", device, err);
-    free (err);
    return -1;
  }

-  free (err);
  return r;
 }
--- a/daemon/fstrim.c
+++ b/daemon/fstrim.c
@@ -0,0 +1,97 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2012 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "guestfs_protocol.h"
+#include "daemon.h"
+#include "actions.h"
+#include "optgroups.h"
+
+#define MAX_ARGS 64
+
+GUESTFSD_EXT_CMD(str_fstrim, fstrim);
+
+int
+optgroup_fstrim_available (void)
+{
+  return prog_exists (str_fstrim);
+}
+
+/* Takes optional arguments, consult optargs_bitmask. */
+int
+do_fstrim (const char *path,
+           int64_t offset, int64_t length, int64_t minimumfreeextent)
+{
+  const char *argv[MAX_ARGS];
+  size_t i = 0;
+  char offset_s[64], length_s[64], mfe_s[64];
+  CLEANUP_FREE char *err = NULL;
+  int r;
+
+  ADD_ARG (argv, i, str_fstrim);
+
+  if ((optargs_bitmask & GUESTFS_FSTRIM_OFFSET_BITMASK)) {
+    if (offset < 0) {
+      reply_with_error ("offset < 0");
+      return -1;
+    }
+
+    snprintf (offset_s, sizeof offset_s, "%" PRIi64, offset);
+    ADD_ARG (argv, i, "-o");
+    ADD_ARG (argv, i, offset_s);
+  }
+
+  if ((optargs_bitmask & GUESTFS_FSTRIM_LENGTH_BITMASK)) {
+    if (length <= 0) {
+      reply_with_error ("length <= 0");
+      return -1;
+    }
+
+    snprintf (length_s, sizeof length_s, "%" PRIi64, length);
+    ADD_ARG (argv, i, "-l");
+    ADD_ARG (argv, i, length_s);
+  }
+
+  if ((optargs_bitmask & GUESTFS_FSTRIM_MINIMUMFREEEXTENT_BITMASK)) {
+    if (minimumfreeextent <= 0) {
+      reply_with_error ("minimumfreeextent <= 0");
+      return -1;
+    }
+
+    snprintf (mfe_s, sizeof mfe_s, "%" PRIi64, minimumfreeextent);
+    ADD_ARG (argv, i, "-m");
+    ADD_ARG (argv, i, mfe_s);
+  }
+
+  ADD_ARG (argv, i, path);
+  ADD_ARG (argv, i, NULL);
+
+  r = commandv (NULL, &err, argv);
+  if (r == -1) {
+    reply_with_error ("%s", err);
+    return -1;
+  }
+
+  return 0;
+}
--- a/daemon/grep.c
+++ b/daemon/grep.c
@@ -28,13 +28,40 @@
 #include "daemon.h"
 #include "actions.h"

+#define MAX_ARGS 64
+
 static char **
-grep (const char *prog, const char *flag, const char *regex, const char *path)
+grep (const char *regex, const char *path,
+      int extended, int fixed, int insensitive, int compressed)
 {
-  char *out, *err;
+  const char *argv[MAX_ARGS];
+  size_t i = 0;
+  CLEANUP_FREE char *out = NULL, *err = NULL;
  int fd, flags, r;
  char **lines;

+  if (extended && fixed) {
+    reply_with_error ("can't use 'extended' and 'fixed' flags at the same time");
+    return NULL;
+  }
+
+  if (!compressed)
+    ADD_ARG (argv, i, "grep");
+  else
+    ADD_ARG (argv, i, "zgrep");
+
+  if (extended)
+    ADD_ARG (argv, i, "-E");
+
+  if (fixed)
+    ADD_ARG (argv, i, "-F");
+
+  if (insensitive)
+    ADD_ARG (argv, i, "-i");
+
+  ADD_ARG (argv, i, regex);
+  ADD_ARG (argv, i, NULL);
+
  CHROOT_IN;
  fd = open (path, O_RDONLY|O_CLOEXEC);
  CHROOT_OUT;
@@ -48,92 +75,97 @@ grep (const char *prog, const char *flag, const char *regex, const char *path)
   * suppress this error and return an empty list.
   */
  flags = COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN | fd;
-  r = commandrf (&out, &err, flags, prog, flag, regex, NULL);
+  r = commandrvf (&out, &err, flags, argv);
  if (r == -1 || r > 1) {
-    reply_with_error ("%s %s %s: %s", prog, flag, regex, err);
-    free (out);
-    free (err);
+    reply_with_error ("%s: %s", regex, err);
    return NULL;
  }

-  free (err);
-
  lines = split_lines (out);
-  free (out);
  if (lines == NULL) return NULL;

  return lines;
 }

+/* Takes optional arguments, consult optargs_bitmask. */
 char **
-do_grep (const char *regex, const char *path)
+do_grep (const char *regex, const char *path,
+         int extended, int fixed, int insensitive, int compressed)
 {
-  /* The "--" is not really needed, but it helps when we don't need a flag. */
-  return grep ("grep", "--", regex, path);
+  if (!(optargs_bitmask & GUESTFS_GREP_EXTENDED_BITMASK))
+    extended = 0;
+  if (!(optargs_bitmask & GUESTFS_GREP_FIXED_BITMASK))
+    fixed = 0;
+  if (!(optargs_bitmask & GUESTFS_GREP_INSENSITIVE_BITMASK))
+    insensitive = 0;
+  if (!(optargs_bitmask & GUESTFS_GREP_COMPRESSED_BITMASK))
+    compressed = 0;
+
+  return grep (regex, path, extended, fixed, insensitive, compressed);
 }

 char **
 do_egrep (const char *regex, const char *path)
 {
-  return grep ("egrep", "--", regex, path);
+  return grep (regex, path, 1, 0, 0, 0);
 }

 char **
 do_fgrep (const char *regex, const char *path)
 {
-  return grep ("fgrep", "--", regex, path);
+  return grep (regex, path, 0, 1, 0, 0);
 }

 char **
 do_grepi (const char *regex, const char *path)
 {
-  return grep ("grep", "-i", regex, path);
+  return grep (regex, path, 0, 0, 1, 0);
 }

 char **
 do_egrepi (const char *regex, const char *path)
 {
-  return grep ("egrep", "-i", regex, path);
+  return grep (regex, path, 1, 0, 1, 0);
 }

 char **
 do_fgrepi (const char *regex, const char *path)
 {
-  return grep ("fgrep", "-i", regex, path);
+  return grep (regex, path, 0, 1, 1, 0);
 }

 char **
 do_zgrep (const char *regex, const char *path)
 {
-  return grep ("zgrep", "--", regex, path);
+  return grep (regex, path, 0, 0, 0, 1);
 }

 char **
 do_zegrep (const char *regex, const char *path)
 {
-  return grep ("zegrep", "--", regex, path);
+  return grep (regex, path, 1, 0, 0, 1);
 }

 char **
 do_zfgrep (const char *regex, const char *path)
 {
-  return grep ("zfgrep", "--", regex, path);
+  return grep (regex, path, 0, 1, 0, 1);
 }

 char **
 do_zgrepi (const char *regex, const char *path)
 {
-  return grep ("zgrep", "-i", regex, path);
+  return grep (regex, path, 0, 0, 1, 1);
 }

 char **
 do_zegrepi (const char *regex, const char *path)
 {
-  return grep ("zegrep", "-i", regex, path);
+  return grep (regex, path, 1, 0, 1, 1);
 }

 char **
 do_zfgrepi (const char *regex, const char *path)
 {
-  return grep ("zfgrep", "-i", regex, path);
+  return grep (regex, path, 0, 1, 1, 1);
 }
--- a/daemon/grub.c
+++ b/daemon/grub.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -26,33 +26,31 @@
 #include "actions.h"
 #include "optgroups.h"

+GUESTFSD_EXT_CMD(str_grub_install, grub-install);
+
 int
 optgroup_grub_available (void)
 {
-  return prog_exists ("grub-install");
+  return prog_exists (str_grub_install);
 }

 int
 do_grub_install (const char *root, const char *device)
 {
  int r;
-  char *err;
-  char *buf;
+  CLEANUP_FREE char *err = NULL, *buf = NULL;

  if (asprintf_nowarn (&buf, "--root-directory=%R", root) == -1) {
    reply_with_perror ("asprintf");
    return -1;
  }

-  r = command (NULL, &err, "grub-install", buf, device, NULL);
-  free (buf);
+  r = command (NULL, &err, str_grub_install, buf, device, NULL);

  if (r == -1) {
    reply_with_error ("%s", err);
-    free (err);
    return -1;
  }

-  free (err);
  return 0;
 }
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <errno.h>
+#include <assert.h>

 #ifdef HAVE_PRINTF_H
 # include <printf.h>
@@ -52,6 +53,8 @@

 #include "daemon.h"

+GUESTFSD_EXT_CMD(str_udevadm, udevadm);
+
 static char *read_cmdline (void);

 #ifndef MAX
@@ -63,6 +66,10 @@ static char *read_cmdline (void);
 # define O_CLOEXEC 0
 #endif

+/* For improved readability dealing with pipe arrays */
+#define PIPE_READ 0
+#define PIPE_WRITE 1
+
 /* If root device is an ext2 filesystem, this is the major and minor.
 * This is so we can ignore this device from the point of view of the
 * user, eg. in guestfs_list_devices and many other places.
@@ -266,6 +273,17 @@ main (int argc, char *argv[])
    exit (EXIT_FAILURE);
  }

+  /* Wait for udev devices to be created.  If you start libguestfs,
+   * especially with disks that contain complex (eg. mdadm) data
+   * already, then it is possible for the 'mdadm' and LVM commands
+   * that the init script runs to have not completed by the time the
+   * daemon starts executing library commands.  (This is very rare and
+   * hard to test however, but we have seen it in 'brew').  Run
+   * udev_settle, but do it as late as possible to minimize the chance
+   * that we'll have to do any waiting here.
+   */
+  udev_settle ();
+
  /* Send the magic length message which indicates that
   * userspace is up inside the guest.
   */
@@ -340,6 +358,13 @@ read_cmdline (void)
 /* Return true iff device is the root device (and therefore should be
 * ignored from the point of view of user calls).
 */
+static int
+is_root_device_stat (struct stat *statbuf)
+{
+  if (statbuf->st_rdev == root_device) return 1;
+  return 0;
+}
+
 int
 is_root_device (const char *device)
 {
@@ -348,9 +373,8 @@ is_root_device (const char *device)
    perror (device);
    return 0;
  }
-  if (statbuf.st_rdev == root_device)
-    return 1;
-  return 0;
+
+  return is_root_device_stat (&statbuf);
 }

 /* Turn "/path" into "/sysroot/path".
@@ -499,6 +523,9 @@ free_strings (char **argv)
 {
  size_t argc;

+  if (!argv)
+    return;
+
  for (argc = 0; argv[argc] != NULL; ++argc)
    free (argv[argc]);
  free (argv);
@@ -509,11 +536,126 @@ free_stringslen (char **argv, size_t len)
 {
  size_t i;

+  if (!argv)
+    return;
+
  for (i = 0; i < len; ++i)
    free (argv[i]);
  free (argv);
 }

+/* Compare device names (including partition numbers if present).
+ * https://rwmj.wordpress.com/2011/01/09/how-are-linux-drives-named-beyond-drive-26-devsdz/
+ */
+int
+compare_device_names (const char *a, const char *b)
+{
+  size_t a_devlen, b_devlen;
+  int r;
+  int a_partnum, b_partnum;
+
+  /* Skip /dev/ prefix if present. */
+  if (STRPREFIX (a, "/dev/"))
+    a += 5;
+  if (STRPREFIX (b, "/dev/"))
+    b += 5;
+
+  /* Skip sd/hd/vd. */
+  assert (a[1] == 'd');
+  a += 2;
+  assert (b[1] == 'd');
+  b += 2;
+
+  /* Get device name part, that is, just 'a', 'ab' etc. */
+  a_devlen = strcspn (a, "0123456789");
+  b_devlen = strcspn (b, "0123456789");
+
+  /* If device name part is longer, it is always greater, eg.
+   * "/dev/sdz" < "/dev/sdaa".
+   */
+  if (a_devlen != b_devlen)
+    return a_devlen - b_devlen;
+
+  /* Device name parts are the same length, so do a regular compare. */
+  r = strncmp (a, b, a_devlen);
+  if (r != 0)
+    return r;
+
+  /* Compare partitions numbers. */
+  a += a_devlen;
+  b += a_devlen;
+
+  /* If no partition numbers, bail -- the devices are the same.  This
+   * can happen in one peculiar case: where you have a mix of devices
+   * with different interfaces (eg. /dev/sda and /dev/vda).
+   * (RHBZ#858128).
+   */
+  if (!*a && !*b)
+    return 0;
+
+  r = sscanf (a, "%d", &a_partnum);
+  assert (r == 1);
+  r = sscanf (b, "%d", &b_partnum);
+  assert (r == 1);
+
+  return a_partnum - b_partnum;
+}
+
+static int
+compare_device_names_vp (const void *vp1, const void *vp2)
+{
+  char * const *p1 = (char * const *) vp1;
+  char * const *p2 = (char * const *) vp2;
+  return compare_device_names (*p1, *p2);
+}
+
+void
+sort_device_names (char **argv, size_t len)
+{
+  qsort (argv, len, sizeof (char *), compare_device_names_vp);
+}
+
+char *
+concat_strings (char *const *argv)
+{
+  return join_strings ("", argv);
+}
+
+char *
+join_strings (const char *separator, char *const *argv)
+{
+  size_t i, len, seplen, rlen;
+  char *r;
+
+  seplen = strlen (separator);
+
+  len = 0;
+  for (i = 0; argv[i] != NULL; ++i) {
+    if (i > 0)
+      len += seplen;
+    len += strlen (argv[i]);
+  }
+  len++; /* for final \0 */
+
+  r = malloc (len);
+  if (r == NULL)
+    return NULL;
+
+  rlen = 0;
+  for (i = 0; argv[i] != NULL; ++i) {
+    if (i > 0) {
+      memcpy (&r[rlen], separator, seplen);
+      rlen += seplen;
+    }
+    len = strlen (argv[i]);
+    memcpy (&r[rlen], argv[i], len);
+    rlen += len;
+  }
+  r[rlen] = '\0';
+
+  return r;
+}
+
 /* Easy ways to run external commands.  For full documentation, see
 * 'commandrvf' below.
 */
@@ -521,7 +663,8 @@ int
 commandf (char **stdoutput, char **stderror, int flags, const char *name, ...)
 {
  va_list args;
-  const char **argv;
+  /* NB: Mustn't free the strings which are on the stack. */
+  CLEANUP_FREE const char **argv;
  char *s;
  size_t i;
  int r;
@@ -542,7 +685,6 @@ commandf (char **stdoutput, char **stderror, int flags, const char *name, ...)
    const char **p = realloc (argv, sizeof (char *) * (++i));
    if (p == NULL) {
      perror ("realloc");
-      free (argv);
      va_end (args);
      return -1;
    }
@@ -555,9 +697,6 @@ commandf (char **stdoutput, char **stderror, int flags, const char *name, ...)

  r = commandvf (stdoutput, stderror, flags, (const char * const*) argv);

-  /* NB: Mustn't free the strings which are on the stack. */
-  free (argv);
-
  return r;
 }

@@ -569,7 +708,7 @@ int
 commandrf (char **stdoutput, char **stderror, int flags, const char *name, ...)
 {
  va_list args;
-  const char **argv;
+  CLEANUP_FREE const char **argv;
  char *s;
  int i, r;

@@ -589,7 +728,6 @@ commandrf (char **stdoutput, char **stderror, int flags, const char *name, ...)
    const char **p = realloc (argv, sizeof (char *) * (++i));
    if (p == NULL) {
      perror ("realloc");
-      free (argv);
      va_end (args);
      return -1;
    }
@@ -602,9 +740,6 @@ commandrf (char **stdoutput, char **stderror, int flags, const char *name, ...)

  r = commandrvf (stdoutput, stderror, flags, argv);

-  /* NB: Mustn't free the strings which are on the stack. */
-  free (argv);
-
  return r;
 }

@@ -659,8 +794,8 @@ commandrvf (char **stdoutput, char **stderror, int flags,
  size_t so_size = 0, se_size = 0;
  int so_fd[2], se_fd[2];
  int flag_copy_stdin = flags & COMMAND_FLAG_CHROOT_COPY_FILE_TO_STDIN;
-  int stdin_fd[2] = { -1, -1 };
-  pid_t pid, stdin_pid = -1;
+  int flag_copy_fd = flags & COMMAND_FLAG_FD_MASK;
+  pid_t pid;
  int r, quit, i;
  fd_set rset, rset2;
  char buf[256];
@@ -690,13 +825,6 @@ commandrvf (char **stdoutput, char **stderror, int flags,
    abort ();
  }

-  if (flag_copy_stdin) {
-    if (pipe (stdin_fd) == -1) {
-      error (0, errno, "pipe");
-      abort ();
-    }
-  }
-
  pid = fork ();
  if (pid == -1) {
    error (0, errno, "fork");
@@ -708,95 +836,42 @@ commandrvf (char **stdoutput, char **stderror, int flags,
    signal (SIGPIPE, SIG_DFL);
    close (0);
    if (flag_copy_stdin) {
-      dup2 (stdin_fd[0], 0);
-      close (stdin_fd[0]);
-      close (stdin_fd[1]);
+      dup2 (flag_copy_fd, STDIN_FILENO);
    } else {
      /* Set stdin to /dev/null (ignore failure) */
      ignore_value (open ("/dev/null", O_RDONLY|O_CLOEXEC));
    }
-    close (so_fd[0]);
-    close (se_fd[0]);
+    close (so_fd[PIPE_READ]);
+    close (se_fd[PIPE_READ]);
    if (!(flags & COMMAND_FLAG_FOLD_STDOUT_ON_STDERR))
-      dup2 (so_fd[1], 1);
+      dup2 (so_fd[PIPE_WRITE], STDOUT_FILENO);
    else
-      dup2 (se_fd[1], 1);
-    dup2 (se_fd[1], 2);
-    close (so_fd[1]);
-    close (se_fd[1]);
+      dup2 (se_fd[PIPE_WRITE], STDOUT_FILENO);
+    dup2 (se_fd[PIPE_WRITE], STDERR_FILENO);
+    close (so_fd[PIPE_WRITE]);
+    close (se_fd[PIPE_WRITE]);
+
+    ignore_value (chdir ("/"));

    execvp (argv[0], (void *) argv);
    perror (argv[0]);
    _exit (EXIT_FAILURE);
  }

-  if (flag_copy_stdin) {
-    int fd = flags & COMMAND_FLAG_FD_MASK;
-
-    stdin_pid = fork ();
-    if (stdin_pid == -1) {
-      error (0, errno, "fork");
-      abort ();
-    }
-
-    if (stdin_pid == 0) {       /* Child process copying stdin. */
-      close (so_fd[0]);
-      close (so_fd[1]);
-      close (se_fd[0]);
-      close (se_fd[1]);
-
-      close (1);
-      dup2 (stdin_fd[1], 1);
-      close (stdin_fd[0]);
-      close (stdin_fd[1]);
-
-      if (chroot (sysroot) == -1) {
-        perror ("chroot");
-        _exit (EXIT_FAILURE);
-      }
-
-      ssize_t n;
-      char buffer[BUFSIZ];
-      while ((n = read (fd, buffer, sizeof buffer)) > 0) {
-        if (xwrite (1, buffer, n) == -1)
-          /* EPIPE error indicates the command process has exited
-           * early.  If the command process fails that will be caught
-           * by the daemon, and if not, then it's not an error.
-           */
-          _exit (errno == EPIPE ? EXIT_SUCCESS : EXIT_FAILURE);
-      }
-
-      if (n == -1) {
-        perror ("read");
-        _exit (EXIT_FAILURE);
-      }
-
-      if (close (fd) == -1) {
-        perror ("close");
-        _exit (EXIT_FAILURE);
-      }
-
-      _exit (EXIT_SUCCESS);
-    }
-
-    close (fd);
-    close (stdin_fd[0]);
-    close (stdin_fd[1]);
-  }
-
  /* Parent process. */
-  close (so_fd[1]);
-  close (se_fd[1]);
+  close (so_fd[PIPE_WRITE]);
+  close (se_fd[PIPE_WRITE]);

  FD_ZERO (&rset);
-  FD_SET (so_fd[0], &rset);
-  FD_SET (se_fd[0], &rset);
+  FD_SET (so_fd[PIPE_READ], &rset);
+  FD_SET (se_fd[PIPE_READ], &rset);

  quit = 0;
  while (quit < 2) {
  again:
    rset2 = rset;
-    r = select (MAX (so_fd[0], se_fd[0]) + 1, &rset2, NULL, NULL, NULL);
+    r = select (MAX (so_fd[PIPE_READ], se_fd[PIPE_READ]) + 1, &rset2,
+                NULL, NULL, NULL);
    if (r == -1) {
      if (errno == EINTR)
        goto again;
@@ -817,20 +892,20 @@ commandrvf (char **stdoutput, char **stderror, int flags,
        *stderror = strdup ("error running external command, "
                            "see debug output for details");
      }
-      close (so_fd[0]);
-      close (se_fd[0]);
+      close (so_fd[PIPE_READ]);
+      close (se_fd[PIPE_READ]);
+      if (flag_copy_stdin) close (flag_copy_fd);
      waitpid (pid, NULL, 0);
-      if (stdin_pid >= 0) waitpid (stdin_pid, NULL, 0);
      return -1;
    }

-    if (FD_ISSET (so_fd[0], &rset2)) { /* something on stdout */
-      r = read (so_fd[0], buf, sizeof buf);
+    if (FD_ISSET (so_fd[PIPE_READ], &rset2)) { /* something on stdout */
+      r = read (so_fd[PIPE_READ], buf, sizeof buf);
      if (r == -1) {
        perror ("read");
        goto quit;
      }
-      if (r == 0) { FD_CLR (so_fd[0], &rset); quit++; }
+      if (r == 0) { FD_CLR (so_fd[PIPE_READ], &rset); quit++; }

      if (r > 0 && stdoutput) {
        so_size += r;
@@ -844,17 +919,17 @@ commandrvf (char **stdoutput, char **stderror, int flags,
      }
    }

-    if (FD_ISSET (se_fd[0], &rset2)) { /* something on stderr */
-      r = read (se_fd[0], buf, sizeof buf);
+    if (FD_ISSET (se_fd[PIPE_READ], &rset2)) { /* something on stderr */
+      r = read (se_fd[PIPE_READ], buf, sizeof buf);
      if (r == -1) {
        perror ("read");
        goto quit;
      }
-      if (r == 0) { FD_CLR (se_fd[0], &rset); quit++; }
+      if (r == 0) { FD_CLR (se_fd[PIPE_READ], &rset); quit++; }

      if (r > 0) {
        if (verbose)
-          ignore_value (write (2, buf, r));
+          ignore_value (write (STDERR_FILENO, buf, r));

        if (stderror) {
          se_size += r;
@@ -870,8 +945,8 @@ commandrvf (char **stdoutput, char **stderror, int flags,
    }
  }

-  close (so_fd[0]);
-  close (se_fd[0]);
+  close (so_fd[PIPE_READ]);
+  close (se_fd[PIPE_READ]);

  /* Make sure the output buffers are \0-terminated.  Also remove any
   * trailing \n characters from the error buffer (not from stdout).
@@ -902,21 +977,9 @@ commandrvf (char **stdoutput, char **stderror, int flags,
    }
  }

-  if (flag_copy_stdin) {
-    /* Check copy process didn't fail. */
-    if (waitpid (stdin_pid, &r, 0) != stdin_pid) {
-      perror ("waitpid");
-      kill (pid, 9);
-      waitpid (pid, NULL, 0);
-      return -1;
-    }
-
-    if (!WIFEXITED (r) || WEXITSTATUS (r) != 0) {
-      fprintf (stderr, "failed copying from input file, see earlier messages (r = %d)\n", r);
-      kill (pid, 9);
-      waitpid (pid, NULL, 0);
-      return -1;
-    }
+  if (flag_copy_stdin && close (flag_copy_fd) == -1) {
+    perror ("close");
+    return -1;
  }

  /* Get the exit status of the command. */
@@ -1107,6 +1170,88 @@ device_name_translation (char *device)
  return -1;
 }

+/* Parse the mountable descriptor for a btrfs subvolume.  Don't call this
+ * directly - use the RESOLVE_MOUNTABLE macro.
+ *
+ * A btrfs subvolume is given as:
+ *
+ * btrfsvol:/dev/sda3/root
+ *
+ * where /dev/sda3 is a block device containing a btrfs filesystem, and root is
+ * the name of a subvolume on it. This function is passed the string following
+ * 'btrfsvol:'.
+ */
+int
+parse_btrfsvol (char *desc, mountable_t *mountable)
+{
+  char *device, *volume = NULL, *slash;
+  struct stat statbuf;
+
+  mountable->type = MOUNTABLE_BTRFSVOL;
+
+  device = desc;
+
+  if (! STRPREFIX (device, "/dev/"))
+    return -1;
+
+  slash = device + strlen ("/dev/") - 1;
+  while ((slash = strchr (slash + 1, '/'))) {
+    *slash = '\0';
+
+    if (device_name_translation (device) == -1) {
+      perror (device);
+      continue;
+    }
+
+    if (stat (device, &statbuf) == -1) {
+      perror (device);
+      return -1;
+    }
+
+    if (!S_ISDIR (statbuf.st_mode) &&
+        !is_root_device_stat (&statbuf))
+    {
+      volume = slash + 1;
+      break;
+    }
+
+    *slash = '/';
+  }
+
+  if (!volume) return -1;
+
+  mountable->device = device;
+  mountable->volume = volume;
+
+  return 0;
+}
+
+/* Convert a mountable_t back to its string representation
+ *
+ * This function can be used in an error path, and must not call
+ * reply_with_error().
+ */
+char *
+mountable_to_string (const mountable_t *mountable)
+{
+  char *desc;
+
+  switch (mountable->type) {
+    case MOUNTABLE_DEVICE:
+    case MOUNTABLE_PATH:
+      return strdup (mountable->device);
+
+    case MOUNTABLE_BTRFSVOL:
+      if (asprintf(&desc, "btrfsvol:%s/%s",
+                   mountable->device, mountable->volume) == -1)
+        return NULL;
+      return desc;
+
+    default:
+      return NULL;
+  }
+}
+
 /* Check program exists and is executable on $PATH.  Actually, we
 * just assume PATH contains the default entries (see main() above).
 */
@@ -1126,6 +1271,52 @@ prog_exists (const char *prog)
  return 0;
 }

+/* Pass a template such as "/sysroot/XXXXXXXX.XXX".  This updates the
+ * template to contain a randomly named file.  Any 'X' characters
+ * after the final '/' are replaced with random characters.
+ *
+ * Notes: You should probably use an 8.3 path, so it's compatible with
+ * all filesystems including basic FAT.  Also this only substitutes
+ * lowercase ASCII letters and numbers, again for compatibility with
+ * lowest common denominator filesystems.
+ *
+ * This doesn't create a file or check whether or not the file exists
+ * (it would be extremely unlikely to exist as long as the RNG is
+ * working).
+ *
+ * If there is an error, -1 is returned.
+ */
+int
+random_name (char *template)
+{
+  int fd;
+  unsigned char c;
+  char *p;
+
+  fd = open ("/dev/urandom", O_RDONLY|O_CLOEXEC);
+  if (fd == -1)
+    return -1;
+
+  p = strrchr (template, '/');
+  if (p == NULL)
+    abort ();                   /* internal error - bad template */
+
+  while (*p) {
+    if (*p == 'X') {
+      if (read (fd, &c, 1) != 1) {
+        close (fd);
+        return -1;
+      }
+      *p = "0123456789abcdefghijklmnopqrstuvwxyz"[c % 36];
+    }
+
+    p++;
+  }
+
+  close (fd);
+  return 0;
+}
+
 /* LVM and other commands aren't synchronous, especially when udev is
 * involved.  eg. You can create or remove some device, but the /dev
 * device node won't appear until some time later.  This means that
@@ -1133,16 +1324,33 @@ prog_exists (const char *prog)
 *
 * Use 'udevadm settle' after certain commands, but don't be too
 * fussed if it fails.
- *
- * 'udevsettle' was the old name for this command (RHEL 5).  This was
- * deprecated in favour of 'udevadm settle'.  The old 'udevsettle'
- * command was left as a symlink.  Then in Fedora 13 the old symlink
- * remained but it stopped working (RHBZ#548121), so we have to be
- * careful not to assume that we can use 'udevsettle' if it exists.
 */
 void
 udev_settle (void)
 {
-  (void) command (NULL, NULL, "udevadm", "settle", NULL);
-  (void) command (NULL, NULL, "udevsettle", NULL);
+  (void) command (NULL, NULL, str_udevadm, "settle", NULL);
+}
+
+/* Use by the CLEANUP_* macros.  Do not call these directly. */
+void
+cleanup_free (void *ptr)
+{
+  free (* (void **) ptr);
+}
+
+void
+cleanup_free_string_list (void *ptr)
+{
+  free_strings (* (char ***) ptr);
+}
+
+void
+cleanup_unlink_free (void *ptr)
+{
+  char *filename = * (char **) ptr;
+
+  if (filename) {
+    unlink (filename);
+    free (filename);
+  }
 }
--- a/daemon/guestfsd.pod
+++ b/daemon/guestfsd.pod
@@ -0,0 +1,103 @@
+=encoding utf8
+
+=head1 NAME
+
+guestfsd - guestfs daemon
+
+=head1 SYNOPSIS
+
+ guestfsd [-r] [-v|--verbose]
+
+=head1 DESCRIPTION
+
+C<guestfsd> is the libguestfs daemon.  Normal users never need to run
+this program explicitly.  This man page discusses what C<guestfsd>
+does in both the libguestfs appliance and when using libguestfs live.
+
+=head2 LIBGUESTFS APPLIANCE
+
+For the architecture of the libguestfs appliance, see
+L<guestfs(3)/ARCHITECTURE>.
+
+After the appliance boots, the C</init> script in the appliance starts
+C<guestfsd> with no arguments.  C<guestfsd> opens the virtio-serial
+port on a known path (see L</FILES>).  It initiates the protocol (see
+L<guestfs(3)/COMMUNICATION PROTOCOL>) and processes requests one at a
+time from the library until the appliance is destroyed.
+
+Filesystems are mounted under C</sysroot> and all filesystem
+operations happen relative to this directory.
+
+=head2 LIBGUESTFS LIVE
+
+In the libguestfs live case, C<guestfsd -r> is started from the
+rc-scripts, systemd, etc.
+
+The C<-r> option causes the daemon to operate on the root filesystem
+instead of C</sysroot>.
+
+Currently (because of limitations in virtio-serial) only one client
+can connect at a time, and C<guestfsd> must be restarted after each
+client disconnects.  If libguestfs live were changed to use a
+different transport such as TCP/IP then this limitation could be
+removed.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-?>
+
+=item B<--help>
+
+Display brief help.
+
+=item B<-r>
+
+Set the root filesystem to be C</> (instead of the default which is
+C</sysroot>).  Also do not unmount filesystems when the daemon exits.
+
+This option is used to enable libguestfs live.
+
+=item B<-v>
+
+=item B<--verbose>
+
+Enable verbose messages for debugging.
+
+The verbose flag is also set if the Linux command line contains the
+substring C<guestfs_verbose=1>.
+
+=back
+
+=head1 EXIT STATUS
+
+This program returns 0 if successful, or non-zero if there was an
+error.
+
+=head1 FILES
+
+=over 4
+
+=item C</dev/virtio-ports/org.libguestfs.channel.0>
+
+The virtio serial port which C<guestfsd> connects to.
+
+=item C</proc/cmdline>
+
+The Linux command line is parsed to discover C<guestfs_*> flags.
+
+=back
+
+=head1 SEE ALSO
+
+L<guestfs(3)>,
+L<http://libguestfs.org/>.
+
+=head1 AUTHOR
+
+Richard W.M. Jones L<http://people.redhat.com/~rjones/>
+
+=head1 COPYRIGHT
+
+Copyright (C) 2009-2013 Red Hat Inc.
--- a/daemon/headtail.c
+++ b/daemon/headtail.c
@@ -31,7 +31,7 @@
 static char **
 headtail (const char *prog, const char *flag, const char *n, const char *path)
 {
-  char *out, *err;
+  CLEANUP_FREE char *out = NULL, *err = NULL;
  int fd, flags, r;
  char **lines;

@@ -48,13 +48,9 @@ headtail (const char *prog, const char *flag, const char *n, const char *path)
  r = commandf (&out, &err, flags, prog, flag, n, NULL);
  if (r == -1) {
    reply_with_error ("%s %s %s: %s", prog, flag, n, err);
-    free (out);
-    free (err);
    return NULL;
  }

-  free (err);
-
 #if 0
  /* Split it at the first whitespace. */
  len = strcspn (out, " \t\n");
@@ -62,7 +58,6 @@ headtail (const char *prog, const char *flag, const char *n, const char *path)
 #endif

  lines = split_lines (out);
-  free (out);
  if (lines == NULL) return NULL;

  return lines;
--- a/daemon/hexdump.c
+++ b/daemon/hexdump.c
@@ -31,7 +31,8 @@ char *
 do_hexdump (const char *path)
 {
  int fd, flags, r;
-  char *out, *err;
+  char *out;
+  CLEANUP_FREE char *err = NULL;

  CHROOT_IN;
  fd = open (path, O_RDONLY|O_CLOEXEC);
@@ -46,12 +47,9 @@ do_hexdump (const char *path)
  r = commandf (&out, &err, flags, "hexdump", "-C", NULL);
  if (r == -1) {
    reply_with_error ("%s: %s", path, err);
-    free (err);
    free (out);
    return NULL;
  }

-  free (err);
-
  return out;			/* caller frees */
 }
--- a/daemon/hivex.c
+++ b/daemon/hivex.c
@@ -0,0 +1,414 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2012 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+#include "guestfs_protocol.h"
+#include "daemon.h"
+#include "actions.h"
+#include "optgroups.h"
+
+#ifdef HAVE_HIVEX
+
+#include <hivex.h>
+
+int
+optgroup_hivex_available (void)
+{
+  return 1;
+}
+
+/* The hivex handle.  As with Augeas, there is one per guestfs handle /
+ * daemon.
+ */
+static hive_h *h = NULL;
+
+/* Clean up the hivex handle on daemon exit. */
+static void hivex_finalize (void) __attribute__((destructor));
+static void
+hivex_finalize (void)
+{
+  if (h) {
+    hivex_close (h);
+    h = NULL;
+  }
+}
+
+#define NEED_HANDLE(errcode)						\
+  do {									\
+    if (!h) {								\
+      reply_with_error ("%s: you must call 'hivex-open' first to initialize the hivex handle", __func__); \
+      return (errcode);							\
+    }									\
+  }									\
+  while (0)
+
+/* Takes optional arguments, consult optargs_bitmask. */
+int
+do_hivex_open (const char *filename, int verbose, int debug, int write)
+{
+  CLEANUP_FREE char *buf = NULL;
+  int flags = 0;
+
+  if (h) {
+    hivex_close (h);
+    h = NULL;
+  }
+
+  buf = sysroot_path (filename);
+  if (!buf) {
+    reply_with_perror ("malloc");
+    return -1;
+  }
+
+  if (optargs_bitmask & GUESTFS_HIVEX_OPEN_VERBOSE_BITMASK) {
+    if (verbose)
+      flags |= HIVEX_OPEN_VERBOSE;
+  }
+  if (optargs_bitmask & GUESTFS_HIVEX_OPEN_DEBUG_BITMASK) {
+    if (debug)
+      flags |= HIVEX_OPEN_DEBUG;
+  }
+  if (optargs_bitmask & GUESTFS_HIVEX_OPEN_WRITE_BITMASK) {
+    if (write)
+      flags |= HIVEX_OPEN_WRITE;
+  }
+
+  h = hivex_open (buf, flags);
+  if (!h) {
+    reply_with_perror ("hivex failed to open %s", filename);
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+do_hivex_close (void)
+{
+  NEED_HANDLE (-1);
+
+  hivex_close (h);
+  h = NULL;
+
+  return 0;
+}
+
+int64_t
+do_hivex_root (void)
+{
+  int64_t r;
+
+  NEED_HANDLE (-1);
+
+  r = hivex_root (h);
+  if (r == 0) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return r;
+}
+
+char *
+do_hivex_node_name (int64_t nodeh)
+{
+  char *r;
+
+  NEED_HANDLE (NULL);
+
+  r = hivex_node_name (h, nodeh);
+  if (r == NULL) {
+    reply_with_perror ("failed");
+    return NULL;
+  }
+
+  return r;
+}
+
+guestfs_int_hivex_node_list *
+do_hivex_node_children (int64_t nodeh)
+{
+  guestfs_int_hivex_node_list *ret;
+  CLEANUP_FREE hive_node_h *r = NULL;
+  size_t i, len;
+
+  NEED_HANDLE (NULL);
+
+  r = hivex_node_children (h, nodeh);
+  if (r == NULL) {
+    reply_with_perror ("failed");
+    return NULL;
+  }
+
+  len = 0;
+  for (i = 0; r[i] != 0; ++i)
+    len++;
+
+  ret = malloc (sizeof *ret);
+  if (!ret) {
+    reply_with_perror ("malloc");
+    return NULL;
+  }
+
+  ret->guestfs_int_hivex_node_list_len = len;
+  ret->guestfs_int_hivex_node_list_val =
+    malloc (len * sizeof (guestfs_int_hivex_node));
+  if (ret->guestfs_int_hivex_node_list_val == NULL) {
+    reply_with_perror ("malloc");
+    free (ret);
+    return NULL;
+  }
+
+  for (i = 0; i < len; ++i)
+    ret->guestfs_int_hivex_node_list_val[i].hivex_node_h = r[i];
+
+  return ret;
+}
+
+int64_t
+do_hivex_node_get_child (int64_t nodeh, const char *name)
+{
+  int64_t r;
+
+  NEED_HANDLE (-1);
+
+  errno = 0;
+  r = hivex_node_get_child (h, nodeh, name);
+  if (r == 0 && errno != 0) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return r;
+}
+
+int64_t
+do_hivex_node_parent (int64_t nodeh)
+{
+  int64_t r;
+
+  NEED_HANDLE (-1);
+
+  r = hivex_node_parent (h, nodeh);
+  if (r == 0) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return r;
+}
+
+guestfs_int_hivex_value_list *
+do_hivex_node_values (int64_t nodeh)
+{
+  guestfs_int_hivex_value_list *ret;
+  CLEANUP_FREE hive_value_h *r = NULL;
+  size_t i, len;
+
+  NEED_HANDLE (NULL);
+
+  r = hivex_node_values (h, nodeh);
+  if (r == NULL) {
+    reply_with_perror ("failed");
+    return NULL;
+  }
+
+  len = 0;
+  for (i = 0; r[i] != 0; ++i)
+    len++;
+
+  ret = malloc (sizeof *ret);
+  if (!ret) {
+    reply_with_perror ("malloc");
+    return NULL;
+  }
+
+  ret->guestfs_int_hivex_value_list_len = len;
+  ret->guestfs_int_hivex_value_list_val =
+    malloc (len * sizeof (guestfs_int_hivex_value));
+  if (ret->guestfs_int_hivex_value_list_val == NULL) {
+    reply_with_perror ("malloc");
+    free (ret);
+    return NULL;
+  }
+
+  for (i = 0; i < len; ++i)
+    ret->guestfs_int_hivex_value_list_val[i].hivex_value_h = (int64_t) r[i];
+
+  return ret;
+}
+
+int64_t
+do_hivex_node_get_value (int64_t nodeh, const char *key)
+{
+  int64_t r;
+
+  NEED_HANDLE (-1);
+
+  errno = 0;
+  r = hivex_node_get_value (h, nodeh, key);
+  if (r == 0 && errno != 0) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return r;
+}
+
+char *
+do_hivex_value_key (int64_t valueh)
+{
+  char *r;
+
+  NEED_HANDLE (NULL);
+
+  r = hivex_value_key (h, valueh);
+  if (r == NULL) {
+    reply_with_perror ("failed");
+    return NULL;
+  }
+
+  return r;
+}
+
+int64_t
+do_hivex_value_type (int64_t valueh)
+{
+  hive_type r;
+
+  NEED_HANDLE (-1);
+
+  if (hivex_value_type (h, valueh, &r, NULL) == -1) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return r;
+}
+
+char *
+do_hivex_value_value (int64_t valueh, size_t *size_r)
+{
+  char *r;
+  size_t size;
+
+  NEED_HANDLE (NULL);
+
+  r = hivex_value_value (h, valueh, NULL, &size);
+  if (r == NULL) {
+    reply_with_perror ("failed");
+    return NULL;
+  }
+
+  *size_r = size;
+  return r;
+}
+
+int
+do_hivex_commit (const char *filename)
+{
+  CLEANUP_FREE char *buf = NULL;
+
+  NEED_HANDLE (-1);
+
+  /* The 'filename' parameter is an optional string, and in most
+   * cases will be NULL.
+   */
+  if (filename) {
+    buf = sysroot_path (filename);
+    if (!buf) {
+      reply_with_perror ("malloc");
+      return -1;
+    }
+
+    if (hivex_commit (h, buf, 0) == -1) {
+      reply_with_perror ("%s: commit failed", filename);
+      return -1;
+    }
+  }
+  else {
+    if (hivex_commit (h, NULL, 0) == -1) {
+      reply_with_perror ("commit failed");
+      return -1;
+    }
+  }
+
+  return 0;
+}
+
+int64_t
+do_hivex_node_add_child (int64_t parent, const char *name)
+{
+  int64_t r;
+
+  NEED_HANDLE (-1);
+
+  r = hivex_node_add_child (h, parent, name);
+  if (r == 0) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return r;
+}
+
+int
+do_hivex_node_delete_child (int64_t nodeh)
+{
+  NEED_HANDLE (-1);
+
+  if (hivex_node_delete_child (h, nodeh) == -1) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return 0;
+}
+
+int
+do_hivex_node_set_value (int64_t nodeh,
+                         const char *key, int64_t t,
+                         const char *val, size_t val_size)
+{
+  const hive_set_value v =
+    { .key = (char *) key, .t = t, .len = val_size, .value = (char *) val };
+
+  NEED_HANDLE (-1);
+
+  if (hivex_node_set_value (h, nodeh, &v, 0) == -1) {
+    reply_with_perror ("failed");
+    return -1;
+  }
+
+  return 0;
+}
+
+#else /* !HAVE_HIVEX */
+
+OPTGROUP_HIVEX_NOT_AVAILABLE
+
+#endif /* !HAVE_HIVEX */
--- a/daemon/hotplug.c
+++ b/daemon/hotplug.c
@@ -0,0 +1,153 @@
+/* libguestfs - the guestfsd daemon
+ * Copyright (C) 2012 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <time.h>
+
+#include "guestfs_protocol.h"
+#include "daemon.h"
+#include "actions.h"
+
+#define HOT_ADD_TIMEOUT 30 /* seconds */
+#define HOT_REMOVE_TIMEOUT HOT_ADD_TIMEOUT
+
+static void
+hotplug_error (const char *op, const char *path, const char *verb,
+               int timeout)
+{
+  reply_with_error ("%s drive: '%s' did not %s after %d seconds: "
+                    "this could mean that virtio-scsi (in qemu or kernel) "
+                    "or udev is not working",
+                    op, path, verb, timeout);
+}
+
+/* Wait for /dev/disk/guestfs/<label> to appear.  Timeout (and error)
+ * if it doesn't appear after a reasonable length of time.
+ */
+int
+do_internal_hot_add_drive (const char *label)
+{
+  time_t start_t, now_t;
+  size_t len = strlen (label);
+  char path[len+64];
+  int r;
+
+  snprintf (path, len+64, "/dev/disk/guestfs/%s", label);
+
+  time (&start_t);
+
+  while (time (&now_t) - start_t <= HOT_ADD_TIMEOUT) {
+    udev_settle ();
+
+    r = access (path, F_OK);
+    if (r == -1 && errno != ENOENT) {
+      reply_with_perror ("%s", path);
+      return -1;
+    }
+    if (r == 0)
+      return 0;
+
+    sleep (1);
+  }
+
+  hotplug_error ("hot-add", path, "appear", HOT_ADD_TIMEOUT);
+  return -1;
+}
+
+GUESTFSD_EXT_CMD(str_fuser, fuser);
+
+/* This function is called before a drive is hot-unplugged. */
+int
+do_internal_hot_remove_drive_precheck (const char *label)
+{
+  size_t len = strlen (label);
+  char path[len+64];
+  int r;
+  CLEANUP_FREE char *out = NULL, *err = NULL;
+
+  /* Ensure there are no requests in flight (thanks Paolo Bonzini). */
+  udev_settle ();
+  sync_disks ();
+
+  snprintf (path, len+64, "/dev/disk/guestfs/%s", label);
+
+  r = commandr (&out, &err, str_fuser, "-v", "-m", path, NULL);
+  if (r == -1) {
+    reply_with_error ("fuser: %s: %s", path, err);
+    return -1;
+  }
+
+  /* "fuser returns a non-zero return code if none of the specified
+   * files is accessed or in case of a fatal error. If at least one
+   * access has been found, fuser returns zero."
+   */
+  if (r == 0) {
+    reply_with_error ("disk with label '%s' is in use "
+                      "(eg. mounted or belongs to a volume group)", label);
+
+    /* Useful for debugging when a drive cannot be unplugged. */
+    if (verbose)
+      fprintf (stderr, "%s\n", out);
+
+    return -1;
+  }
+
+  return 0;
+}
+
+/* This function is called after a drive is hot-unplugged.  It checks
+ * that it has really gone and udev has finished processing the
+ * events, in case the user immediately hotplugs a drive with an
+ * identical label.
+ */
+int
+do_internal_hot_remove_drive (const char *label)
+{
+  time_t start_t, now_t;
+  size_t len = strlen (label);
+  char path[len+64];
+  int r;
+
+  snprintf (path, len+64, "/dev/disk/guestfs/%s", label);
+
+  time (&start_t);
+
+  while (time (&now_t) - start_t <= HOT_REMOVE_TIMEOUT) {
+    udev_settle ();
+
+    r = access (path, F_OK);
+    if (r == -1) {
+      if (errno != ENOENT) {
+        reply_with_perror ("%s", path);
+        return -1;
+      }
+      /* else udev has removed the file, so we can return */
+      return 0;
+    }
+
+    sleep (1);
+  }
+
+  hotplug_error ("hot-remove", path, "disappear", HOT_REMOVE_TIMEOUT);
+  return -1;
+}
--- a/daemon/initrd.c
+++ b/daemon/initrd.c
@@ -30,17 +30,21 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_zcat, zcat);
+GUESTFSD_EXT_CMD(str_cpio, cpio);
+
 char **
 do_initrd_list (const char *path)
 {
  FILE *fp;
-  char *cmd;
-  char filename[PATH_MAX];
+  CLEANUP_FREE char *cmd = NULL;
  DECLARE_STRINGSBUF (filenames);
-  size_t len;
+  CLEANUP_FREE char *filename = NULL;
+  size_t allocsize;
+  ssize_t len;

  /* "zcat /sysroot/<path> | cpio --quiet -it", but path must be quoted. */
-  if (asprintf_nowarn (&cmd, "zcat %R | cpio --quiet -it", path) == -1) {
+  if (asprintf_nowarn (&cmd, "%s %R | %s --quiet -it", str_zcat, path, str_cpio) == -1) {
    reply_with_perror ("asprintf");
    return NULL;
  }
@@ -51,16 +55,13 @@ do_initrd_list (const char *path)
  fp = popen (cmd, "r");
  if (fp == NULL) {
    reply_with_perror ("popen: %s", cmd);
-    free (cmd);
    return NULL;
  }
-  free (cmd);

-  while (fgets (filename, sizeof filename, fp) != NULL) {
-    len = strlen (filename);
+  allocsize = 0;
+  while ((len = getline (&filename, &allocsize, fp)) != -1) {
    if (len > 0 && filename[len-1] == '\n')
      filename[len-1] = '\0';
-
    if (add_string (&filenames, filename) == -1) {
      pclose (fp);
      return NULL;
@@ -85,33 +86,36 @@ char *
 do_initrd_cat (const char *path, const char *filename, size_t *size_r)
 {
  char tmpdir[] = "/tmp/initrd-cat-XXXXXX";
+  CLEANUP_FREE char *cmd;
+  struct stat statbuf;
+  int fd, r;
+  char *ret = NULL;
+  CLEANUP_FREE char *fullpath = NULL;
+
  if (mkdtemp (tmpdir) == NULL) {
    reply_with_perror ("mkdtemp");
    return NULL;
  }

-  /* "zcat /sysroot/<path> | cpio --quiet -id file", but paths must be quoted */
-  char *cmd;
-  if (asprintf_nowarn (&cmd, "cd %Q && zcat %R | cpio --quiet -id %Q",
-                       tmpdir, path, filename) == -1) {
-    reply_with_perror ("asprintf");
-    rmdir (tmpdir);
-    return NULL;
-  }
-
  /* Extract file into temporary directory.  This may create subdirs.
   * It's also possible that this doesn't create anything at all
   * (eg. if the named file does not exist in the cpio archive) --
   * cpio is silent in this case.
   */
-  int r = system (cmd);
-  if (r == -1) {
-    reply_with_perror ("command failed: %s", cmd);
-    free (cmd);
+  /* "zcat /sysroot/<path> | cpio --quiet -id file", but paths must be quoted */
+  if (asprintf_nowarn (&cmd, "cd %Q && zcat %R | cpio --quiet -id %Q",
+                       tmpdir, path, filename) == -1) {
+    reply_with_perror ("asprintf");
+    rmdir (tmpdir);
+    return NULL;
+  }
+
+  r = system (cmd);
+  if (r == -1) {
+    reply_with_perror ("command failed: %s", cmd);
    rmdir (tmpdir);
    return NULL;
  }
-  free (cmd);
  if (WEXITSTATUS (r) != 0) {
    reply_with_perror ("command failed with return code %d",
                       WEXITSTATUS (r));
@@ -119,13 +123,14 @@ do_initrd_cat (const char *path, const char *filename, size_t *size_r)
    return NULL;
  }

+  /* Construct the expected name of the extracted file. */
+  if (asprintf (&fullpath, "%s/%s", tmpdir, filename) == -1) {
+    reply_with_perror ("asprintf");
+    rmdir (tmpdir);
+    return NULL;
+  }
+
  /* See if we got a file. */
-  char fullpath[PATH_MAX];
-  snprintf (fullpath, sizeof fullpath, "%s/%s", tmpdir, filename);
-
-  struct stat statbuf;
-  int fd;
-
  fd = open (fullpath, O_RDONLY|O_CLOEXEC);
  if (fd == -1) {
    reply_with_perror ("open: %s:%s", path, filename);
@@ -136,8 +141,6 @@ do_initrd_cat (const char *path, const char *filename, size_t *size_r)
  /* From this point, we know the file exists, so we require full
   * cleanup.
   */
-  char *ret = NULL;
-
  if (fstat (fd, &statbuf) == -1) {
    reply_with_perror ("fstat: %s:%s", path, filename);
    goto cleanup;
@@ -186,8 +189,7 @@ do_initrd_cat (const char *path, const char *filename, size_t *size_r)

  /* Remove the file. */
  if (unlink (fullpath) == -1) {
-    fprintf (stderr, "unlink: ");
-    perror (fullpath);
+    fprintf (stderr, "unlink: %s: %m\n", fullpath);
    /* non-fatal */
  }

@@ -197,8 +199,7 @@ do_initrd_cat (const char *path, const char *filename, size_t *size_r)
    if (!p) break;
    *p = '\0';
    if (rmdir (fullpath) == -1) {
-      fprintf (stderr, "rmdir: ");
-      perror (fullpath);
+      fprintf (stderr, "rmdir: %s: %m\n", fullpath);
      /* non-fatal */
    }
  } while (STRNEQ (fullpath, tmpdir));
--- a/daemon/inotify.c
+++ b/daemon/inotify.c
@@ -1,5 +1,5 @@
 /* libguestfs - the guestfsd daemon
- * Copyright (C) 2009-2012 Red Hat Inc.
+ * Copyright (C) 2009-2013 Red Hat Inc.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -35,12 +35,17 @@
 #include "optgroups.h"

 #ifdef HAVE_SYS_INOTIFY_H
+GUESTFSD_EXT_CMD(str_sort, sort);
+
 /* Currently open inotify handle, or -1 if not opened. */
 static int inotify_fd = -1;

 static char inotify_buf[64*1024*1024];	/* Event buffer, [0..posn-1] is valid */
 static size_t inotify_posn = 0;

+/* Because of use of arbitrary offsets within inotify_buf. */
+#pragma GCC diagnostic ignored "-Wcast-align"
+
 /* Clean up the inotify handle on daemon exit. */
 static void inotify_finalize (void) __attribute__((destructor));
 static void
@@ -149,7 +154,7 @@ int64_t
 do_inotify_add_watch (const char *path, int mask)
 {
  int64_t r;
-  char *buf;
+  CLEANUP_FREE char *buf = NULL;

  NEED_INOTIFY (-1);

@@ -160,7 +165,6 @@ do_inotify_add_watch (const char *path, int mask)
  }

  r = inotify_add_watch (inotify_fd, buf, mask);
-  free (buf);
  if (r == -1) {
    reply_with_perror ("%s", path);
    return -1;
@@ -318,7 +322,7 @@ do_inotify_files (void)
    return NULL;
  }

-  snprintf (cmd, sizeof cmd, "sort -u > %s", tempfile);
+  snprintf (cmd, sizeof cmd, "%s -u > %s", str_sort, tempfile);

  fp = popen (cmd, "w");
  if (fp == NULL) {
@@ -386,50 +390,6 @@ do_inotify_files (void)

 #else /* !HAVE_SYS_INOTIFY_H */

-/* Note that the wrapper code (daemon/stubs.c) ensures that the
- * functions below are never called because optgroup_inotify_available
- * returns false.
- */
-int
-optgroup_inotify_available (void)
-{
-  return 0;
-}
-
-int
-do_inotify_init (int max_events)
-{
-  abort ();
-}
-
-int
-do_inotify_close (void)
-{
-  abort ();
-}
-
-int64_t
-do_inotify_add_watch (const char *path, int mask)
-{
-  abort ();
-}
-
-int
-do_inotify_rm_watch (int wd)
-{
-  abort ();
-}
-
-guestfs_int_inotify_event_list *
-do_inotify_read (void)
-{
-  abort ();
-}
-
-char **
-do_inotify_files (void)
-{
-  abort ();
-}
+OPTGROUP_INOTIFY_NOT_AVAILABLE

 #endif
--- a/daemon/isoinfo.c
+++ b/daemon/isoinfo.c
@@ -30,6 +30,8 @@
 #include "daemon.h"
 #include "actions.h"

+GUESTFSD_EXT_CMD(str_isoinfo, isoinfo);
+
 static int
 parse_uint32 (uint32_t *ret, const char *str)
 {
@@ -55,7 +57,8 @@ parse_time_t (int64_t *ret, const char *str)
  struct tm tm;
  time_t r;

-  if (STREQ (str, "0000 00 00 00:00:00.00")) {
+  if (STREQ (str, "0000 00 00 00:00:00.00") ||
+      STREQ (str, "             :  :  .  ")) {
    *ret = -1;
    return 0;
  }
@@ -236,35 +239,24 @@ parse_isoinfo (char **lines)
 static guestfs_int_isoinfo *
 isoinfo (const char *path)
 {
-  char *out = NULL, *err = NULL;
  int r;
-  char **lines = NULL;
-  guestfs_int_isoinfo *ret = NULL;
+  CLEANUP_FREE char *out = NULL, *err = NULL;
+  CLEANUP_FREE_STRING_LIST char **lines = NULL;

  /* --debug is necessary to get additional fields, in particular
   * the date & time fields.
   */
-  r = command (&out, &err, "isoinfo", "--debug", "-d", "-i", path, NULL);
+  r = command (&out, &err, str_isoinfo, "--debug", "-d", "-i", path, NULL);
  if (r == -1) {
    reply_with_error ("%s", err);
-    goto done;
+    return NULL;
  }

  lines = split_lines (out);
  if (lines == NULL)
-    goto done;
+    return NULL;

-  ret = parse_isoinfo (lines);
-  if (ret == NULL)
-    goto done;
-
- done:
-  free (out);
-  free (err);
-  if (lines)
-    free_strings (lines);
-
-  return ret;
+  return parse_isoinfo (lines);
 }

 guestfs_int_isoinfo *
@@ -276,17 +268,14 @@ do_isoinfo_device (const char *device)
 guestfs_int_isoinfo *
 do_isoinfo (const char *path)
 {
-  char *buf;
  guestfs_int_isoinfo *ret;
-
-  buf = sysroot_path (path);
+  CLEANUP_FREE char *buf = sysroot_path (path);
  if (!buf) {
    reply_with_perror ("malloc");
    return NULL;
  }

  ret = isoinfo (buf);
-  free (buf);

  return ret;
 }
--- a/Show More
+++ b/Show More