提交 07613d20 编写于 作者: J Jim Meyering

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.
上级 4a7acedd
...@@ -506,5 +506,3 @@ if necessary. Here is a sample; alter the names: ...@@ -506,5 +506,3 @@ if necessary. Here is a sample; alter the names:
Ty Coon, President of Vice Ty Coon, President of Vice
That's all there is to it! That's all there is to it!
...@@ -1078,4 +1078,3 @@ ...@@ -1078,4 +1078,3 @@
- First release - First release
- Basic management of existing Xen domains - Basic management of existing Xen domains
- Minimal autogenerated Python bindings - Minimal autogenerated Python bindings
...@@ -107,4 +107,3 @@ if test -n "$PKG_CONFIG"; then ...@@ -107,4 +107,3 @@ if test -n "$PKG_CONFIG"; then
fi fi
fi[]dnl fi[]dnl
])]) ])])
...@@ -42,4 +42,3 @@ index f7ebbc3..b8f9128 100644 ...@@ -42,4 +42,3 @@ index f7ebbc3..b8f9128 100644
# .... define new API here using predicted next version number .... # .... define new API here using predicted next version number ....
-- --
1.6.0.6 1.6.0.6
...@@ -34,4 +34,3 @@ index 39dc413..c357b76 100644 ...@@ -34,4 +34,3 @@ index 39dc413..c357b76 100644
/* /*
-- --
1.6.0.6 1.6.0.6
...@@ -117,4 +117,3 @@ index f3d4484..ded18a7 100644 ...@@ -117,4 +117,3 @@ index f3d4484..ded18a7 100644
*/ */
-- --
1.6.0.6 1.6.0.6
...@@ -45,4 +45,3 @@ index 2d8e6a2..2c79949 100644 ...@@ -45,4 +45,3 @@ index 2d8e6a2..2c79949 100644
/* Custom RPC structure. */ /* Custom RPC structure. */
-- --
1.6.0.6 1.6.0.6
...@@ -82,4 +82,3 @@ index 4b3afb0..e665ef8 100644 ...@@ -82,4 +82,3 @@ index 4b3afb0..e665ef8 100644
-- --
1.6.0.6 1.6.0.6
...@@ -68,4 +68,3 @@ index e27820f..8d24a3a 100644 ...@@ -68,4 +68,3 @@ index e27820f..8d24a3a 100644
**************************/ **************************/
-- --
1.6.0.6 1.6.0.6
...@@ -1169,4 +1169,3 @@ index 29cdb9e..7621212 100644 ...@@ -1169,4 +1169,3 @@ index 29cdb9e..7621212 100644
if (!(actual = virNodeDeviceDefFormat(NULL, dev))) if (!(actual = virNodeDeviceDefFormat(NULL, dev)))
-- --
1.6.0.6 1.6.0.6
...@@ -130,4 +130,3 @@ index cb32ede..ab2a2b7 100644 ...@@ -130,4 +130,3 @@ index cb32ede..ab2a2b7 100644
{"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build}, {"pool-build", cmdPoolBuild, opts_pool_build, info_pool_build},
-- --
1.6.0.6 1.6.0.6
...@@ -123,5 +123,3 @@ ...@@ -123,5 +123,3 @@
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>
...@@ -575,5 +575,3 @@ it indexes the project page, the APIs as well as the mailing-list archives. </p> ...@@ -575,5 +575,3 @@ it indexes the project page, the APIs as well as the mailing-list archives. </p>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>
...@@ -12,4 +12,3 @@ domrestore.py - restore domU's from their saved files in a directory ...@@ -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 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 expects, and will have to be adapted for your setup. They are only needed
for domstart.py for domstart.py
...@@ -82,5 +82,3 @@ for d in devs: ...@@ -82,5 +82,3 @@ for d in devs:
elif type == "bridge": elif type == "bridge":
print_xml("Source:", ctx, "source/@bridge") print_xml("Source:", ctx, "source/@bridge")
print_xml("MAC Addr:", ctx, "mac/@address") print_xml("MAC Addr:", ctx, "mac/@address")
...@@ -98,4 +98,3 @@ dependence to Xen code as the interfaces stabilize. ...@@ -98,4 +98,3 @@ dependence to Xen code as the interfaces stabilize.
Daniel Veillard <veillard@redhat.com> Daniel Veillard <veillard@redhat.com>
Mon Oct 24 18:40:19 CEST 2005 Mon Oct 24 18:40:19 CEST 2005
...@@ -44,4 +44,3 @@ ...@@ -44,4 +44,3 @@
<xsl:template match="p"> <xsl:template match="p">
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>
...@@ -299,4 +299,3 @@ ...@@ -299,4 +299,3 @@
</define> </define>
</grammar> </grammar>
...@@ -9,4 +9,3 @@ ...@@ -9,4 +9,3 @@
</dhcp> </dhcp>
</ip> </ip>
</network> </network>
...@@ -8,4 +8,3 @@ ...@@ -8,4 +8,3 @@
</dhcp> </dhcp>
</ip> </ip>
</network> </network>
...@@ -212,4 +212,3 @@ def main(): ...@@ -212,4 +212,3 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
main() main()
...@@ -185,4 +185,3 @@ PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node); ...@@ -185,4 +185,3 @@ PyObject * libvirt_virNodeDevicePtrWrap(virNodeDevicePtr node);
if (PyEval_ThreadsInitialized()) \ if (PyEval_ThreadsInitialized()) \
PyGILState_Release(_save); \ PyGILState_Release(_save); \
} LIBVIRT_STMT_END } LIBVIRT_STMT_END
...@@ -60,4 +60,3 @@ While the helper method is executing, no locks are held on either ...@@ -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' the client or server, but the ref count on the 'struct qemud_client'
object is incremented to ensure its not deleted. The helper can object is incremented to ensure its not deleted. The helper can
now safely invoke the neccessary libvirt API call. now safely invoke the neccessary libvirt API call.
...@@ -43,4 +43,3 @@ module Libvirtd_qemu = ...@@ -43,4 +43,3 @@ module Libvirtd_qemu =
. Util.stdexcl . Util.stdexcl
let xfm = transform lns filter let xfm = transform lns filter
...@@ -790,4 +790,3 @@ int virLogParseFilters(const char *filters) { ...@@ -790,4 +790,3 @@ int virLogParseFilters(const char *filters) {
} }
return(ret); return(ret);
} }
...@@ -57,4 +57,3 @@ virCapsPtr lxcCapsInit(void); ...@@ -57,4 +57,3 @@ virCapsPtr lxcCapsInit(void);
__FUNCTION__, __LINE__, fmt) __FUNCTION__, __LINE__, fmt)
#endif /* LXC_CONF_H */ #endif /* LXC_CONF_H */
...@@ -948,4 +948,3 @@ void virNetworkObjUnlock(virNetworkObjPtr obj) ...@@ -948,4 +948,3 @@ void virNetworkObjUnlock(virNetworkObjPtr obj)
{ {
virMutexUnlock(&obj->lock); virMutexUnlock(&obj->lock);
} }
...@@ -186,4 +186,3 @@ void virNetworkObjLock(virNetworkObjPtr obj); ...@@ -186,4 +186,3 @@ void virNetworkObjLock(virNetworkObjPtr obj);
void virNetworkObjUnlock(virNetworkObjPtr obj); void virNetworkObjUnlock(virNetworkObjPtr obj);
#endif /* __NETWORK_CONF_H__ */ #endif /* __NETWORK_CONF_H__ */
...@@ -331,5 +331,3 @@ unsigned long long nodeGetFreeMemory(virConnectPtr conn) ...@@ -331,5 +331,3 @@ unsigned long long nodeGetFreeMemory(virConnectPtr conn)
return 0; return 0;
} }
#endif #endif
...@@ -207,5 +207,3 @@ void c_oneFree() ...@@ -207,5 +207,3 @@ void c_oneFree()
xmlrpc_env_clean(&one_client.env); xmlrpc_env_clean(&one_client.env);
xmlrpc_client_cleanup(); xmlrpc_client_cleanup();
} }
...@@ -60,5 +60,3 @@ void c_oneFree(void); ...@@ -60,5 +60,3 @@ void c_oneFree(void);
#endif /* ONE_CLIENT_H_ */ #endif /* ONE_CLIENT_H_ */
...@@ -282,4 +282,3 @@ no_memory: ...@@ -282,4 +282,3 @@ no_memory:
VIR_FREE(tmp); VIR_FREE(tmp);
return NULL; return NULL;
}; };
...@@ -50,4 +50,3 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def); ...@@ -50,4 +50,3 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def);
__FUNCTION__, __LINE__, fmt) __FUNCTION__, __LINE__, fmt)
#endif /* ONE_CONF_H */ #endif /* ONE_CONF_H */
...@@ -2996,4 +2996,3 @@ cleanup: ...@@ -2996,4 +2996,3 @@ cleanup:
return def; return def;
} }
...@@ -694,4 +694,3 @@ virStorageBackendRunProgNul(virConnectPtr conn, ...@@ -694,4 +694,3 @@ virStorageBackendRunProgNul(virConnectPtr conn,
return -1; return -1;
} }
#endif #endif
...@@ -242,4 +242,3 @@ void VBoxCGlueTerm(void) ...@@ -242,4 +242,3 @@ void VBoxCGlueTerm(void)
g_pfnGetFunctions = NULL; g_pfnGetFunctions = NULL;
memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg)); memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg));
} }
...@@ -55,4 +55,3 @@ void VBoxCGlueTerm(void); ...@@ -55,4 +55,3 @@ void VBoxCGlueTerm(void);
#endif #endif
#endif #endif
...@@ -216,4 +216,3 @@ error_out: ...@@ -216,4 +216,3 @@ error_out:
VIR_FREE(pid); VIR_FREE(pid);
return rc; return rc;
} }
...@@ -107,5 +107,3 @@ ...@@ -107,5 +107,3 @@
</guest> </guest>
</capabilities> </capabilities>
...@@ -67,5 +67,3 @@ ...@@ -67,5 +67,3 @@
</guest> </guest>
</capabilities> </capabilities>
...@@ -218,5 +218,3 @@ tls_allowed_dn_list = ["DN1", "DN2"] ...@@ -218,5 +218,3 @@ tls_allowed_dn_list = ["DN1", "DN2"]
# #
# By default, no Username's are checked # By default, no Username's are checked
sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ] sasl_allowed_username_list = ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ]
...@@ -11,5 +11,3 @@ ...@@ -11,5 +11,3 @@
<size>15626928128</size> <size>15626928128</size>
</capability> </capability>
</device> </device>
...@@ -43,4 +43,3 @@ clflush size : 64 ...@@ -43,4 +43,3 @@ clflush size : 64
cache_alignment : 128 cache_alignment : 128
address sizes : 36 bits physical, 48 bits virtual address sizes : 36 bits physical, 48 bits virtual
power management: power management:
...@@ -45,4 +45,3 @@ clflush size : 64 ...@@ -45,4 +45,3 @@ clflush size : 64
cache_alignment : 64 cache_alignment : 64
address sizes : 40 bits physical, 48 bits virtual address sizes : 40 bits physical, 48 bits virtual
power management: ts fid vid ttp tm stc power management: ts fid vid ttp tm stc
...@@ -93,4 +93,3 @@ clflush size : 64 ...@@ -93,4 +93,3 @@ clflush size : 64
cache_alignment : 64 cache_alignment : 64
address sizes : 48 bits physical, 48 bits virtual address sizes : 48 bits physical, 48 bits virtual
power management: ts ttp tm stc 100mhzsteps hwpstate [8] power management: ts ttp tm stc 100mhzsteps hwpstate [8]
...@@ -93,4 +93,3 @@ clflush size : 64 ...@@ -93,4 +93,3 @@ clflush size : 64
cache_alignment : 64 cache_alignment : 64
address sizes : 40 bits physical, 48 bits virtual address sizes : 40 bits physical, 48 bits virtual
power management: ts fid vid ttp tm stc power management: ts fid vid ttp tm stc
...@@ -93,4 +93,3 @@ clflush size : 64 ...@@ -93,4 +93,3 @@ clflush size : 64
cache_alignment : 64 cache_alignment : 64
address sizes : 40 bits physical, 48 bits virtual address sizes : 40 bits physical, 48 bits virtual
power management: ts fid vid ttp tm stc power management: ts fid vid ttp tm stc
...@@ -112,4 +112,3 @@ mymain(int argc, char **argv) ...@@ -112,4 +112,3 @@ mymain(int argc, char **argv)
#endif /* __linux__ */ #endif /* __linux__ */
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
...@@ -823,5 +823,3 @@ let () = ...@@ -823,5 +823,3 @@ let () =
) )
| _ -> () | _ -> ()
) file.globals; ) file.globals;
...@@ -52,4 +52,3 @@ int main(void) { ...@@ -52,4 +52,3 @@ int main(void) {
exit(0); exit(0);
} }
(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'))) (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')))
(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')))) (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'))))
(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')))) (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'))))
(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')))) (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'))))
(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')))) (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'))))
(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')))) (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'))))
(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')))) (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'))))
(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'))) (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')))
(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')))) (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'))))
(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')))) (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'))))
(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))))) (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)))))
(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))))) (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)))))
(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')))) (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'))))
(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')))) (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'))))
...@@ -173,4 +173,3 @@ mymain(int argc, char **argv) ...@@ -173,4 +173,3 @@ mymain(int argc, char **argv)
} }
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
...@@ -17,4 +17,3 @@ ...@@ -17,4 +17,3 @@
</permissions> </permissions>
</target> </target>
</pool> </pool>
...@@ -18,4 +18,3 @@ ...@@ -18,4 +18,3 @@
</permissions> </permissions>
</target> </target>
</pool> </pool>
...@@ -18,4 +18,3 @@ ...@@ -18,4 +18,3 @@
</permissions> </permissions>
</target> </target>
</volume> </volume>
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
#include "capabilities.h" #include "capabilities.h"
virCapsPtr testQemuCapsInit(void); virCapsPtr testQemuCapsInit(void);
...@@ -2,4 +2,3 @@ ...@@ -2,4 +2,3 @@
#include "capabilities.h" #include "capabilities.h"
virCapsPtr testXenCapsInit(void); virCapsPtr testXenCapsInit(void);
...@@ -35,4 +35,3 @@ cpuid level : 10 ...@@ -35,4 +35,3 @@ cpuid level : 10
wp : yes 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 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 bogomips : 5821.44
...@@ -16,5 +16,3 @@ cpuid level : 10 ...@@ -16,5 +16,3 @@ cpuid level : 10
wp : yes 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 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 bogomips : 5821.44
...@@ -16,4 +16,3 @@ cpuid level : 10 ...@@ -16,4 +16,3 @@ cpuid level : 10
wp : yes 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 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 bogomips : 5821.44
...@@ -222,4 +222,3 @@ mymain(int argc, char **argv) ...@@ -222,4 +222,3 @@ mymain(int argc, char **argv)
} }
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
...@@ -240,4 +240,3 @@ mymain(int argc, char **argv) ...@@ -240,4 +240,3 @@ mymain(int argc, char **argv)
} }
VIRT_TEST_MAIN(mymain) VIRT_TEST_MAIN(mymain)
...@@ -27,4 +27,3 @@ ...@@ -27,4 +27,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -30,4 +30,3 @@ ...@@ -30,4 +30,3 @@
<console/> <console/>
</devices> </devices>
</domain> </domain>
...@@ -20,4 +20,3 @@ ...@@ -20,4 +20,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -21,4 +21,3 @@ ...@@ -21,4 +21,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -21,4 +21,3 @@ ...@@ -21,4 +21,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -21,4 +21,3 @@ ...@@ -21,4 +21,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -21,4 +21,3 @@ ...@@ -21,4 +21,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -21,4 +21,3 @@ ...@@ -21,4 +21,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -20,4 +20,3 @@ ...@@ -20,4 +20,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -22,4 +22,3 @@ ...@@ -22,4 +22,3 @@
<console tty='/dev/pts/4'/> <console tty='/dev/pts/4'/>
</devices> </devices>
</domain> </domain>
...@@ -34,4 +34,3 @@ ...@@ -34,4 +34,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -37,4 +37,3 @@ ...@@ -37,4 +37,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -37,4 +37,3 @@ ...@@ -37,4 +37,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -36,4 +36,3 @@ ...@@ -36,4 +36,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -37,4 +37,3 @@ ...@@ -37,4 +37,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -36,4 +36,3 @@ ...@@ -36,4 +36,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -36,4 +36,3 @@ ...@@ -36,4 +36,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -38,4 +38,3 @@ ...@@ -38,4 +38,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -37,4 +37,3 @@ ...@@ -37,4 +37,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -38,4 +38,3 @@ ...@@ -38,4 +38,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -37,4 +37,3 @@ ...@@ -37,4 +37,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -38,4 +38,3 @@ ...@@ -38,4 +38,3 @@
<sound model='es1370'/> <sound model='es1370'/>
</devices> </devices>
</domain> </domain>
...@@ -34,4 +34,3 @@ ...@@ -34,4 +34,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -34,4 +34,3 @@ ...@@ -34,4 +34,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
...@@ -34,4 +34,3 @@ ...@@ -34,4 +34,3 @@
<graphics type='vnc' port='5917' keymap='ja'/> <graphics type='vnc' port='5917' keymap='ja'/>
</devices> </devices>
</domain> </domain>
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册