[Libguestfs] [PATCH 13/13] syntax-check: fix trailing_blank check

Hu Tao
2014-09-23T09:20:39Z

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
---
 builder/website/debian.preseed |   2 +-
 builder/website/index          | 120 +++++-----
 builder/website/index.asc      | 120 +++++-----
 customize/customize_run.mli    |   2 +-
 daemon/mount.c                 |   2 +-
 fish/test-file-attrs.sh        |  10 +-
 generator/c.ml                 |   2 +-
 guestfs-release-notes.txt      | 520 ++++++++++++++++++++---------------------
 podwrapper.pl.in               |   6 +-
 tools/virt-win-reg             |   2 +-
 v2v/test-v2v-print-source.sh   |   4 +-
 11 files changed, 395 insertions(+), 395 deletions(-)

diff --git a/builder/website/debian.preseed b/builder/website/debian.preseed
index faa4430..d3158a5 100644
--- a/builder/website/debian.preseed
+++ b/builder/website/debian.preseed
@@ -227,7 +227,7 @@ d-i partman/confirm_nooverwrite boolean true
 # so this will only work if the disks are the same size.
 #d-i partman-auto/disk string /dev/sda /dev/sdb

-# Next you need to specify the physical partitions that will be used.
+# Next you need to specify the physical partitions that will be used.
 #d-i partman-auto/expert_recipe string \
 #      multiraid ::                                         \
 #              1000 5000 4000 raid                          \
diff --git a/builder/website/index b/builder/website/index
index 5645ddf..aea33aa 100644
--- a/builder/website/index
+++ b/builder/website/index
@@ -10,14 +10,14 @@ size=6442450944
 compressed_size=197139324
 expand=/dev/sda3
 notes=CentOS 6.5
-
+
  This CentOS image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/centos.sh
-
+
  Note that `virt-builder centos-6' will always install the latest
  6.x release.

@@ -32,12 +32,12 @@ size=6442450944
 compressed_size=213203844
 expand=/dev/sda3
 notes=CentOS 7.0
-
+
  This CentOS image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/centos.sh

 [cirros-0.3.1]
@@ -50,13 +50,13 @@ size=41126400
 compressed_size=11419004
 expand=/dev/sda1
 notes=CirrOS 0.3.1
-
+
  CirrOS is a commonly used test image, ideal because it is very
  small and boots into a minimally usable Linux system.
-
+
  Note this is not a real Linux distribution, and several virt-builder
  features such as installing packages will not (and cannot) work.
-
+
  This CirrOS image comes from https://launchpad.net/cirros

 [debian-6]
@@ -71,24 +71,24 @@ size=4294967296
 compressed_size=139615908
 expand=/dev/sda1
 notes=Debian 6 (Squeeze).
-
+
  This is a default Debian install.
-
+
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/debian.preseed
  builder/website/debian.sh
-
+
  This image is so very minimal that it only includes an ssh
  server and no virtual consoles.  To enable virtual consoles
  use this virt-builder option:
-
+
  virt-builder debian-6 \
      --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [debian-7]
@@ -103,24 +103,24 @@ size=4294967296
 compressed_size=150734028
 expand=/dev/sda1
 notes=Debian 7 (Wheezy).
-
+
  This is a default Debian install.
-
+
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/debian.preseed
  builder/website/debian.sh
-
+
  This image is so very minimal that it only includes an ssh
  server and no virtual consoles.  To enable virtual consoles
  use this virt-builder option:
-
+
  virt-builder debian-7 \
      --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [fedora-18]
@@ -134,14 +134,14 @@ size=6442450944
 compressed_size=148947524
 expand=/dev/sda3
 notes=Fedora 18.
-
+
  This Fedora image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/fedora.sh
-
+
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/

@@ -157,14 +157,14 @@ size=4294967296
 compressed_size=169531628
 expand=/dev/sda3
 notes=Fedora 19.
-
+
  This Fedora image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/fedora.sh
-
+
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/

@@ -180,14 +180,14 @@ size=4294967296
 compressed_size=181164220
 expand=/dev/sda3
 notes=Fedora 20.
-
+
  This Fedora image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/fedora.sh
-
+
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/

@@ -201,14 +201,14 @@ size=6442450944
 compressed_size=210202084
 expand=/dev/sda3
 notes=Red Hat Enterprise Linux® 7 Release Candidate
-
+
  This image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/rhel.sh
-
+
  Red Hat Enterprise Linux is a trademark of Red Hat, Inc.
  Source and further information is available from ftp://ftp.redhat.com

@@ -224,14 +224,14 @@ size=6442450944
 compressed_size=191667880
 expand=/dev/sda3
 notes=Scientific Linux 6.5
-
+
  This Scientific Linux image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/scientificlinux.sh
-
+
  Note that `virt-builder scientificlinux-6' will always install the
  latest 6.x release.

@@ -246,18 +246,18 @@ size=4294967296
 compressed_size=149728112
 expand=/dev/sda1
 notes=Ubuntu 10.04 (Lucid).
-
+
  This is a minimal Ubuntu 10.04 (Lucid) install.
-
+
  Only the openssh-server package is selected in tasksel.
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/ubuntu.preseed
  builder/website/ubuntu.sh
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [ubuntu-12.04]
@@ -271,18 +271,18 @@ size=4294967296
 compressed_size=168593316
 expand=/dev/sda1
 notes=Ubuntu 12.04 (Precise).
-
+
  This is a minimal Ubuntu 12.04 (Precise) install.
-
+
  Only the openssh-server package is selected in tasksel.
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/ubuntu.preseed
  builder/website/ubuntu.sh
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [ubuntu-14.04]
@@ -296,20 +296,20 @@ size=4294967296
 compressed_size=206250764
 expand=/dev/sda1
 notes=Ubuntu 14.04 (Trusty).
-
+
  This is a minimal Ubuntu 14.04 (Trusty) install.
-
+
  Only the openssh-server package is selected in tasksel.
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/ubuntu.preseed
  builder/website/ubuntu.sh
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"
-
+
  IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04
  image using preseed without creating a user account.  Therefore this
  image contains a user account 'builder'.  I have disabled it, so that
diff --git a/builder/website/index.asc b/builder/website/index.asc
index 0452e8b..e33f70c 100644
--- a/builder/website/index.asc
+++ b/builder/website/index.asc
@@ -13,14 +13,14 @@ size=6442450944
 compressed_size=197139324
 expand=/dev/sda3
 notes=CentOS 6.5
-
+
  This CentOS image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/centos.sh
-
+
  Note that `virt-builder centos-6' will always install the latest
  6.x release.

@@ -35,12 +35,12 @@ size=6442450944
 compressed_size=213203844
 expand=/dev/sda3
 notes=CentOS 7.0
-
+
  This CentOS image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/centos.sh

 [cirros-0.3.1]
@@ -53,13 +53,13 @@ size=41126400
 compressed_size=11419004
 expand=/dev/sda1
 notes=CirrOS 0.3.1
-
+
  CirrOS is a commonly used test image, ideal because it is very
  small and boots into a minimally usable Linux system.
-
+
  Note this is not a real Linux distribution, and several virt-builder
  features such as installing packages will not (and cannot) work.
-
+
  This CirrOS image comes from https://launchpad.net/cirros

 [debian-6]
@@ -74,24 +74,24 @@ size=4294967296
 compressed_size=139615908
 expand=/dev/sda1
 notes=Debian 6 (Squeeze).
-
+
  This is a default Debian install.
-
+
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/debian.preseed
  builder/website/debian.sh
-
+
  This image is so very minimal that it only includes an ssh
  server and no virtual consoles.  To enable virtual consoles
  use this virt-builder option:
-
+
  virt-builder debian-6 \
      --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [debian-7]
@@ -106,24 +106,24 @@ size=4294967296
 compressed_size=150734028
 expand=/dev/sda1
 notes=Debian 7 (Wheezy).
-
+
  This is a default Debian install.
-
+
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/debian.preseed
  builder/website/debian.sh
-
+
  This image is so very minimal that it only includes an ssh
  server and no virtual consoles.  To enable virtual consoles
  use this virt-builder option:
-
+
  virt-builder debian-7 \
      --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,'
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [fedora-18]
@@ -137,14 +137,14 @@ size=6442450944
 compressed_size=148947524
 expand=/dev/sda3
 notes=Fedora 18.
-
+
  This Fedora image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/fedora.sh
-
+
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/

@@ -160,14 +160,14 @@ size=4294967296
 compressed_size=169531628
 expand=/dev/sda3
 notes=Fedora 19.
-
+
  This Fedora image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/fedora.sh
-
+
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/

@@ -183,14 +183,14 @@ size=4294967296
 compressed_size=181164220
 expand=/dev/sda3
 notes=Fedora 20.
-
+
  This Fedora image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/fedora.sh
-
+
  Fedora and the Infinity design logo are trademarks of Red Hat, Inc.
  Source and further information is available from http://fedoraproject.org/

@@ -204,14 +204,14 @@ size=6442450944
 compressed_size=210202084
 expand=/dev/sda3
 notes=Red Hat Enterprise Linux® 7 Release Candidate
-
+
  This image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/rhel.sh
-
+
  Red Hat Enterprise Linux is a trademark of Red Hat, Inc.
  Source and further information is available from ftp://ftp.redhat.com

@@ -227,14 +227,14 @@ size=6442450944
 compressed_size=191667880
 expand=/dev/sda3
 notes=Scientific Linux 6.5
-
+
  This Scientific Linux image contains only unmodified @Core group packages.
-
+
  It is thus very minimal.  The kickstart and install script can be
  found in the libguestfs source tree:
-
+
  builder/website/scientificlinux.sh
-
+
  Note that `virt-builder scientificlinux-6' will always install the
  latest 6.x release.

@@ -249,18 +249,18 @@ size=4294967296
 compressed_size=149728112
 expand=/dev/sda1
 notes=Ubuntu 10.04 (Lucid).
-
+
  This is a minimal Ubuntu 10.04 (Lucid) install.
-
+
  Only the openssh-server package is selected in tasksel.
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/ubuntu.preseed
  builder/website/ubuntu.sh
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [ubuntu-12.04]
@@ -274,18 +274,18 @@ size=4294967296
 compressed_size=168593316
 expand=/dev/sda1
 notes=Ubuntu 12.04 (Precise).
-
+
  This is a minimal Ubuntu 12.04 (Precise) install.
-
+
  Only the openssh-server package is selected in tasksel.
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/ubuntu.preseed
  builder/website/ubuntu.sh
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"

 [ubuntu-14.04]
@@ -299,20 +299,20 @@ size=4294967296
 compressed_size=206250764
 expand=/dev/sda1
 notes=Ubuntu 14.04 (Trusty).
-
+
  This is a minimal Ubuntu 14.04 (Trusty) install.
-
+
  Only the openssh-server package is selected in tasksel.
  The preseed and virt-install scripts that produced this image
  can be found in the libguestfs source tree:
-
+
  builder/website/ubuntu.preseed
  builder/website/ubuntu.sh
-
+
  This image does not contain SSH host keys.  To regenerate them use:
-
+
  --firstboot-command "dpkg-reconfigure openssh-server"
-
+
  IMPORTANT NOTE: It seems to be impossible to create an Ubuntu >= 14.04
  image using preseed without creating a user account.  Therefore this
  image contains a user account 'builder'.  I have disabled it, so that
diff --git a/customize/customize_run.mli b/customize/customize_run.mli
index 0b375eb..acfcccf 100644
--- a/customize/customize_run.mli
+++ b/customize/customize_run.mli
@@ -18,7 +18,7 @@

 (* After command line arguments have been parsed, call this function
  * to perform the operations on a guest handle.
- *
+ *
  * Note that inspection must have been done on the handle, and
  * filesystems must be mounted up.
  *)
diff --git a/daemon/mount.c b/daemon/mount.c
index c5b7d89..9647b35 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -166,7 +166,7 @@ mount_vfs_nochroot (const char *options, const char
*vfstype,
         return -1;
       }
     }
-
+
     else {
       if (asprintf (&options_plus, "subvol=%s",
mountable->volume) == -1) {
         reply_with_perror ("asprintf");
diff --git a/fish/test-file-attrs.sh b/fish/test-file-attrs.sh
index 55d602c..bd0c5fa 100755
--- a/fish/test-file-attrs.sh
+++ b/fish/test-file-attrs.sh
@@ -85,7 +85,7 @@ uid: 10
 gid: 11
 -----
 [0] = {
-  attrname:
+  attrname:
   attrval: 2\x00
 }
 [1] = {
@@ -97,7 +97,7 @@ gid: 11
   attrval: secondtest
 }
 [3] = {
-  attrname:
+  attrname:
   attrval: 1\x00
 }
 [4] = {
@@ -105,7 +105,7 @@ gid: 11
   attrval: another
 }
 [0] = {
-  attrname:
+  attrname:
   attrval: 2\x00
 }
 [1] = {
@@ -117,7 +117,7 @@ gid: 11
   attrval: secondtest
 }
 [3] = {
-  attrname:
+  attrname:
   attrval: 3\x00
 }
 [4] = {
@@ -137,7 +137,7 @@ mode: 32841
 uid: 10
 gid: 11
 [0] = {
-  attrname:
+  attrname:
   attrval: 2\x00
 }
 [1] = {
diff --git a/generator/c.ml b/generator/c.ml
index 1fa05ab..135be91 100644
--- a/generator/c.ml
+++ b/generator/c.ml
@@ -1734,7 +1734,7 @@ and generate_client_actions hash ()      ) else (
       List.iter (
         function
-        | Pathname n | Device n | Mountable n | Dev_or_Path n
+        | Pathname n | Device n | Mountable n | Dev_or_Path n
         | Mountable_or_Path n | String n
         | Key n | GUID n ->
           pr "  args.%s = (char *) %s;\n" n n
diff --git a/guestfs-release-notes.txt b/guestfs-release-notes.txt
index 60c6f14..818e8a5 100644
--- a/guestfs-release-notes.txt
+++ b/guestfs-release-notes.txt
@@ -1874,55 +1874,55 @@ RELEASE NOTES FOR LIBGUESTFS 1.18

        - virt-sysprep has been rewritten and expanded (thanks Wanlong Gao)
          http://libguestfs.org/virt-sysprep.1.html
-
+
        - virt-sparsify --zero is a new option that zeroes the named
          partition or filesystem
-
+
        - virt-sparsify can now safely sparsify Linux swap partitions
-
+
        - virt-sparsify fixed so it cleans up after ^C
          http://libguestfs.org/virt-sparsify.1.html
-
+
        - a new tool 'libguestfs-make-fixed-appliance' is provided to
build
          fixed appliances that can be copied to other machines that don't
          have febootstrap support
          http://libguestfs.org/libguestfs-make-fixed-appliance.1.html
-
+
        - virt-filesystems now displays the parents (containers) of MD
          devices and volume groups
-
+
        - virt-alignment-scan, run with no args, displays alignment information
          for all libvirt domains
-
+
        - virt-df and virt-alignment-scan will display information from all
          guests even when a disk is inaccessible
-
+
        - virt-rescue new --scratch option to make scratch disks
          https://rwmj.wordpress.com/2012/04/26/virt-rescue-scratch/#content
-
+
        - virt-make-fs can now be used to create btrfs
-
+
        - virt-edit preserves permissions, UID, GID and SELinux context
          when editing files
-
+
        - guestfish passes the close event over stdout and remote correctly
-
+
        - guestfish new '--pipe-error' option lets you detect errors in
pipe
          commands
-
+
        - guestfish globs now expand device names
-
+
        - comma and colon characters in filenames now handled correctly by
          all virt tools

   inspection

        - added support for Fedora 17+
-
+
        - added support for FreeDOS
-
+
        - added support for Buildroot and Cirros
-
+
        - inspection is now compatible with Windows guests that have been
          sysprepped (thanks Grant Williamson).

@@ -1930,27 +1930,27 @@ RELEASE NOTES FOR LIBGUESTFS 1.18

        - broad support for btrfs added, including adding multiple devices,
          fsck, snapshots (thanks Wanlong Gao)
-
+
        - the new 'mount-local' API brings FUSE support directly into
the
          core libguestfs API

https://rwmj.wordpress.com/2012/05/14/tip-using-mount-local-api-from-c/#content
-
+
        - new man page: guestfs-performance(1), which contains performance
          tuning tips
          http://libguestfs.org/guestfs-performance.1.html
-
+
        - new man page: guestfs-faq(1), Frequently Asked Questions
          http://libguestfs.org/guestfs-faq.1.html
-
+
        - ENOTSUP (from guestfs_last_errno) is now returned for APIs that
          are not supported

   examples

        - 'copy_over' example showing how to copy between two handles
-
+
        - 'display_icon' program displays the icon associated with a
guest
-
+
        - 'mount_local.c' example shows how to use the mount-local API

  Security
@@ -1993,71 +1993,71 @@ RELEASE NOTES FOR LIBGUESTFS 1.18
        the official Debian packages made by Hilko Bengen.
        http://people.debian.org/~bengen/libguestfs/
        http://packages.debian.org/search?keywords=libguestfs
-
+
      - O_CLOEXEC / SOCK_CLOEXEC is now used for almost all file
        descriptors that the library opens.
-
+
      - posix_fadvise is called when sequentially reading or writing large
        files.
-
+
      - close all file descriptors and remove all signal handlers in the
        recovery process
-
+
      - multiple gcc warnings and Coverity bugs have been fixed;  many
        strict-overflow bugs have also been fixed
-
+
      - use ./configure --enable-valgrind-daemon to use valgrind on the
        daemon;  many errors have been fixed
-
+
      - use ./configure --with-qemu-options to pass extra options to qemu
-
+
      - the daemon now has a growable strings buffer type (DECLARE_STRINGSBUF)
-
+
      - the <guestfs.h> header file works with C++ and we have a
regression
        test for this
-
+
      - multiple APIs which should only be called in the CONFIG state now
        give an error if they are not
-
+
      - .gitignore fixed to use absolute paths
-
+
      - gobject bindings have been expanded, including mapping libguestfs
        events to gobject signals (thanks Matt Booth)
-
+
      - gobject documentation is generated properly (thanks Matt Booth)
-
+
      - gobject header files now live in a subdirectory
-
+
      - CompareWithString test in the generator now works
-
+
      - FUInt32, FUInt64 struct field types now use the correct XDR type
-
+
      - OCaml tests are now run on bytecode and native code.
-
+
      - java -Xlint:all is used, and all warnings have been fixed
-
+
      - bmptopng, wrestool (etc) missing or failure no longer prints
        warning messages
-
+
      - ruby: Use RbConfig instead of Config.
-
+
      - PYTHONPATH is set by the ./run script.
-
+
      - appliance building is now thread-safe.
-
+
      - appliance now uses 'ip' instead of 'ifconfig' and
'netstat'
        commands
-
+
      - several fixes to make parallel builds work properly
-
+
      - guestfish --listen now cleans up properly
-
+
      - the BUSY state has been removed
-
+
      - gettextize has been removed, replaced by a simple Makefile.am
-
+
      - gettext support now covers virt-resize, virt-sparsify and virt-sysprep
-
+
      - better support for the arm architecture

  Bugs fixed
@@ -2110,18 +2110,18 @@ RELEASE NOTES FOR LIBGUESTFS 1.16

        - allow XFS filesystems to be created over an existing filesystem
          (Wanlong Gao)
-
+
        - the (unspecified) default alignment for part-disk has been
          changed to 64K for better support of high-end network-attached
          storage
-
+
        - new guestfs-testing(1) man page
-
+
        - list-filesystems returns MD devices containing filesystems
          (Matthew Booth)
-
+
        - support for GCC >= 4.7 (Jim Meyering)
-
+
        - check user does not add the same drive twice (Wanlong Gao).

   language bindings
@@ -2130,52 +2130,52 @@ RELEASE NOTES FOR LIBGUESTFS 1.16
          Introspection.  You can now use libguestfs from Javascript.
          Please note these are not stable and final in this release.
          (Matthew Booth).
-
+
        - support for Ruby >= 1.9
-
+
        - Ruby bindings can be disabled individually (Hilko Bengen)
-
+
        - support for Python 2.6, 3.x (Richard Jones, Hilko Bengen)
-
+
        - support for PHP >= 5.4
-
+
        - new %guestfs_introspection hash is available in Perl bindings so
          you can query which optional arguments are available

   inspection

        - guests with MD devices can be inspected (Matthew Booth)
-
+
        - support for GNU/Hurd guests

   guestfish

        - libguestfs events (such as progress bar events and log messages) can
          be trapped and processed by user-defined shell scripts.
-
+
        - MD devices are tab-completed (Matthew Booth)

   virt tools

        - New tool virt-format for erasing and making blank disks
-
+
        - virt-sparsify new --compress and -o options to allow for compressed
          and different format output
-
+
        - virt-sparsify can now detect and sparsify .vdi files
-
+
        - virt-sysprep no longer requires xmlstarlet; a new virt-inspector
--xpath
          option has been added to replace this functionality
-
+
        - virt-rescue has a new --suggest option which suggests mount commands
          for the guest
-
+
        - virt-resize no longer requires OCaml pcre library

   libguestfs live

        - daemon will no longer try to edit your live /etc/lvm configuration
-
+
        - fix a potential security problem with predictable /tmp names (Steve
Kemp)

  Security
@@ -2197,31 +2197,31 @@ RELEASE NOTES FOR LIBGUESTFS 1.16
  Internals

       Git hosting has moved to http://github.com/libguestfs
-
+
       The various test directories have been rearranged logically, and now
       all appear under 'tests/'.
-
+
       There is a 'make extra-tests' rule which runs ordinary tests and
       additional tests, using valgrind to check for memory problems.
-
+
       Multiple memory leaks and other problems found by valgrind and fixed.
-
+
       Support for optional arguments in the generator has been rewritten
       to provide more features and safety (Matthew Booth).
-
+
       With gcc -fvisibility=hidden is used for internal symbols, avoiding
       call indirection via the PLT.
-
+
       RHashtable functions can be tested in the generator.
-
+
       ADD_ARG macro in daemon allows arg lists to be constructed without
       risk of stack smashing.
-
+
       Fix generation of OCaml functions that have more than 10 arguments.
-
+
       psmisc has been added to the appliance, allowing use of 'fuser',
       'killall' and 'pstree' for debugging.
-
+
       bindtests now cover RBufferOut and optional arguments (Matthew Booth).

  Bugs fixed
@@ -2245,22 +2245,22 @@ RELEASE NOTES FOR LIBGUESTFS 1.14
  New features

       Erlang bindings.
-
+
       virt-alignment-scan is a new tool to check the alignment of
       partitions within virtual machines or disk images.
-
+
       virt-sparsify is a new tool to make virtual machine disk images
       sparse.
-
+
       virt-sysprep is a new tool to make cloning guests from a template
       simpler.

   guestfish

        - New commands setenv, unsetenv, to set environment variables.
-
+
        - The input file and line number is printed in error messages.
-
+
        - guestfish progress bars are now a "mini-library" used by
other
          tools too.

@@ -2285,14 +2285,14 @@ RELEASE NOTES FOR LIBGUESTFS 1.14

        - virt-resize can now work with guests using extended and logical
          partitions, in particular Ubuntu guests.
-
+
        - virt-resize can now align the first partition of Windows guests,
          improving performance.  The new virt-resize --align-first option
          controls this behaviour.
-
+
        - The virt-resize --machine-readable flag makes it possible to use
          virt-resize from other programs.
-
+
        - Partitions are now aligned to 128 sectors (usually 64K) by
          default.  This improves efficiency on high-end storage.  The new
          virt-resize --alignment option allows the alignment to be
@@ -2306,29 +2306,29 @@ RELEASE NOTES FOR LIBGUESTFS 1.14
   library

        - non-printing characters are escaped correctly in debug output.
-
+
        - GUESTFS_EVENT_ENTER is a new event type generated whenever a
          libguestfs function is called.
-
+
        - the library contains systemtap/DTrace probes.
-
+
        - the library can now be compiled without hivex (RHBZ#723474).

   inspection

        - Improve detection of Windows disks.
-
+
        - Adds support for:
              ttylinux - a minimal Linux
              Mageia (thanks Michael Scherer)
              OpenSUSE and zypper (thanks Michael Scherer, Vincent Untz)
              Ubuntu logos (thanks Michael Scherer)
              NetBSD and pkgsrc (thanks Michael Scherer)
-
+
        - Handle some guest types that use /dev/root in /etc/fstab.
-
+
        - Fix handling of guests with > 26 disks (thanks Matthew Booth)
-
+
        - Add support for guests with HP Smart Array disks (thanks Matthew
Booth)

   febootstrap
@@ -2339,7 +2339,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.14
   misc

        - ArchLinux support now working with Linux 3.0 (thanks Erik Nolte)
-
+
        - libvirt disks marked <readonly/> are now added readonly when
          using the virt-tools '-d' option.

@@ -2352,9 +2352,9 @@ RELEASE NOTES FOR LIBGUESTFS 1.14
       compress-out, compress-device-out, copy-device-to-device,
       copy-device-to-file, copy-file-to-device, copy-file-to-file,
       get-smp, part-to-partnum, set-smp.
-
+
       The mount API no longer implicitly adds -o sync,noatime options.
-
+
       add-domain has a new 'readonlydisk' optional parameter to control
       how <readonly/> disks are handled.

@@ -2362,23 +2362,23 @@ RELEASE NOTES FOR LIBGUESTFS 1.14

      - Coverity was run on the source and more bugs were identified and
        fixed.
-
+
      - PCRE library is now required to build libguestfs.
-
+
      - APIC is now the default for the appliance.  You can also enable
        SMP support in the appliance.
-
+
      - OCaml bindings now correctly acquire GC lock during callbacks.
-
+
      - Out of tree builds should now work correctly (thanks Hilko Bengen).
-
+
      - ./configure --with-extra="..." can be used by packagers to set
        the extra version string.
-
+
      - zero, zero-device APIs: if the blocks already contain zeroes,
        don't write zeroes, so that we don't unnecessarily make the
        underlying storage non-sparse.
-
+
      - is-zero, is-zero-device APIs: optimize these so zero detection is
        faster.

@@ -2415,33 +2415,33 @@ RELEASE NOTES FOR LIBGUESTFS 1.12

        - guestfish strings can use escapes,
          eg. ><fs> write /foo "line 1\nline 2\n"
-
+
        - guestfish write-append command can be used to append to files.
-
+
        - Long-running file uploads and downloads can be cancelled through the
          API or by hitting ^C in guestfish.
-
+
        - New guestfish "display" command for displaying graphical
files
          inside guests.
-
+
        - In guestfish, tab completion now works on /dev/mapper devices.

   virt-inspector

        - Inspection API can get an icon or logo for certain guests.
-
+
        - virt-inspector includes the logo and hostname for certain guests.
-
+
        - virt-inspector can now get the version and release numbers for RPM
          packages.
-
+
        - CentOS and Scientific Linux are now treated as separate distros by
          the inspection API.

   virt-resize

        - virt-resize can now handle btrfs.
-
+
        - New virt-resize --ntfsresize-force option allows Windows VMs to be
          resized multiple times.

@@ -2451,43 +2451,43 @@ RELEASE NOTES FOR LIBGUESTFS 1.12
          virt-inspector, virt-ls and virt-rescue now allow you to use
          "-d UUID" option to specify a guest by UUID.  This makes
them more
          robust to use from other programs.
-
+
        - virt-ls -lR option allows complex file iteration and guest analysis.
-
+
        - virt-win-reg supports HKEY_USERS\<SID> and
HKEY_USERS\<username>.
-
+
        - virt-win-reg new option --unsafe-printable-strings allows printable
          strings to be displayed in the output (unsafely: read the
documentation
          before using).
-
+
        - virt-edit has been rewritten in C.

   API and language bindings

        - Java is now completely supported.
          See http://libguestfs.org/guestfs-java.3.html
-
+
        - JRuby is supported via the Java bindings.
-
+
        - guestfs_close now appears in trace messages.
-
+
        - Python binding adds explicit g.close() method.
-
+
        - Python programs can now use the new event API.
-
+
        - Python GIL is released during libguestfs calls, allowing multithreaded
          Python programs to work properly.
-
+
        - 9pfs (Plan 9 filesystems exported from the host) are now supported.
-
+
        - Add -DGUESTFS_WARN_DEPRECATED=1 to warn about use of deprecated API
          functions in C programs.
-
+
        - New manual page guestfs-recipes(1) with recipes.
-
+
        - mkfs-opts can now set inode size and sector size on created
filesystems
          (thanks Nikita Menkovich).
-
+
        - guestfs_last_errno is now accessible from OCaml (as g#last_errno ()).

  Security
@@ -2506,22 +2506,22 @@ RELEASE NOTES FOR LIBGUESTFS 1.12

      - Coverity (a static analysis tool) was run across the codebase and
        many fixes were made.
-
+
      - Generator can handle functions that return RBufferOut and have
        optional arguments.
-
+
      - Compatible with Perl 5.14.
-
+
      - Compatible with gcc 4.6.
-
+
      - Perform safety checks on QEMU.
-
+
      - C API tests can now fully test calls that have optional arguments.
-
+
      - Use ./configure --enable-install-daemon to install /usr/sbin/guestfsd.
-
+
      - po-docs directory now covers all man pages.
-
+
      - stderr from qemu process is now captured by the event subsystem.

  Bugs fixed
@@ -2546,83 +2546,83 @@ Release notes for libguestfs 1.10.0
        See the 'guestfish --live' and 'guestmount --live'
options, and (for
        the low-level interface) the new APIs set-attach-method and
        get-attach-method.
-
+
      - New virt tools:
        virt-copy-in, virt-copy-out, virt-tar-in, virt-tar-out.
-
+
      - libguestfs can get the drive letter mappings for Windows guests.
-
+
      - virt-inspector displays drive letter mappings for Windows guests.
-
+
      - Drive letters can now be used in virt-edit and guestfish programs
        when operating on Windows guests.
-
+
      - virt-resize now works on 32 bit hosts.
-
+
      - You can now inspect the install disks and live CDs of many different
        operating systems.
-
+
      - guestfish <! cmd which executes a shell cmd and inlines the result.
-
+
      - guestfish, guestmount, virt-rescue now all support --ro and --rw
        options, and the default for this can be chosen via a configuration
        file (/etc/libguestfs-tools.conf).
-
+
      - New event API allows more than one callback to be registered for
        each event, makes it possible to call the API from other languages,
        and allows nearly all log, debug and trace messages to be rerouted
        from stderr.
-
+
      - Greater FHS compliance for temporary files, including using /var/tmp
        for large cached files that should survive reboot (instead of /tmp).
-
+
      - guestfish, guestmount -m option allows mount options to be passed
        through to the underlying filesystem.
-
+
      - mkfs-opts allows filesystem features to be specified.
-
+
      - More intelligent handling of mountpoints, allowing mkmountpoint, mount
        and umount-all commands to work together properly.
-
+
      - Trace messages are prefixed with a distinct string, allowing them to
        be easily 'grepped' out from debug output.
-
+
      - guestfs_launch (guestfish 'run' command) now produces progress
        messages (a guestfish progress bar) if it takes longer than 5
        seconds to run.
-
+
      - Several long-running commands where we are unable to estimate time
        to completion generate "pulse mode" progress events.  Progress
bar
        in guestfish has been updated to display these.
-
+
      - Publish new example code in: C, Perl, Python, OCaml, Ruby.
-
+
      - New virt-dhcp-address example program.
-
+
      - The Java and Ruby bindings have been improved greatly.
-
+
      - Perl includes a way to get the errno of the last error.
-
+
      - Python bindings now compatible with rpyc (thanks Erez Shinan).
-
+
      - Transifex is now being used to manage translations.
        http://www.transifex.net/projects/p/libguestfs/
-
+
      - Inspection now supports Red Hat Desktop, Slackware distributions.
-
+
      - Inspection no longer fails for Windows guests that have two or
        more disks.
-
+
      - Inspection can now tell the difference between Windows 2008 Server
        and Windows 7.
-
+
      - Inspection can detect 32 bit applications installed in 64 bit
        Windows, running on the WOW64 emulator.
-
+
      - A series of protocol fixes has fixed the old bug RHBZ#576879
        which used to cause errors during the upload command to lose
        protocol synchronization.
-
+
      - New logo!

  Security
@@ -2640,15 +2640,15 @@ Release notes for libguestfs 1.10.0

      - The 'HACKING' file is obsolete.  The contents have been moved
into
        a section of the guestfs(3) manual page.
-
+
      - libguestfs-test-tool simplified.  It no longer needs the static
        binary or tries to construct an ISO.
-
+
      - rpcgen-generated files are compiled with -fno-strict-aliasing
        which should be safer (thanks Matt Booth).
-
+
      - virt-resize was rewritten in OCaml.
-
+
      - guestfish and other tools tested with valgrind; some memory leaks
        were fixed.

@@ -2683,78 +2683,78 @@ Release notes for libguestfs 1.8
  New features

      - Support and packages for Debian and Ubuntu.
-
+
      - Daily builds from git repository on Debian and Ubuntu to reduce risk
        of regressions.
-
+
      - Port to ArchLinux 'pacman' (thanks Thomas S Hatch).
-
+
      - The following tools have been rewritten in C (originally in Perl):
-
+
          . virt-cat
          . virt-df
          . virt-inspector
          . virt-ls
          . virt-rescue
-
+
      - Some C tools support encrypted guests automatically.  This is
        supported in: guestfish, guestmount, virt-cat, virt-inspector,
        virt-ls.
-
+
      - New tool virt-filesystems (in C) which is a replacement for
        virt-list-filesystems and virt-list-partitions, and has a superset
        of the functionality of those tools.
-
+
      - guestfish, guestmount and the C tools use unified command line option
        parsing, so they support many common options such as '-a
disk.img',
        '-d libvirt-domain', '-x', '-v'.  The old
command line option
        parsing is preserved for compatibility in scripts etc.
-
+
      - guestfish no longer has any dependencies on Perl
-
+
      - New man pages containing programming examples: guestfs-examples(3)
(C/C++),
        guestfs-ocaml(3), guestfs-python(3), guestfs-ruby(3).
-
+
      - Trace mode prints return values from API functions.
-
+
      - virt-inspector can list applications installed in Windows guests, along
        with a great deal of information about those applications.
-
+
      - Add support for inspecting: Linux Mint, Mandriva, FreeBSD.
-
+
      - guestfish --rw option (with no effect currently) to make potentially
        dangerous write access explicit.
-
+
      - guestfish --listen --csh for compatibility with csh, tcsh (thanks
        Eric Blake).
-
+
      - The first upstream version that introduced each API function is now
        documented in guestfs(3).
-
+
      - guestfs_last_errno allows you to retrieve the errno from the
        daemon, correctly translated to the local operating system.
-
+
      - Functions can now have optional parameters.
-
+
      - Progress bars and progress notifications can now happen for upload
        commands.
-
+
      - Appliance builder more careful about not leaving temporary files
        around in /tmp.
-
+
      - getfattr/setfattr commands added to virt-rescue.
-
+
      - ROADMAP file covers roadmap and goals for future releases.

  Security

      - New SECURITY section in guestfs(3) API documentation.
-
+
      - virt-inspector no longer runs any guest commands.
-
+
      - Inspection code is more careful about avoiding very large files
        from guests which might previously have caused a denial of service.
-
+
      - FUSE calls into guestmount are now traced when using guestmount -x.

  New APIs
@@ -2773,35 +2773,35 @@ Release notes for libguestfs 1.8
  Internals

      - C programs now only link precisely with the libraries that they use.
-
+
      - PCRE, libmagic, hivex and libvirt libraries are now completely
        optional for building.
-
+
      - Multiple memory leaks and file descriptor leaks fixed.
-
+
      - Add a POD wrapper to unify generation of man pages and HTML files
        across all programs.
-
+
      - Source includes phony images of Fedora, Debian, Ubuntu and
        Windows guests.
-
+
      - Ruby bindings have 'make install' rule.
-
+
      - <guestfs.h> is now a single file.
-
+
      - <guestfs.h> does not require XDR headers.
-
+
      - ocaml xml-light library is no longer required to build (thanks
        Maxim Koltsov).
-
+
      - ./configure --disable-[...] for each language binding (thanks
        Maxim Koltsov).
-
+
      - Old ocaml-viewer program removed (use guestfs-browser instead).
-
+
      - New C API test type 'InitScratchFS' makes the tests run a little
        more quickly.
-
+
      - Excluded packages in the appliance are now listed in a separate
        file appliance/excludelist.in, and can be customized per-distro.

@@ -2825,84 +2825,84 @@ RELEASE NOTES FOR LIBGUESTFS 1.6
      - Use a new method for creating and caching the appliance.  This
        greatly improves the performance of libguestfs, often by a factor
        of x 4 to x 5.
-
+
      - Support for guest inspection (like virt-inspector) via the ordinary
        API and all language bindings.  'guestfish -i' option is as a
side-
        effect much quicker.
-
+
      - virt-inspector and core inspection API can now detect guests running:
        Fedora, Debian, Ubuntu, Windows, Red Hat Enterprise Linux, CentOS,
        Scientific Linux, Gentoo, Pardus, Arch Linux, MeeGo.
-
+
      - Support for LUKS whole-disk encryption in guests.
-
+
      - PHP bindings.
-
+
      - Progress messages (and progress bars in guestfish and virt-resize)
        for certain long-running operations.
-
+
      - virt-df is now much more efficient.  Use '--one-per-guest' to
restore
        the old per-guest isolation behaviour.
-
+
      - guestfish 'copy-in' and 'copy-out' commands for copying
files and
        directories recursively in and out of the guest.
-
+
      - guestfish 'hexedit' command for doing binary edits to devices
and
        files.
-
+
      - Change guestfish -i syntax to allow commands to be specified on the
        command line (retaining backwards compatibility).
-
+
      - guestfish '-d <domain>' for adding disks from libvirt
domains.
-
+
      - guestfish '-N' option supports several new prepared disk image
types:
              lvfs : disk with LV formatted with filesystem
                lv : disk with LV
          bootroot : boot+root
        bootrootlv : boot and root on LV
-
+
      - guestfish 'more' and 'edit' commands now work with
arbitrary files.
-
+
      - guestfish '--echo-keys' option allows you to echo
keys/passphrases
        while typing them.
-
+
      - guestmount now supports -a / -d / -i options, like guestfish.
-
+
      - Use virtio-serial for communications with the appliance.  This
        also has a major performance benefit.
-
+
      - virt-edit '-b' option to create a backup of edited files.
-
+
      - virt-edit '-e' option for non-interactive edits to files.
-
+
      - Ability to capture core dumps from the appliance (thanks Matthew Booth).
-
+
      - virt-rescue now shuts down cleanly (thanks Matthew Booth).
-
+
      - virt-rescue now has a --network option to enable network access.
-
+
      - virt-resize can now handle guests which use GPT partition table format.
-
+
      - virt-resize has better support for shrinking guests.
-
+
      - virt-resize supports qcow2-format guests.
-
+
      - $TMPDIR can be used to override almost all temporary directory usage.
-
+
      - OCaml users can use an alternate OO-style of coding, eg. g#launch ()
-
+
      - The API supports calls which take optional parameters, eg.
          $g->add_drive_opts ("disk", readonly => 1);
-
+
      - Trace output now escapes and shortens large strings (thanks
        Matthew Booth).
-
+
      - Autosync is now on by default, resulting in more reliable behaviour
        when the handle is closed.
-
+
      - virt-df --uuid option allows you to follow a domain across migration
        and renaming.
-
+
      - Translations of manual pages.

  Security
@@ -2911,7 +2911,7 @@ RELEASE NOTES FOR LIBGUESTFS 1.6
        https://www.redhat.com/archives/libguestfs/2010-October/msg00036.html
        This is comprehensively fixed in this release, and the fix will be
        backported to the other stable branches after more testing.
-
+
      - virt-inspector no longer relies on untrusted guest code to list
        applications in some guests.

@@ -2989,73 +2989,73 @@ RELEASE NOTES FOR LIBGUESTFS 1.4

      - guestfish lets you choose a prepared disk image, eg:
          guestfish -N fs:ext4
-
+
      - Add write support to guestmount (FUSE) module.
-
+
      - virt-resize can now resize the content of partitions and logical
        volumes in the guest, and we have better support for shrinking guests.
-
+
      - Bash tab-completion script for guestfish.
-
+
      - Add ZFS support to virt-rescue.
-
+
      - New tool 'virt-make-fs' for creating filesystems with content.
-
+
      - Allow suffixes on any guestfish number parameter, eg. "1M".
-
+
      - guestfish 'man' command opens the manual page.
-
+
      - guestfish supports a "heredoc" syntax for uploading files:
          upload -<<_end_ /foo
          content
          _end_
-
+
      - Some guestfish commands now print their output in octal or hex
        where appropriate (RHBZ#583242).
-
+
      - Allow dash prefix on guestfish command line.  This ignores any
        error from the second command:                   (RHBZ#578407)
          guestfish -- cmd1 : -cmd2 : cmd3
-
+
      - guestfish -h / help command now returns an error for non-existent
        commands (RHBZ#597145).
-
+
      - New 'supported' command in guestfish to list optional groups of
        commands which are supported by the daemon / configuration.
-
+
      - virt-inspector and guestfish -i now work for filenames which
        contain spaces (RHBZ#507810).
-
+
      - Change the protocol to use link-local addresses, to avoid
        conflicting with any address that the host might be using
        (RHBZ#588763).
-
+
      - libguestfs now sets the correct time and timezone on filesystem
        modifications.
-
+
      - Sort the domains into alphabetical order in virt-df.
-
+
      - Make mkfs-b command work for FAT and NTFS by mapping the blocksize
        parameter to the cluster size (RHBZ#599464).
-
+
      - Add version numbers to Perl modules (RHBZ#521674).
-
+
      - Localization now works for all the libguestfs tools (RHBZ#559963).
-
+
      - Tools now support filesystem-on-image VMs (RHBZ#590167).
-
+
      - virt-list-partitions has a '-t' option to show the total size of
disks.
-
+
      - Include extra Augeas lenses in the supermin appliance (Matthew Booth).
-
+
      - Add error and close callbacks.
-
+
      - Add explicit close method in the Perl API.
-
+
      - Multiple fixes for RHEL 5 compatibility.
-
+
      - Multiple fixes for Debian/Ubuntu compatibility.
-
+
      - Multiple revisions to improve the documentation.

  Security
diff --git a/podwrapper.pl.in b/podwrapper.pl.in
index c2894da..b2eeb25 100755
--- a/podwrapper.pl.in
+++ b/podwrapper.pl.in
@@ -38,9 +38,9 @@ podwrapper.pl - Generate libguestfs documentation from POD
input files
 =head1 SYNOPSIS

  man_MANS = virt-foo.1
-
+
  virt-foo.1 $(top_builddir)/html/virt-foo.1.html: stamp-virt-foo.pod
-
+
  stamp-virt-foo.pod: virt-foo.pod
          $(PODWRAPPER) \
            --section 1 \
@@ -49,7 +49,7 @@ podwrapper.pl - Generate libguestfs documentation from POD
input files
            --license GPLv2+ \
            $<
          touch $@
-
+
  CLEANFILES += stamp-virt-foo.pod

 =head1 DESCRIPTION
diff --git a/tools/virt-win-reg b/tools/virt-win-reg
index 3c6f600..f3e5447 100755
--- a/tools/virt-win-reg
+++ b/tools/virt-win-reg
@@ -741,7 +741,7 @@ needed because I am using the RHSrvAny service wrapper.
  "ImagePath"="c:\\rhsrvany.exe"
  "DisplayName"="RHSrvAny"
  "ObjectName"="NetworkService"
-
+
  [HKLM\SYSTEM\ControlSet001\services\RHSrvAny\Parameters]
  "CommandLine"="c:\\test.exe"
  "PWD"="c:\\Temp"
diff --git a/v2v/test-v2v-print-source.sh b/v2v/test-v2v-print-source.sh
index 82b2550..cf6ce32 100755
--- a/v2v/test-v2v-print-source.sh
+++ b/v2v/test-v2v-print-source.sh
@@ -57,8 +57,8 @@ if [ "$(cat $d/output)" != "    source name:
windows
 hypervisor type: test
          memory: 1073741824 (bytes)
        nr vCPUs: 1
-   CPU features:
-        display:
+   CPU features:
+        display:
 disks:
 	/windows.img (raw) [vda]
 removable media:
--
1.9.3