remove all trailing blank lines

by running this command: git ls-files -z | xargs -0 perl -pi -0777 -e 's/\n\n+$/\n/' This is in preparation for a more strict make syntax-check rule that will detect trailing blank lines.

remove all trailing blank lines
by running this command: git ls-files -z | xargs -0 perl -pi -0777 -e 's/\n\n+$/\n/' This is in preparation for a more strict make syntax-check rule that will detect trailing blank lines.
07613d20 · Jim Meyering · 4a7acedd · 07613d20 · 07613d20 · 07613d20
109 changed file
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -506,5 +506,3 @@ if necessary.  Here is a sample; alter the names:
  Ty Coon, President of Vice

 That's all there is to it!
-
-
--- a/NEWS
+++ b/NEWS
@@ -1078,4 +1078,3 @@
   - First release
   - Basic management of existing Xen domains
   - Minimal autogenerated Python bindings
-
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -107,4 +107,3 @@ if test -n "$PKG_CONFIG"; then
        fi
 fi[]dnl
 ])])
-
--- a/docs/api_extension/0001-Step-1-of-8-Define-the-public-API.patch
+++ b/docs/api_extension/0001-Step-1-of-8-Define-the-public-API.patch
@@ -42,4 +42,3 @@ index f7ebbc3..b8f9128 100644
 # .... define new API here using predicted next version number ....
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0002-Step-2-of-8-Define-the-internal-driver-API.patch
+++ b/docs/api_extension/0002-Step-2-of-8-Define-the-internal-driver-API.patch
@@ -34,4 +34,3 @@ index 39dc413..c357b76 100644
 /*
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0003-Step-3-of-8-Implement-the-public-API.patch
+++ b/docs/api_extension/0003-Step-3-of-8-Implement-the-public-API.patch
@@ -117,4 +117,3 @@ index f3d4484..ded18a7 100644
  */
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0004-Step-4-of-8-Define-the-wire-protocol-format.patch
+++ b/docs/api_extension/0004-Step-4-of-8-Define-the-wire-protocol-format.patch
@@ -45,4 +45,3 @@ index 2d8e6a2..2c79949 100644
 /* Custom RPC structure. */
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0005-Step-5-of-8-Implement-the-RPC-client.patch
+++ b/docs/api_extension/0005-Step-5-of-8-Implement-the-RPC-client.patch
@@ -82,4 +82,3 @@ index 4b3afb0..e665ef8 100644
 
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch
+++ b/docs/api_extension/0006-Step-6-of-8-Implement-the-server-side-dispatcher.patch
@@ -68,4 +68,3 @@ index e27820f..8d24a3a 100644
  **************************/
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch
+++ b/docs/api_extension/0007-Step-7-of-8-Implement-the-driver-methods.patch
@@ -1169,4 +1169,3 @@ index 29cdb9e..7621212 100644
     if (!(actual = virNodeDeviceDefFormat(NULL, dev)))
 -- 
 1.6.0.6
-
--- a/docs/api_extension/0008-Step-8-of-8-Add-virsh-support.patch
+++ b/docs/api_extension/0008-Step-8-of-8-Add-virsh-support.patch
@@ -130,4 +130,3 @@ index cb32ede..ab2a2b7 100644
     {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build},
 -- 
 1.6.0.6
-
--- a/docs/devhelp/devhelp.xsl
+++ b/docs/devhelp/devhelp.xsl
@@ -123,5 +123,3 @@
  </xsl:template>

 </xsl:stylesheet>
-
-
--- a/docs/devhelp/html.xsl
+++ b/docs/devhelp/html.xsl
@@ -575,5 +575,3 @@ it indexes the project page, the APIs as well as the mailing-list archives. </p>
  </xsl:template>

 </xsl:stylesheet>
-
-
--- a/docs/examples/python/README
+++ b/docs/examples/python/README
@@ -12,4 +12,3 @@ domrestore.py - restore domU's from their saved files in a directory
 The XML files in this directory are examples of the XML format that libvirt
 expects, and will have to be adapted for your setup. They are only needed
 for domstart.py
-
--- a/docs/examples/python/dominfo.py
+++ b/docs/examples/python/dominfo.py
@@ -82,5 +82,3 @@ for d in devs:
    elif type == "bridge":
        print_xml("Source:", ctx, "source/@bridge")
        print_xml("MAC Addr:", ctx, "mac/@address")
-
-
--- a/docs/library.xen
+++ b/docs/library.xen
@@ -98,4 +98,3 @@ dependence to Xen code as the interfaces stabilize.
 Daniel Veillard <veillard@redhat.com>

 Mon Oct 24 18:40:19 CEST 2005
-
--- a/docs/news.xsl
+++ b/docs/news.xsl
@@ -44,4 +44,3 @@
  <xsl:template match="p">
  </xsl:template>
 </xsl:stylesheet>
-
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -299,4 +299,3 @@
  </define>

 </grammar>
-
--- a/docs/testnetdef.xml
+++ b/docs/testnetdef.xml
@@ -9,4 +9,3 @@
    </dhcp>
  </ip>
 </network>
-
--- a/docs/testnetpriv.xml
+++ b/docs/testnetpriv.xml
@@ -8,4 +8,3 @@
    </dhcp>
  </ip>
 </network>
-
--- a/examples/domain-events/events-python/event-test.py
+++ b/examples/domain-events/events-python/event-test.py
@@ -212,4 +212,3 @@ def main():

 if __name__ == "__main__":
    main()
-
--- a/python/libvirt_wrap.h
+++ b/python/libvirt_wrap.h
@@ -185,4 +185,3 @@ PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node);
  if (PyEval_ThreadsInitialized())			       \
    PyGILState_Release(_save);				       \
  } LIBVIRT_STMT_END
-
--- a/qemud/THREADING.txt
+++ b/qemud/THREADING.txt
@@ -60,4 +60,3 @@ While the helper method is executing, no locks are held on either
 the client or server, but the ref count on the 'struct qemud_client'
 object is incremented to ensure its not deleted. The helper can
 now safely invoke the neccessary libvirt API call.
-
--- a/qemud/libvirtd_qemu.aug
+++ b/qemud/libvirtd_qemu.aug
@@ -43,4 +43,3 @@ module Libvirtd_qemu =
              . Util.stdexcl

   let xfm = transform lns filter
-
--- a/src/logging.c
+++ b/src/logging.c
@@ -790,4 +790,3 @@ int virLogParseFilters(const char *filters) {
    }
    return(ret);
 }
-
--- a/src/lxc_conf.h
+++ b/src/lxc_conf.h
@@ -57,4 +57,3 @@ virCapsPtr lxcCapsInit(void);
                               __FUNCTION__, __LINE__, fmt)

 #endif /* LXC_CONF_H */
-
--- a/src/network_conf.c
+++ b/src/network_conf.c
@@ -948,4 +948,3 @@ void virNetworkObjUnlock(virNetworkObjPtr obj)
 {
    virMutexUnlock(&obj->lock);
 }
-
--- a/src/network_conf.h
+++ b/src/network_conf.h
@@ -186,4 +186,3 @@ void virNetworkObjLock(virNetworkObjPtr obj);
 void virNetworkObjUnlock(virNetworkObjPtr obj);

 #endif /* __NETWORK_CONF_H__ */
-
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -331,5 +331,3 @@ unsigned long long nodeGetFreeMemory(virConnectPtr conn)
    return 0;
 }
 #endif
-
-
--- a/src/opennebula/one_client.c
+++ b/src/opennebula/one_client.c
@@ -207,5 +207,3 @@ void c_oneFree()
    xmlrpc_env_clean(&one_client.env);
    xmlrpc_client_cleanup();
 }
-
-
--- a/src/opennebula/one_client.h
+++ b/src/opennebula/one_client.h
@@ -60,5 +60,3 @@ void c_oneFree(void);


 #endif /* ONE_CLIENT_H_ */
-
-
--- a/src/opennebula/one_conf.c
+++ b/src/opennebula/one_conf.c
@@ -282,4 +282,3 @@ no_memory:
    VIR_FREE(tmp);
    return NULL;
 };
-
--- a/src/opennebula/one_conf.h
+++ b/src/opennebula/one_conf.h
@@ -50,4 +50,3 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def);
                         __FUNCTION__, __LINE__, fmt)

 #endif /* ONE_CONF_H */
-
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -2996,4 +2996,3 @@ cleanup:

    return def;
 }
-
--- a/src/storage_backend.c
+++ b/src/storage_backend.c
@@ -694,4 +694,3 @@ virStorageBackendRunProgNul(virConnectPtr conn,
    return -1;
 }
 #endif
-
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -242,4 +242,3 @@ void VBoxCGlueTerm(void)
    g_pfnGetFunctions = NULL;
    memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg));
 }
-
--- a/src/vbox/vbox_XPCOMCGlue.h
+++ b/src/vbox/vbox_XPCOMCGlue.h
@@ -55,4 +55,3 @@ void VBoxCGlueTerm(void);
 #endif

 #endif
-
--- a/src/veth.c
+++ b/src/veth.c
@@ -216,4 +216,3 @@ error_out:
    VIR_FREE(pid);
    return rc;
 }
-
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -107,5 +107,3 @@
  </guest>

 </capabilities>
-
-
--- a/tests/capabilityschemadata/caps-test.xml
+++ b/tests/capabilityschemadata/caps-test.xml
@@ -67,5 +67,3 @@
  </guest>

 </capabilities>
-
-
--- a/tests/confdata/libvirtd.conf
+++ b/tests/confdata/libvirtd.conf
@@ -218,5 +218,3 @@ tls_allowed_dn_list = ["DN1", "DN2"]
 #
 # By default, no Username's are checked
 sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ]
-
-
--- a/tests/nodedevschemadata/storage_serial_3600c0ff000d7a2a5d463ff4902000000.xml
+++ b/tests/nodedevschemadata/storage_serial_3600c0ff000d7a2a5d463ff4902000000.xml
@@ -11,5 +11,3 @@
    <size>15626928128</size>
  </capability>
 </device>
-
-
--- a/tests/nodeinfodata/linux-nodeinfo-1.cpuinfo
+++ b/tests/nodeinfodata/linux-nodeinfo-1.cpuinfo
@@ -43,4 +43,3 @@ clflush size	: 64
 cache_alignment	: 128
 address sizes	: 36 bits physical, 48 bits virtual
 power management:
-
--- a/tests/nodeinfodata/linux-nodeinfo-2.cpuinfo
+++ b/tests/nodeinfodata/linux-nodeinfo-2.cpuinfo
@@ -45,4 +45,3 @@ clflush size	: 64
 cache_alignment	: 64
 address sizes	: 40 bits physical, 48 bits virtual
 power management: ts fid vid ttp tm stc
-
--- a/tests/nodeinfodata/linux-nodeinfo-4.cpuinfo
+++ b/tests/nodeinfodata/linux-nodeinfo-4.cpuinfo
@@ -93,4 +93,3 @@ clflush size	: 64
 cache_alignment	: 64
 address sizes	: 48 bits physical, 48 bits virtual
 power management: ts ttp tm stc 100mhzsteps hwpstate [8]
-
--- a/tests/nodeinfodata/linux-nodeinfo-5.cpuinfo
+++ b/tests/nodeinfodata/linux-nodeinfo-5.cpuinfo
@@ -93,4 +93,3 @@ clflush size	: 64
 cache_alignment	: 64
 address sizes	: 40 bits physical, 48 bits virtual
 power management: ts fid vid ttp tm stc
-
--- a/tests/nodeinfodata/linux-nodeinfo-6.cpuinfo
+++ b/tests/nodeinfodata/linux-nodeinfo-6.cpuinfo
@@ -93,4 +93,3 @@ clflush size	: 64
 cache_alignment	: 64
 address sizes	: 40 bits physical, 48 bits virtual
 power management: ts fid vid ttp tm stc
-
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -112,4 +112,3 @@ mymain(int argc, char **argv)
 #endif /* __linux__ */

 VIRT_TEST_MAIN(mymain)
-
--- a/tests/object-locking.ml
+++ b/tests/object-locking.ml
@@ -823,5 +823,3 @@ let () =
      )
    | _ -> ()
  ) file.globals;
-
-
--- a/tests/reconnect.c
+++ b/tests/reconnect.c
@@ -52,4 +52,3 @@ int main(void) {
    exit(0);

 }
-
--- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(ip '192.0.2.1')))
-
--- a/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')(uname 'tap:qcow:/root/some.img')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (tap (dev 'xvda')(uname 'tap:aio:/root/some.img')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')(script 'vif-bridge')(model 'e1000'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vif (mac '00:11:22:33:44:55')(dev 'eth3')(script 'vif-routed')(ip '172.14.5.6')))
-
--- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (pci (backend 0)(dev (domain 0x0001) (bus 0x0c) (slot 0x1b) (func 0x2))(dev (domain 0x0000) (bus 0x01) (slot 0x13) (func 0x0))))(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestVG')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(localtime 1)(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)(vncunused 0)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)(vncdisplay 25)))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vfb (type vnc)(vncunused 1)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')(vnc 1)(vncunused 1)(vnclisten 0.0.0.0)(vncpasswd 123456)(keymap ja)))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
-
--- a/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
+++ b/tests/sexpr2xmldata/sexpr2xml-pv.sexpr
 (domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w'))))
-
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -173,4 +173,3 @@ mymain(int argc, char **argv)
 }

 VIRT_TEST_MAIN(mymain)
-
--- a/tests/storagepoolschemadata/pool-fs.xml
+++ b/tests/storagepoolschemadata/pool-fs.xml
@@ -17,4 +17,3 @@
    </permissions>
  </target>
 </pool>
-
--- a/tests/storagepoolschemadata/pool-netfs.xml
+++ b/tests/storagepoolschemadata/pool-netfs.xml
@@ -18,4 +18,3 @@
    </permissions>
  </target>
 </pool>
-
--- a/tests/storagevolschemadata/vol-logical.xml
+++ b/tests/storagevolschemadata/vol-logical.xml
@@ -18,4 +18,3 @@
    </permissions>
  </target>
 </volume>
-
--- a/tests/testutilsqemu.h
+++ b/tests/testutilsqemu.h
@@ -2,4 +2,3 @@
 #include "capabilities.h"

 virCapsPtr testQemuCapsInit(void);
-
--- a/tests/testutilsxen.h
+++ b/tests/testutilsxen.h
@@ -2,4 +2,3 @@
 #include "capabilities.h"

 virCapsPtr testXenCapsInit(void);
-
--- a/tests/xencapsdata/xen-i686-pae-hvm.cpuinfo
+++ b/tests/xencapsdata/xen-i686-pae-hvm.cpuinfo
@@ -35,4 +35,3 @@ cpuid level	: 10
 wp		: yes
 flags		: fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
 bogomips	: 5821.44
-
--- a/tests/xencapsdata/xen-i686-pae.cpuinfo
+++ b/tests/xencapsdata/xen-i686-pae.cpuinfo
@@ -16,5 +16,3 @@ cpuid level	: 10
 wp		: yes
 flags		: fpu tsc msr pae mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor ds_cpl vmx est tm2 cx16 xtpr lahf_lm
 bogomips	: 5821.44
-
-
--- a/tests/xencapsdata/xen-i686.cpuinfo
+++ b/tests/xencapsdata/xen-i686.cpuinfo
@@ -16,4 +16,3 @@ cpuid level	: 10
 wp		: yes
 flags		: fpu tsc msr mce cx8 apic mtrr mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe lm constant_tsc pni monitor
 bogomips	: 5821.44
-
--- a/tests/xencapstest.c
+++ b/tests/xencapstest.c
@@ -222,4 +222,3 @@ mymain(int argc, char **argv)
 }

 VIRT_TEST_MAIN(mymain)
-
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -240,4 +240,3 @@ mymain(int argc, char **argv)
 }

 VIRT_TEST_MAIN(mymain)
-
--- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
+++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml
@@ -27,4 +27,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml
@@ -30,4 +30,3 @@
    <console/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-block.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-block.xml
@@ -20,4 +20,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml
@@ -21,4 +21,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml
@@ -21,4 +21,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml
@@ -21,4 +21,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml
@@ -21,4 +21,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml
@@ -21,4 +21,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-disk-file.xml
+++ b/tests/xml2sexprdata/xml2sexpr-disk-file.xml
@@ -20,4 +20,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml
@@ -22,4 +22,3 @@
    <console tty='/dev/pts/4'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml
@@ -34,4 +34,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml
@@ -37,4 +37,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml
@@ -37,4 +37,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml
@@ -36,4 +36,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml
@@ -37,4 +37,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml
@@ -36,4 +36,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml
@@ -36,4 +36,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml
@@ -38,4 +38,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml
@@ -37,4 +37,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml
@@ -38,4 +38,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml
@@ -37,4 +37,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml
@@ -38,4 +38,3 @@
    <sound model='es1370'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml
@@ -34,4 +34,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml
@@ -34,4 +34,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.xml
@@ -34,4 +34,3 @@
    <graphics type='vnc' port='5917' keymap='ja'/>
  </devices>
 </domain>
-
--- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml
--- a/tests/xml2sexprdata/xml2sexpr-fv.xml
+++ b/tests/xml2sexprdata/xml2sexpr-fv.xml
--- a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
+++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml
--- a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
+++ b/tests/xml2sexprdata/xml2sexpr-net-e1000.xml
--- a/tests/xml2sexprdata/xml2sexpr-net-routed.xml
+++ b/tests/xml2sexprdata/xml2sexpr-net-routed.xml
--- a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
+++ b/tests/xml2sexprdata/xml2sexpr-pci-devs.xml
--- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
+++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml
--- a/tests/xml2sexprdata/xml2sexpr-pv.xml
+++ b/tests/xml2sexprdata/xml2sexpr-pv.xml
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c