[Pkg-libvirt-commits] [libvirt] 02/06: Merge tag 'debian/1.2.8-3' into bpo/wheezy
Guido Guenther
agx at moszumanska.debian.org
Tue Oct 28 17:54:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
agx pushed a commit to annotated tag debian/1.2.9-3_bpo70+1
in repository libvirt.
commit dee3962aebe816381e1e4b2e903425e48185b5a9
Merge: b290c24 993d018
Author: Guido Günther <agx at sigxcpu.org>
Date: Mon Sep 29 19:21:45 2014 +0200
Merge tag 'debian/1.2.8-3' into bpo/wheezy
libvirt Debian release 1.2.8-3
Conflicts:
debian/control
AUTHORS | 21 +
AUTHORS.in | 1 +
ChangeLog | 17074 ++++++++++++++----
Makefile.am | 7 +-
Makefile.in | 17 +-
autogen.sh | 2 +-
cfg.mk | 60 +-
config.h.in | 47 +-
configure | 584 +-
configure.ac | 80 +-
daemon/Makefile.am | 14 +-
daemon/Makefile.in | 16 +-
daemon/libvirtd.8.in | 2 +-
daemon/libvirtd.c | 107 +-
daemon/libvirtd.conf | 15 +
daemon/libvirtd.service.in | 5 -
daemon/libvirtd.socket.in | 11 +
daemon/remote.c | 413 +-
daemon/remote_dispatch.h | 438 +-
debian/changelog | 210 +
debian/control | 94 +-
debian/copyright | 113 +-
debian/libvirt-bin.default | 17 -
debian/libvirt-bin.init | 232 -
debian/libvirt-bin.install | 14 -
debian/libvirt-bin.links | 1 +
debian/libvirt-bin.maintscript | 3 +
debian/libvirt-bin.postinst | 122 -
debian/libvirt-bin.postrm | 54 -
debian/libvirt-bin.preinst | 43 +
debian/libvirt-clients.install | 3 +
debian/libvirt-clients.links | 1 +
...bvirt-bin.manpages => libvirt-clients.manpages} | 0
...libvirt-bin.dirs => libvirt-daemon-system.dirs} | 0
...bin.examples => libvirt-daemon-system.examples} | 0
debian/libvirt-daemon-system.install | 3 +
debian/libvirt-daemon-system.libvirtd.default | 17 +
debian/libvirt-daemon-system.libvirtd.init | 232 +
debian/libvirt-daemon-system.links | 1 +
debian/libvirt-daemon-system.maintscript | 10 +
debian/libvirt-daemon-system.postinst | 129 +
debian/libvirt-daemon-system.postrm | 65 +
debian/libvirt-daemon-system.preinst | 46 +
debian/{libvirt-bin.NEWS => libvirt-daemon.NEWS} | 0
debian/libvirt-daemon.install | 6 +
debian/libvirt-daemon.links | 2 +
debian/libvirt-dev.links | 1 +
debian/libvirt-doc.links | 1 +
debian/libvirt-sanlock.links | 1 +
debian/libvirt0-dbg.links | 1 +
debian/libvirt0.symbols | 9 +-
...Allow-xen-toolstack-to-find-it-s-binaries.patch | 6 +-
debian/patches/Include-param.h-on-kFreeBSD.patch | 21 -
...duce-udevadm-settle-timeout-to-10-seconds.patch | 4 +-
.../Allow-libvirt-group-to-access-the-socket.patch | 10 +-
.../patches/debian/Debianize-libvirt-guests.patch | 8 +-
.../debian/Debianize-systemd-service-files.patch | 19 +-
debian/patches/debian/Debianize-virtlockd.patch | 21 +
.../Don-t-enable-default-network-on-boot.patch | 8 +-
.../debian/Use-sensible-editor-as-fallback.patch | 22 +
.../fix-Debian-specific-path-to-hvm-loader.patch | 2 +-
debian/patches/debian/remove-RHism.diff.patch | 4 +-
...onitorTextGetMigrationStatus-to-intercept.patch | 2 +-
...emove-capabilities.monitor.sock-when-done.patch | 23 +
...33-qemu-blkiotune-Use-correct-definition-.patch | 43 +
...03-Don-t-expand-entities-when-parsing-XML.patch | 35 -
debian/patches/series | 6 +-
debian/rules | 69 +-
debian/upstream/signing-key.asc | 56 +
debian/watch | 2 +-
docs/Makefile.in | 2 +
docs/acl.html | 2 +-
docs/aclperms.htmlinc | 8 +
docs/api.html | 4 +
docs/api.html.in | 4 +
docs/apibuild.py | 4 +-
docs/apps.html | 4 +
docs/apps.html.in | 6 +
docs/auditlog.html | 24 +
docs/auditlog.html.in | 35 +
docs/devhelp/libvirt-libvirt.html | 854 +-
docs/devhelp/libvirt-virterror.html | 1 +
docs/devhelp/libvirt.devhelp | 52 +
docs/drvbhyve.html | 36 +-
docs/drvbhyve.html.in | 36 +-
docs/drvesx.html | 4 +-
docs/drvesx.html.in | 4 +-
docs/drvlxc.html | 51 +
docs/drvlxc.html.in | 47 +
docs/format.html | 4 +
docs/formatcaps.html | 131 +-
docs/formatcaps.html.in | 179 +-
docs/formatdomain.html | 480 +-
docs/formatdomain.html.in | 552 +-
docs/formatdomaincaps.html | 366 +
docs/formatdomaincaps.html.in | 232 +
docs/formatnetwork.html | 4 +
docs/formatnode.html | 44 +-
docs/formatnode.html.in | 44 +
docs/formatnwfilter.html | 20 +-
docs/formatnwfilter.html.in | 37 +-
docs/formatsecret.html | 4 +
docs/formatsnapshot.html | 12 +-
docs/formatsnapshot.html.in | 8 +-
docs/formatstorage.html | 137 +-
docs/formatstorage.html.in | 158 +-
docs/formatstorageencryption.html | 4 +
docs/generic.css | 1 -
docs/hacking.html | 13 +-
docs/hacking.html.in | 13 +-
docs/html/libvirt-libvirt.html | 280 +-
docs/html/libvirt-virterror.html | 2 +-
docs/hvsupport.html | 4 +-
docs/hvsupport.html.in | 768 +-
docs/hvsupport.pl | 2 +-
docs/java.html | 4 +-
docs/java.html.in | 4 +-
docs/libvirt-api.xml | 913 +-
docs/libvirt-refs.xml | 1858 +-
docs/libvirt.css | 2 -
docs/news.html | 1039 ++
docs/news.html.in | 1091 ++
docs/schemas/Makefile.am | 1 +
docs/schemas/Makefile.in | 3 +
docs/schemas/basictypes.rng | 55 +-
docs/schemas/capability.rng | 36 +
docs/schemas/domaincaps.rng | 90 +
docs/schemas/domaincommon.rng | 501 +-
docs/schemas/interface.rng | 293 +-
docs/schemas/nodedev.rng | 46 +
docs/schemas/storagepool.rng | 64 +-
docs/schemas/storagevol.rng | 5 +
docs/sitemap.html | 3 +
docs/sitemap.html.in | 4 +
docs/storage.html | 32 +
docs/storage.html.in | 34 +
examples/apparmor/Makefile.am | 6 +-
examples/apparmor/Makefile.in | 8 +-
examples/apparmor/TEMPLATE | 9 -
examples/apparmor/TEMPLATE.lxc | 15 +
examples/apparmor/TEMPLATE.qemu | 9 +
examples/apparmor/libvirt-lxc | 119 +-
examples/dominfo/Makefile.in | 2 +
examples/dommigrate/Makefile.in | 2 +
examples/domsuspend/Makefile.in | 2 +
examples/domtop/Makefile.am | 29 +
examples/domtop/Makefile.in | 2068 +++
examples/domtop/domtop.c | 406 +
examples/hellolibvirt/Makefile.in | 2 +
examples/lxcconvert/Makefile.am | 18 +
examples/lxcconvert/Makefile.in | 1904 ++
examples/lxcconvert/virt-lxc-convert | 127 +
examples/object-events/Makefile.in | 2 +
examples/object-events/event-test.c | 2 +-
examples/openauth/Makefile.in | 2 +
examples/systemtap/Makefile.in | 2 +
examples/xml/nwfilter/Makefile.in | 2 +
examples/xml/test/testdomfv0.xml | 1 -
examples/xml/test/testnodeinline.xml | 1 -
gnulib/lib/Makefile.in | 2 +
gnulib/lib/chown.c | 5 -
gnulib/lib/fcntl.in.h | 16 +
gnulib/lib/isatty.c | 8 +-
gnulib/lib/langinfo.in.h | 18 +
gnulib/lib/mbrtowc.c | 7 +-
gnulib/lib/mktime.c | 4 +-
gnulib/lib/nl_langinfo.c | 233 +-
gnulib/lib/poll.c | 8 +-
gnulib/lib/regcomp.c | 14 +-
gnulib/lib/regex.h | 2 +-
gnulib/lib/regex_internal.h | 4 +-
gnulib/lib/select.c | 36 +-
gnulib/tests/Makefile.in | 2 +
gnulib/tests/test-isnanl.h | 9 +
gnulib/tests/test-mbrtowc.c | 5 +-
gnulib/tests/test-signbit.c | 10 +
gnulib/tests/xalloc.h | 2 +-
include/Makefile.in | 2 +
include/libvirt/Makefile.in | 2 +
include/libvirt/libvirt.h | 259 +-
include/libvirt/libvirt.h.in | 257 +-
include/libvirt/virterror.h | 2 +
libvirt-lxc.pc.in | 14 +
libvirt-qemu.pc.in | 14 +
libvirt.pc.in | 5 +-
libvirt.spec | 225 +-
libvirt.spec.in | 223 +-
m4/dup2.m4 | 12 +-
m4/fcntl.m4 | 12 +-
m4/gnulib-common.m4 | 12 +-
m4/gnulib-comp.m4 | 2 +
m4/mbrtowc.m4 | 46 +-
m4/printf.m4 | 18 +-
m4/pthread_sigmask.m4 | 85 +-
m4/virt-compile-warnings.m4 | 36 +-
m4/virt-driver-bhyve.m4 | 2 +-
m4/virt-numactl.m4 | 4 +
m4/virt-selinux.m4 | 16 +-
maint.mk | 13 +-
mingw-libvirt.spec.in | 6 +
po/POTFILES.in | 17 +-
po/af.gmo | Bin 16830 -> 16877 bytes
po/af.po | 16322 +++++++++--------
po/am.gmo | Bin 16829 -> 16874 bytes
po/am.po | 16322 +++++++++--------
po/ar.gmo | Bin 16913 -> 16957 bytes
po/ar.po | 16322 +++++++++--------
po/as.gmo | Bin 1102115 -> 1089460 bytes
po/as.po | 16736 +++++++++--------
po/be.gmo | Bin 16904 -> 16952 bytes
po/be.po | 16322 +++++++++--------
po/bg.gmo | Bin 39398 -> 38890 bytes
po/bg.po | 16356 +++++++++--------
po/bn.gmo | Bin 16830 -> 16875 bytes
po/bn.po | 16322 +++++++++--------
po/bn_IN.gmo | Bin 435407 -> 430163 bytes
po/bn_IN.po | 16655 +++++++++--------
po/bo.gmo | Bin 455 -> 455 bytes
po/bo.po | 15876 ++++++++--------
po/bs.gmo | Bin 17908 -> 17953 bytes
po/bs.po | 16326 +++++++++--------
po/ca.gmo | Bin 36827 -> 36408 bytes
po/ca.po | 16179 +++++++++--------
po/cs.gmo | Bin 105108 -> 104588 bytes
po/cs.po | 16367 +++++++++--------
po/cy.gmo | Bin 16875 -> 16918 bytes
po/cy.po | 16322 +++++++++--------
po/da.gmo | Bin 23497 -> 23343 bytes
po/da.po | 16342 +++++++++--------
po/de.gmo | Bin 754377 -> 745635 bytes
po/de.po | 16736 +++++++++--------
po/el.gmo | Bin 28163 -> 28118 bytes
po/el.po | 16422 +++++++++--------
po/en_GB.gmo | Bin 698631 -> 690703 bytes
po/en_GB.po | 16781 +++++++++--------
po/es.gmo | Bin 750629 -> 742110 bytes
po/es.po | 16847 +++++++++--------
po/et.gmo | Bin 16830 -> 16876 bytes
po/et.po | 16322 +++++++++--------
po/eu_ES.gmo | Bin 16833 -> 16888 bytes
po/eu_ES.po | 16322 +++++++++--------
po/fa.gmo | Bin 16823 -> 16868 bytes
po/fa.po | 16322 +++++++++--------
po/fi.gmo | Bin 29536 -> 29154 bytes
po/fi.po | 16330 +++++++++--------
po/fr.gmo | Bin 129044 -> 127089 bytes
po/fr.po | 16410 +++++++++--------
po/gl.gmo | Bin 16830 -> 16876 bytes
po/gl.po | 16322 +++++++++--------
po/gu.gmo | Bin 1118097 -> 1105236 bytes
po/gu.po | 17088 ++++++++++--------
po/he.gmo | Bin 16830 -> 16874 bytes
po/he.po | 16322 +++++++++--------
po/hi.gmo | Bin 635444 -> 628447 bytes
po/hi.po | 16546 +++++++++--------
po/hr.gmo | Bin 30501 -> 30155 bytes
po/hr.po | 16362 +++++++++--------
po/hu.gmo | Bin 25876 -> 25674 bytes
po/hu.po | 16326 +++++++++--------
po/hy.gmo | Bin 16830 -> 16876 bytes
po/hy.po | 16322 +++++++++--------
po/id.gmo | Bin 16672 -> 16516 bytes
po/id.po | 16320 +++++++++--------
po/is.gmo | Bin 16830 -> 16877 bytes
po/is.po | 16322 +++++++++--------
po/it.gmo | Bin 201559 -> 199706 bytes
po/it.po | 16478 +++++++++--------
po/ja.gmo | Bin 879023 -> 868689 bytes
po/ja.po | 16695 +++++++++--------
po/ka.gmo | Bin 16823 -> 16869 bytes
po/ka.po | 16322 +++++++++--------
po/kn.gmo | Bin 1242809 -> 1228405 bytes
po/kn.po | 16662 +++++++++--------
po/ko.gmo | Bin 421726 -> 417424 bytes
po/ko.po | 16725 +++++++++--------
po/ku.gmo | Bin 16830 -> 16875 bytes
po/ku.po | 16322 +++++++++--------
po/libvirt.pot | 15878 ++++++++--------
po/lo.gmo | Bin 16823 -> 16864 bytes
po/lo.po | 16322 +++++++++--------
po/lt.gmo | Bin 16893 -> 16941 bytes
po/lt.po | 16322 +++++++++--------
po/lv.gmo | Bin 16865 -> 16910 bytes
po/lv.po | 16322 +++++++++--------
po/mk.gmo | Bin 36863 -> 36366 bytes
po/mk.po | 16354 +++++++++--------
po/ml.gmo | Bin 1332357 -> 1316798 bytes
po/ml.po | 17107 ++++++++++--------
po/mr.gmo | Bin 1065079 -> 1053034 bytes
po/mr.po | 17074 ++++++++++--------
po/ms.gmo | Bin 3156 -> 3030 bytes
po/ms.po | 16265 +++++++++--------
po/my.gmo | Bin 16823 -> 16868 bytes
po/my.po | 16322 +++++++++--------
po/nb.gmo | Bin 9818 -> 9873 bytes
po/nb.po | 16314 +++++++++--------
po/nl.gmo | Bin 293735 -> 291943 bytes
po/nl.po | 16582 +++++++++--------
po/nn.gmo | Bin 16830 -> 16885 bytes
po/nn.po | 16322 +++++++++--------
po/nso.gmo | Bin 16830 -> 16883 bytes
po/nso.po | 16322 +++++++++--------
po/or.gmo | Bin 857898 -> 848513 bytes
po/or.po | 16912 +++++++++--------
po/pa.gmo | Bin 1015864 -> 1004156 bytes
po/pa.po | 16637 +++++++++--------
po/pl.gmo | Bin 318662 -> 316453 bytes
po/pl.po | 16588 +++++++++--------
po/pt.gmo | Bin 32169 -> 31711 bytes
po/pt.po | 16137 +++++++++--------
po/pt_BR.gmo | Bin 760247 -> 751452 bytes
po/pt_BR.po | 18003 ++++++++++---------
po/ro.gmo | Bin 16871 -> 16917 bytes
po/ro.po | 16322 +++++++++--------
po/ru.gmo | Bin 777224 -> 769218 bytes
po/ru.po | 16620 +++++++++--------
po/si.gmo | Bin 16830 -> 16875 bytes
po/si.po | 16322 +++++++++--------
po/sk.gmo | Bin 16857 -> 16901 bytes
po/sk.po | 16322 +++++++++--------
po/sl.gmo | Bin 16882 -> 16929 bytes
po/sl.po | 16322 +++++++++--------
po/sq.gmo | Bin 16830 -> 16876 bytes
po/sq.po | 16322 +++++++++--------
po/sr.gmo | Bin 73348 -> 72753 bytes
po/sr.po | 16392 +++++++++--------
po/sr at latin.gmo | Bin 57894 -> 57471 bytes
po/sr at latin.po | 16392 +++++++++--------
po/sv.gmo | Bin 67100 -> 66345 bytes
po/sv.po | 16401 +++++++++--------
po/ta.gmo | Bin 1284011 -> 1269340 bytes
po/ta.po | 17111 ++++++++++--------
po/te.gmo | Bin 1132881 -> 1119845 bytes
po/te.po | 16655 +++++++++--------
po/th.gmo | Bin 16823 -> 16865 bytes
po/th.po | 16322 +++++++++--------
po/tr.gmo | Bin 16823 -> 16868 bytes
po/tr.po | 16322 +++++++++--------
po/uk.gmo | Bin 1104615 -> 1168931 bytes
po/uk.po | 16629 +++++++++--------
po/ur.gmo | Bin 16830 -> 16872 bytes
po/ur.po | 16322 +++++++++--------
po/vi.gmo | Bin 281219 -> 279424 bytes
po/vi.po | 16628 +++++++++--------
po/vi_VN.gmo | Bin 281279 -> 279436 bytes
po/vi_VN.po | 16625 +++++++++--------
po/zh_CN.gmo | Bin 655184 -> 647644 bytes
po/zh_CN.po | 16711 +++++++++--------
po/zh_TW.gmo | Bin 21732 -> 21529 bytes
po/zh_TW.po | 16322 +++++++++--------
po/zu.gmo | Bin 16830 -> 16872 bytes
po/zu.po | 16322 +++++++++--------
run.in | 7 +
src/Makefile.am | 143 +-
src/Makefile.in | 1515 +-
src/access/org.libvirt.api.policy | 20 +-
src/access/viraccessapicheck.c | 202 +-
src/access/viraccessapicheck.h | 10 +
src/access/viraccessperm.c | 7 +-
src/access/viraccessperm.h | 15 +-
src/bhyve/bhyve_capabilities.c | 2 +-
src/bhyve/bhyve_command.c | 218 +-
src/bhyve/bhyve_command.h | 13 +-
src/bhyve/bhyve_device.c | 174 +
src/bhyve/bhyve_device.h | 38 +
src/bhyve/bhyve_domain.c | 75 +
src/bhyve/bhyve_domain.h | 39 +
src/bhyve/bhyve_driver.c | 280 +-
src/bhyve/bhyve_process.c | 157 +-
src/bhyve/bhyve_process.h | 5 +
src/bhyve/bhyve_utils.h | 4 +
src/conf/capabilities.c | 72 +-
src/conf/capabilities.h | 46 +-
src/conf/cpu_conf.c | 49 +-
src/conf/cpu_conf.h | 25 +-
src/conf/device_conf.c | 68 +-
src/conf/device_conf.h | 29 +-
src/conf/domain_addr.c | 720 +
src/conf/domain_addr.h | 176 +
src/conf/domain_audit.c | 350 +-
src/conf/domain_audit.h | 11 +-
src/conf/domain_capabilities.c | 254 +
src/conf/domain_capabilities.h | 103 +
src/conf/domain_conf.c | 2745 ++-
src/conf/domain_conf.h | 684 +-
src/conf/domain_event.c | 44 +-
src/conf/domain_event.h | 11 +
src/conf/interface_conf.c | 167 +-
src/conf/interface_conf.h | 28 +-
src/conf/network_conf.c | 51 +-
src/conf/network_conf.h | 29 +-
src/conf/node_device_conf.c | 234 +-
src/conf/node_device_conf.h | 36 +-
src/conf/numatune_conf.c | 614 +
src/conf/numatune_conf.h | 105 +
src/conf/nwfilter_conf.c | 35 +-
src/conf/nwfilter_conf.h | 50 +-
src/conf/nwfilter_params.c | 4 +-
src/conf/nwfilter_params.h | 14 +-
src/conf/secret_conf.c | 14 +-
src/conf/secret_conf.h | 4 +-
src/conf/snapshot_conf.c | 79 +-
src/conf/snapshot_conf.h | 18 +-
src/conf/storage_conf.c | 392 +-
src/conf/storage_conf.h | 112 +-
src/cpu/cpu.c | 12 +-
src/cpu/cpu.h | 9 +-
src/cpu/cpu_aarch64.c | 10 +-
src/cpu/cpu_arm.c | 14 +-
src/cpu/cpu_generic.c | 34 +-
src/cpu/cpu_map.c | 16 +-
src/cpu/cpu_map.h | 6 +-
src/cpu/cpu_map.xml | 13 +
src/cpu/cpu_powerpc.c | 14 +-
src/cpu/cpu_x86.c | 46 +-
src/datatypes.h | 2 +-
src/driver.c | 19 +-
src/driver.h | 83 +-
src/esx/esx_driver.c | 28 +-
src/esx/esx_storage_backend_iscsi.c | 47 +
src/esx/esx_storage_backend_vmfs.c | 1 +
src/esx/esx_util.c | 12 +-
src/esx/esx_vi.c | 34 +-
src/esx/esx_vi_methods.c | 4 +-
src/fdstream.c | 33 +-
src/fdstream.h | 5 +
src/hyperv/hyperv_wmi.c | 4 +-
src/interface/interface_backend_udev.c | 71 +-
src/internal.h | 43 +-
src/libvirt-lxc.pc.in | 18 +
src/libvirt-qemu.pc.in | 18 +
src/libvirt.c | 1145 +-
src/libvirt.pc.in | 23 +
src/libvirt_linux.syms | 3 -
src/libvirt_private.syms | 159 +-
src/libvirt_public.syms | 28 +
src/libvirt_remote.syms | 1 +
src/libvirt_xenconfig.syms | 26 +
src/libvirt_xenxs.syms | 26 -
src/libxl/libxl_conf.c | 203 +-
src/libxl/libxl_conf.h | 28 +-
src/libxl/libxl_domain.c | 94 +-
src/libxl/libxl_domain.h | 6 +
src/libxl/libxl_driver.c | 561 +-
src/libxl/libxl_migration.c | 591 +
src/libxl/libxl_migration.h | 79 +
src/locking/domain_lock.c | 65 +-
src/locking/domain_lock.h | 8 +
src/locking/lock_daemon.c | 47 +-
src/locking/lock_driver_lockd.c | 6 +-
src/locking/lock_driver_sanlock.c | 94 +-
src/locking/lockd.conf | 1 -
src/locking/sanlock.conf | 1 -
src/lxc/lxc_cgroup.c | 52 +-
src/lxc/lxc_conf.c | 6 +-
src/lxc/lxc_container.c | 318 +-
src/lxc/lxc_controller.c | 61 +-
src/lxc/lxc_driver.c | 300 +-
src/lxc/lxc_fuse.c | 4 +-
src/lxc/lxc_native.c | 68 +-
src/lxc/lxc_process.c | 31 +-
src/network/bridge_driver.c | 580 +-
src/network/leaseshelper.c | 371 +
src/node_device/node_device_driver.c | 9 +-
src/node_device/node_device_hal.c | 12 +-
src/node_device/node_device_linux_sysfs.c | 6 +
src/node_device/node_device_udev.c | 89 +-
src/nodeinfo.c | 425 +-
src/nodeinfo.h | 8 +-
src/nodeinfopriv.h | 1 +
src/nwfilter/nwfilter_dhcpsnoop.c | 2 +-
src/nwfilter/nwfilter_ebiptables_driver.c | 18 +-
src/nwfilter/nwfilter_gentech_driver.c | 63 +-
src/openvz/openvz_conf.c | 42 +-
src/openvz/openvz_driver.c | 19 +-
src/parallels/parallels_driver.c | 448 +-
src/parallels/parallels_network.c | 4 +-
src/parallels/parallels_storage.c | 2 +-
src/parallels/parallels_utils.h | 1 +
src/phyp/phyp_driver.c | 27 +-
src/qemu/libvirtd_qemu.aug | 4 +
src/qemu/qemu.conf | 30 +-
src/qemu/qemu_agent.c | 144 +-
src/qemu/qemu_agent.h | 11 +-
src/qemu/qemu_capabilities.c | 265 +-
src/qemu/qemu_capabilities.h | 32 +-
src/qemu/qemu_cgroup.c | 288 +-
src/qemu/qemu_cgroup.h | 7 +-
src/qemu/qemu_command.c | 2514 ++-
src/qemu/qemu_command.h | 195 +-
src/qemu/qemu_conf.c | 840 +-
src/qemu/qemu_conf.h | 22 +-
src/qemu/qemu_domain.c | 194 +-
src/qemu/qemu_domain.h | 50 +-
src/qemu/qemu_driver.c | 2328 ++-
src/qemu/qemu_hotplug.c | 705 +-
src/qemu/qemu_hotplug.h | 19 +-
src/qemu/qemu_migration.c | 192 +-
src/qemu/qemu_migration.h | 14 +-
src/qemu/qemu_monitor.c | 81 +-
src/qemu/qemu_monitor.h | 12 +-
src/qemu/qemu_monitor_json.c | 251 +-
src/qemu/qemu_monitor_json.h | 12 +-
src/qemu/qemu_monitor_text.c | 29 +-
src/qemu/qemu_monitor_text.h | 2 +-
src/qemu/qemu_process.c | 535 +-
src/qemu/qemu_process.h | 7 +-
src/qemu/test_libvirtd_qemu.aug.in | 2 +
src/remote/remote_client_bodies.h | 132 +
src/remote/remote_driver.c | 375 +-
src/remote/remote_protocol.c | 261 +
src/remote/remote_protocol.h | 209 +-
src/remote/remote_protocol.x | 187 +-
src/remote_protocol-structs | 128 +
src/rpc/gendispatch.pl | 7 +-
src/rpc/virnetmessage.c | 26 +
src/rpc/virnetmessage.h | 3 +
src/rpc/virnetserverservice.c | 57 +-
src/rpc/virnetserverservice.h | 15 +-
src/rpc/virnetsocket.c | 118 +-
src/rpc/virnetsshsession.c | 8 +-
src/rpc/virnettlscontext.c | 2 +-
src/security/security_apparmor.c | 115 +-
src/security/security_dac.c | 592 +-
src/security/security_dac.h | 3 +
src/security/security_driver.h | 30 +-
src/security/security_manager.c | 355 +-
src/security/security_manager.h | 49 +-
src/security/security_nop.c | 166 +-
src/security/security_selinux.c | 367 +-
src/security/security_stack.c | 60 +-
src/security/virt-aa-helper.c | 68 +-
src/storage/parthelper.c | 2 +-
src/storage/storage_backend.c | 349 +-
src/storage/storage_backend.h | 70 +-
src/storage/storage_backend_disk.c | 5 +-
src/storage/storage_backend_fs.c | 337 +-
src/storage/storage_backend_gluster.c | 224 +-
src/storage/storage_backend_iscsi.c | 44 +-
src/storage/storage_backend_logical.c | 57 +-
src/storage/storage_backend_mpath.c | 3 +
src/storage/storage_backend_rbd.c | 77 +-
src/storage/storage_backend_scsi.c | 56 +-
src/storage/storage_backend_zfs.c | 338 +
src/storage/storage_backend_zfs.h | 29 +
src/storage/storage_driver.c | 1561 +-
src/storage/storage_driver.h | 22 +-
src/test/test_driver.c | 21 +-
src/uml/uml_conf.c | 11 +-
src/uml/uml_driver.c | 41 +-
src/util/viralloc.h | 17 +-
src/util/virarch.h | 14 +
src/util/viraudit.c | 2 +-
src/util/viraudit.h | 6 +-
src/util/virbitmap.c | 57 +-
src/util/virbitmap.h | 10 +-
src/util/virbuffer.c | 31 +
src/util/virbuffer.h | 19 +-
src/util/vircgroup.c | 127 +-
src/util/vircgroup.h | 4 +
src/util/vircommand.c | 104 +-
src/util/vircommand.h | 4 +-
src/util/virconf.c | 10 +-
src/util/virdbus.c | 29 +-
src/util/virdbus.h | 4 -
src/util/virdnsmasq.c | 2 +-
src/util/virerror.c | 6 +
src/util/virerror.h | 13 +-
src/util/vireventpoll.c | 6 +-
src/util/virfile.c | 171 +-
src/util/virfile.h | 22 +-
src/util/virhook.h | 24 +-
src/util/virhostdev.c | 295 +-
src/util/virinitctl.h | 5 +-
src/util/virjson.c | 317 +-
src/util/virjson.h | 2 +
src/util/virnetdev.c | 101 +
src/util/virnetdev.h | 5 +
src/util/virnetdevbandwidth.c | 4 +-
src/util/virnetdevmacvlan.c | 21 +-
src/util/virnetdevmacvlan.h | 12 +-
src/util/virnetdevopenvswitch.c | 8 +-
src/util/virnetdevtap.c | 2 +-
src/util/virnetdevvportprofile.c | 8 +-
src/util/virnetdevvportprofile.h | 8 +-
src/util/virnetlink.c | 49 +-
src/util/virnuma.c | 552 +-
src/util/virnuma.h | 43 +-
src/util/virpci.c | 112 +-
src/util/virpci.h | 41 +-
src/util/virportallocator.c | 43 +-
src/util/virportallocator.h | 4 +
src/util/virprocess.c | 7 +-
src/util/virscsi.c | 6 +-
src/util/virseclabel.c | 27 +-
src/util/virseclabel.h | 14 +-
src/util/virsexpr.c | 12 +-
src/util/virstats.c | 178 +
src/util/virstats.h | 31 +
src/util/virstatslinux.c | 121 -
src/util/virstatslinux.h | 35 -
src/util/virstorageencryption.c | 48 +-
src/util/virstorageencryption.h | 17 +-
src/util/virstoragefile.c | 1598 +-
src/util/virstoragefile.h | 147 +-
src/util/virstring.c | 52 +-
src/util/virstring.h | 38 +-
src/util/virsysinfo.c | 4 +-
src/util/virsysinfo.h | 4 +-
src/util/virsystemd.c | 8 +-
src/util/virtime.c | 83 +-
src/util/virtime.h | 12 +-
src/util/viruri.c | 7 +-
src/util/virusb.c | 1 -
src/util/virutil.c | 243 +
src/util/virutil.h | 31 +
src/util/virxml.c | 9 +-
src/vbox/README | 7 +-
src/vbox/vbox_common.c | 7538 ++++++++
src/vbox/vbox_common.h | 306 +
src/vbox/vbox_driver.c | 90 +-
src/vbox/vbox_driver.h | 10 +
src/vbox/vbox_install_api.h | 26 +
src/vbox/vbox_snapshot_conf.c | 1574 ++
src/vbox/vbox_snapshot_conf.h | 141 +
src/vbox/vbox_tmpl.c | 12060 +++++--------
src/vbox/vbox_uniformed_api.h | 550 +
src/virtlockd.8.in | 2 +-
src/vmware/vmware_conf.c | 12 +-
src/vmx/vmx.c | 12 +-
src/xen/block_stats.c | 16 +-
src/xen/xen_driver.c | 24 +-
src/xen/xen_hypervisor.c | 65 +-
src/xen/xend_internal.c | 34 +-
src/xen/xs_internal.c | 15 +-
src/xenapi/xenapi_driver.c | 34 +-
src/xenapi/xenapi_utils.c | 34 +-
src/xenapi/xenapi_utils.h | 10 +-
src/xenconfig/xen_common.c | 2072 +++
src/xenconfig/xen_common.h | 46 +
src/xenconfig/xen_sxpr.c | 2561 +++
src/{xenxs => xenconfig}/xen_sxpr.h | 0
src/xenconfig/xen_xm.c | 427 +
src/{xenxs => xenconfig}/xen_xm.h | 0
src/{xenxs => xenconfig}/xenxs_private.h | 0
src/xenxs/xen_sxpr.c | 2566 ---
src/xenxs/xen_xm.c | 2026 ---
tests/Makefile.am | 85 +-
tests/Makefile.in | 533 +-
.../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 +
tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 +
tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +-
tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 +
.../bhyvexml2argv-disk-cdrom.args | 3 +
.../bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 22 +
.../bhyvexml2argv-disk-virtio.args | 2 +-
.../bhyvexml2argv-disk-virtio.xml | 2 +
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +-
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +
tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +-
tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 +
tests/bhyvexml2argvtest.c | 6 +-
tests/commanddata/test24.log | 7 +
tests/commandtest.c | 106 +-
tests/cputest.c | 4 +-
tests/domaincapsschemadata/domaincaps-basic.xml | 10 +
tests/domaincapsschemadata/domaincaps-full.xml | 56 +
.../domaincaps-qemu_1.6.50-1.xml | 45 +
tests/domaincapsschematest | 11 +
tests/domaincapstest.c | 194 +
tests/domainschemadata/domain-caps-features.xml | 28 +
tests/domainschematest | 3 +-
tests/domainsnapshotxml2xmltest.c | 4 +-
tests/interfaceschemadata/bond.xml | 1 +
tests/interfaceschemadata/bridge-no-address.xml | 1 +
tests/interfaceschemadata/bridge.xml | 1 +
tests/interfaceschemadata/ethernet-dhcp.xml | 3 +-
tests/interfaceschemadata/vlan.xml | 1 +
tests/libvirtdconftest.c | 2 +-
tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 2 +
tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 2 +
tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 2 +
tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 2 +
.../lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 4 +
tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 2 +
tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml | 4 +
tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 2 +
.../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 1 +
tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 4 +
tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 9 +
tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 4 +
tests/lxcxml2xmldata/lxc-capabilities.xml | 34 +
tests/lxcxml2xmldata/lxc-idmap.xml | 1 +
tests/lxcxml2xmltest.c | 1 +
tests/metadatatest.c | 64 +
.../networkxml2xmlin/passthrough-address-crash.xml | 7 +
.../passthrough-address-crash.xml | 7 +
tests/networkxml2xmltest.c | 1 +
tests/nodedevschemadata/pci_1002_71c4.xml | 1 +
.../pci_8086_0c0c_snd_hda_intel.xml | 16 +
tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 1 +
.../pci_8086_27c5_scsi_host_0_unique_id.xml | 8 +
.../pci_8086_4238_pcie_wireless.xml | 26 +
tests/nodedevxml2xmltest.c | 3 +
.../nodeinfodata/linux-armv6l-raspberrypi.cpuinfo | 12 +
.../nodeinfodata/linux-armv6l-raspberrypi.expected | 1 +
.../linux-raspberrypi/cpu/cpu0/topology/core_id | 1 +
.../cpu/cpu0/topology/core_siblings | 1 +
.../cpu/cpu0/topology/core_siblings_list | 1 +
.../cpu/cpu0/topology/physical_package_id | 1 +
.../cpu/cpu0/topology/thread_siblings | 1 +
.../cpu/cpu0/topology/thread_siblings_list | 1 +
.../linux-raspberrypi/cpu/cpuidle/current_driver | 1 +
.../cpu/cpuidle/current_governor_ro | 1 +
.../nodeinfodata/linux-raspberrypi/cpu/kernel_max | 1 +
.../{linux-test8 => linux-raspberrypi}/cpu/offline | 0
tests/nodeinfodata/linux-raspberrypi/cpu/online | 1 +
tests/nodeinfodata/linux-raspberrypi/cpu/possible | 1 +
tests/nodeinfodata/linux-raspberrypi/cpu/present | 1 +
tests/nodeinfodata/linux-test3/node/node0/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node1/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node2/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node3/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node4/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node5/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node6/meminfo | 1 -
tests/nodeinfodata/linux-test3/node/node7/meminfo | 1 -
tests/nodeinfodata/linux-test4/node/node0/meminfo | 1 -
tests/nodeinfodata/linux-test4/node/node1/meminfo | 1 -
tests/nodeinfodata/linux-test6/node/node0/meminfo | 1 -
tests/nodeinfodata/linux-test8/cpu/offline | 1 -
tests/nodeinfodata/linux-test8/node/node0/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node1/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node2/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node3/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node4/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node5/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node6/meminfo | 1 -
tests/nodeinfodata/linux-test8/node/node7/meminfo | 1 -
...86-test1.cpuinfo => linux-x86_64-test1.cpuinfo} | 0
...-test1.expected => linux-x86_64-test1.expected} | 0
...86-test2.cpuinfo => linux-x86_64-test2.cpuinfo} | 0
...-test2.expected => linux-x86_64-test2.expected} | 0
...86-test3.cpuinfo => linux-x86_64-test3.cpuinfo} | 0
...-test3.expected => linux-x86_64-test3.expected} | 0
...86-test4.cpuinfo => linux-x86_64-test4.cpuinfo} | 0
...-test4.expected => linux-x86_64-test4.expected} | 0
...86-test5.cpuinfo => linux-x86_64-test5.cpuinfo} | 0
...-test5.expected => linux-x86_64-test5.expected} | 0
...86-test6.cpuinfo => linux-x86_64-test6.cpuinfo} | 0
...-test6.expected => linux-x86_64-test6.expected} | 0
...86-test7.cpuinfo => linux-x86_64-test7.cpuinfo} | 0
...-test7.expected => linux-x86_64-test7.expected} | 0
...86-test8.cpuinfo => linux-x86_64-test8.cpuinfo} | 0
...-test8.expected => linux-x86_64-test8.expected} | 0
tests/nodeinfotest.c | 63 +-
tests/qemuagenttest.c | 10 +-
tests/qemuargv2xmltest.c | 50 +-
tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 +
tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 +
tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 62 +-
tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 +
tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 62 +-
tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 +
tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 62 +-
tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 4 +
tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 62 +-
tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 5 +
tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 67 +-
tests/qemucapabilitiestest.c | 57 +-
tests/qemucaps2xmltest.c | 2 +-
tests/qemuhelptest.c | 18 +-
tests/qemumonitorjsontest.c | 103 +-
tests/qemumonitortestutils.c | 6 +
tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 2 +-
...qemuxml2argv-boot-menu-disable-with-timeout.xml | 29 +
...2argv-boot-menu-enable-with-timeout-invalid.xml | 29 +
...qemuxml2argv-boot-menu-enable-with-timeout.args | 15 +
.../qemuxml2argv-boot-menu-enable-with-timeout.xml | 29 +
.../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 +-
.../qemuxml2argv-channel-guestfwd.args | 2 +-
.../qemuxml2argv-chardev-label.xml | 45 +
.../qemuxml2argv-clock-localtime.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 7 +-
.../qemuxml2argv-console-compat.xml | 2 +-
.../qemuxml2argv-cpu-numa-disjoint.args | 6 +
.../qemuxml2argv-cpu-numa-disjoint.xml | 28 +
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml | 6 +-
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml | 6 +-
tests/qemuxml2argvdata/qemuxml2argv-cpu-numa3.xml | 25 +
.../qemuxml2argv-disk-active-commit.xml | 37 +
.../qemuxml2argv-disk-cdrom-empty.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 2 +-
.../qemuxml2argv-disk-drive-boot-cdrom.xml | 2 +-
.../qemuxml2argv-disk-drive-boot-disk.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-directsync.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-v1-none.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-v1-wb.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-v2-none.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 +-
.../qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 +-
...muxml2argv-disk-drive-error-policy-enospace.xml | 2 +-
.../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 +-
...rgv-disk-drive-error-policy-wreport-rignore.xml | 2 +-
.../qemuxml2argv-disk-drive-fmt-qcow.xml | 2 +-
.../qemuxml2argv-disk-drive-network-gluster.xml | 2 +-
...qemuxml2argv-disk-drive-network-iscsi-auth.args | 4 +-
.../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 12 +-
.../qemuxml2argv-disk-drive-network-iscsi.xml | 2 +-
.../qemuxml2argv-disk-drive-network-nbd-export.xml | 2 +-
...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 2 +-
.../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 2 +-
.../qemuxml2argv-disk-drive-network-nbd-unix.xml | 2 +-
.../qemuxml2argv-disk-drive-network-nbd.xml | 2 +-
.../qemuxml2argv-disk-drive-network-rbd-auth.xml | 4 +-
...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 +-
.../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 2 +-
.../qemuxml2argv-disk-drive-network-rbd.xml | 2 +-
.../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 2 +-
...mirror.xml => qemuxml2argv-disk-mirror-old.xml} | 0
.../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 13 +-
tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 +-
.../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 9 +
.../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml | 29 +
.../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 9 +
.../qemuxml2argv-disk-virtio-scsi-max_sectors.xml | 29 +
.../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 +-
.../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +-
.../qemuxml2argv-graphics-vnc-policy.xml | 2 +-
.../qemuxml2argv-graphics-vnc-sasl.args | 2 +-
.../qemuxml2argv-graphics-vnc-sasl.xml | 2 +-
.../qemuxml2argv-graphics-vnc-socket.xml | 2 +-
.../qemuxml2argv-graphics-vnc-tls.args | 2 +-
.../qemuxml2argv-graphics-vnc-tls.xml | 2 +-
.../qemuxml2argv-graphics-vnc-websocket.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +-
.../qemuxml2argv-hostdev-pci-address.xml | 2 +-
.../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 14 +
.../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 46 +
.../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 14 +
.../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 40 +
...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 16 +
...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 46 +
.../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 16 +
.../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 40 +
.../qemuxml2argv-hostdev-usb-address.xml | 2 +-
.../qemuxml2argv-hostdev-vfio-multidomain.args | 6 +
.../qemuxml2argv-hostdev-vfio-multidomain.xml | 33 +
.../qemuxml2argv-hugepages-pages.args | 16 +
.../qemuxml2argv-hugepages-pages.xml | 45 +
.../qemuxml2argv-hugepages-pages2.args | 10 +
.../qemuxml2argv-hugepages-pages2.xml | 38 +
.../qemuxml2argv-hugepages-pages3.args | 9 +
.../qemuxml2argv-hugepages-pages3.xml | 38 +
tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 +-
.../qemuxml2argv-input-usbmouse.xml | 2 +-
.../qemuxml2argv-input-usbtablet.xml | 2 +-
.../qemuxml2argv-interface-driver.xml | 51 +
.../qemuxml2argv-iothreads-disk.args | 17 +
.../qemuxml2argv-iothreads-disk.xml | 40 +
tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 8 +
tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml | 29 +
.../qemuxml2argv-kvm-features-off.args | 5 +
.../qemuxml2argv-kvm-features-off.xml | 27 +
.../qemuxml2argv-kvm-features.args | 5 +
.../qemuxml2argvdata/qemuxml2argv-kvm-features.xml | 27 +
tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 2 +-
.../qemuxml2argv-machine-core-off.xml | 2 +-
.../qemuxml2argv-machine-core-on.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 +-
.../qemuxml2argv-minimal-msg-timestamp.args | 6 +
.../qemuxml2argv-minimal-msg-timestamp.xml | 32 +
tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 +-
.../qemuxml2argv-misc-disable-s3.xml | 2 +-
.../qemuxml2argv-misc-disable-suspends.xml | 2 +-
.../qemuxml2argv-misc-enable-s4.xml | 2 +-
.../qemuxml2argv-misc-no-reboot.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 +-
.../qemuxml2argv-net-eth-ifname.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 +-
.../qemuxml2argv-net-hostdev-multidomain.args | 7 +
.../qemuxml2argv-net-hostdev-multidomain.xml | 40 +
.../qemuxml2argv-net-hostdev-vfio-multidomain.args | 7 +
.../qemuxml2argv-net-hostdev-vfio-multidomain.xml | 41 +
.../qemuxml2argv-net-hostdev-vfio.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 +-
.../qemuxml2argv-net-vhostuser.args | 7 +
.../qemuxml2argv-net-vhostuser.xml | 33 +
tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 +-
.../qemuxml2argv-nographics-vga.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 2 +-
...-numad-auto-vcpu-static-numatune-no-nodeset.xml | 31 +
.../qemuxml2argv-numatune-auto-prefer.xml | 29 +
.../qemuxml2argv-numatune-memnode-no-memory.args | 8 +
.../qemuxml2argv-numatune-memnode-no-memory.xml | 30 +
.../qemuxml2argv-numatune-memnode-nocpu.xml | 25 +
.../qemuxml2argv-numatune-memnode.args | 11 +
.../qemuxml2argv-numatune-memnode.xml | 33 +
.../qemuxml2argv-numatune-memnodes-problematic.xml | 31 +
...emuxml2argv-numatune-memory-invalid-nodeset.xml | 31 +
.../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml | 2 +-
.../qemuxml2argv-ppce500-serial.args | 7 +
.../qemuxml2argv-ppce500-serial.xml | 26 +
.../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +-
.../qemuxml2argv-pseries-nvram.xml | 2 +-
.../qemuxml2argv-qemu-ns-no-env.xml | 2 +-
.../qemuxml2argv-reboot-timeout-disabled.xml | 2 +-
.../qemuxml2argv-reboot-timeout-enabled.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 +-
.../qemuxml2argv-seclabel-dac-none.args | 4 +
.../qemuxml2argv-seclabel-dac-none.xml | 28 +
.../qemuxml2argv-seclabel-dynamic-none.xml | 28 +
.../qemuxml2argv-seclabel-multiple.xml | 40 +
tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 +-
.../qemuxml2argv-serial-tcp-telnet.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 +-
.../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 +-
.../qemuxml2argv-sound-device.args | 1 +
.../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 +
tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 +-
.../qemuxml2argv-virtio-rng-default.args | 2 +-
.../qemuxml2argv-virtio-rng-multiple.args | 10 +
.../qemuxml2argv-virtio-rng-multiple.xml | 31 +
tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 +-
tests/qemuxml2argvtest.c | 103 +-
...muxml2xmlout-boot-menu-disable-with-timeout.xml | 29 +
.../qemuxml2xmlout-cpu-numa1.xml | 28 +
.../qemuxml2xmlout-cpu-numa2.xml | 28 +
.../qemuxml2xmlout-disk-mirror-old-inactive.xml | 41 +
.../qemuxml2xmlout-disk-mirror-old.xml | 52 +
.../qemuxml2xmlout-numatune-auto-prefer.xml | 29 +
.../qemuxml2xmlout-numatune-memnode.xml | 33 +
tests/qemuxml2xmltest.c | 33 +
tests/scsihosttest.c | 308 +
tests/securityselinuxhelper.c | 8 +-
tests/securityselinuxlabeltest.c | 44 +-
tests/sexpr2xmltest.c | 2 +-
tests/shunloadtest.c | 1 +
tests/statstest.c | 2 +-
.../pool-netfs-gluster-without-slash.xml | 12 +
.../pool-scsi-type-scsi-host-stable.xml | 19 +
.../pool-scsi-type-scsi-host-stable.xml | 22 +
tests/storagepoolxml2xmltest.c | 1 +
.../qcow2-convert-nobacking.argv | 2 +
.../storagevolxml2argvdata/qcow2-nocow-compat.argv | 3 +
tests/storagevolxml2argvdata/qcow2-nocow.argv | 3 +
tests/storagevolxml2argvtest.c | 9 +
tests/storagevolxml2xmlin/vol-qcow2-nocow.xml | 32 +
tests/storagevolxml2xmlout/vol-qcow2-nocow.xml | 31 +
tests/testutils.c | 2 +-
tests/testutilslxc.c | 2 +-
tests/testutilsqemu.c | 57 +-
tests/testutilsqemu.h | 3 +
tests/testutilsxen.c | 2 +-
tests/vboxsnapshotxmldata/2disks-1snap.vbox | 322 +
tests/vboxsnapshotxmldata/2disks-2snap.vbox | 478 +
.../vboxsnapshotxmldata/2disks-3snap-brother.vbox | 786 +
tests/vboxsnapshotxmldata/2disks-3snap.vbox | 636 +
tests/vboxsnapshotxmldata/2disks-nosnap.vbox | 168 +
tests/vboxsnapshotxmltest.c | 164 +
tests/vcpupin | 29 +-
tests/virbitmaptest.c | 40 +-
tests/vircaps2xmldata/vircaps-basic-4-4-2G.xml | 74 +
tests/vircaps2xmltest.c | 163 +
tests/vircapstest.c | 7 +-
tests/virdbustest.c | 4 +-
tests/virdrivermoduletest.c | 18 +-
tests/virmockdbus.c | 6 +-
tests/virnettlshelpers.c | 4 +-
tests/virstoragetest.c | 667 +-
tests/virstringtest.c | 45 +-
tests/virsystemdtest.c | 4 +-
tests/virtimetest.c | 106 +-
.../workstation-7.0.0-with-garbage.txt | 3 +
tests/vmwarevertest.c | 1 +
tests/vmx2xmltest.c | 2 +-
tests/xmconfigdata/test-escape-paths.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-localtime.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 2 +-
.../test-fullvirt-serial-dev-2-ports.cfg | 2 +-
.../test-fullvirt-serial-dev-2nd-port.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-file.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-null.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 2 +-
.../test-fullvirt-serial-tcp-telnet.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-sound.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 2 +-
tests/xmconfigdata/test-fullvirt-utc.cfg | 2 +-
tests/xmconfigdata/test-no-source-cdrom.cfg | 2 +-
tests/xmconfigdata/test-paravirt-net-e1000.cfg | 2 +-
tests/xmconfigdata/test-paravirt-net-vifname.cfg | 2 +-
.../test-paravirt-new-pvfb-vncdisplay.cfg | 2 +-
tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 2 +-
.../test-paravirt-old-pvfb-vncdisplay.cfg | 2 +-
tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 2 +-
tests/xmconfigdata/test-paravirt-vcpu.cfg | 2 +-
tests/xmconfigdata/test-pci-devs.cfg | 2 +-
tests/xmconfigtest.c | 2 +-
tests/xml2sexprtest.c | 2 +-
tests/xml2vmxtest.c | 2 +-
tools/Makefile.in | 2 +
tools/libvirt-guests.sh.in | 6 +-
tools/virsh-domain-monitor.c | 298 +
tools/virsh-domain.c | 595 +-
tools/virsh-domain.h | 4 +
tools/virsh-host.c | 263 +-
tools/virsh-network.c | 124 +-
tools/virsh-nodedev.c | 6 +-
tools/virsh-pool.c | 5 +-
tools/virsh-secret.c | 6 +-
tools/virsh-volume.c | 31 +-
tools/virsh.1 | 405 +-
tools/virsh.c | 186 +-
tools/virsh.h | 10 +
tools/virsh.pod | 407 +-
tools/virt-host-validate.1 | 2 +-
tools/virt-login-shell.1 | 2 +-
tools/virt-pki-validate.1 | 2 +-
tools/virt-sanlock-cleanup.8 | 2 +-
tools/virt-xml-validate.1 | 2 +-
tools/wireshark/Makefile.in | 2 +
tools/wireshark/src/Makefile.am | 6 +-
tools/wireshark/src/Makefile.in | 9 +-
tools/wireshark/src/packet-libvirt.c | 41 +-
tools/wireshark/src/packet-libvirt.h | 22 +-
tools/wireshark/src/plugin.c | 7 +
tools/wireshark/util/make-dissector-reg | 7 +
1058 files changed, 787096 insertions(+), 583073 deletions(-)
diff --cc debian/changelog
index dd9cb3d,489efad..1f07ed0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,213 +1,237 @@@
+ libvirt (1.2.8-3) unstable; urgency=medium
+
+ * [9e3d695] Don't ship the socket activation file until we switched to
+ polkit and we can therefore ignore socket permissions. (Closes: #762606)
+ * [a32e72e,4eb67f4] Clean up capabilities and possibly empty dirs
+ (Closes: #761131)
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 25 Sep 2014 12:08:51 +0200
+
+ libvirt (1.2.8-2) unstable; urgency=medium
+
+ * [7b0894e] Debianize virtlockd unit file
+ * [2c522fd] Tag Debian specific patches as such
+ * [e1e734b] CVE-2014-3633: qemu: blkiotune: Use correct definition when
+ looking up disk. Thanks to Peter Krempa (Closes: #762203)
+
+ -- Guido Günther <agx at sigxcpu.org> Tue, 23 Sep 2014 08:53:01 +0200
+
+ libvirt (1.2.8-1) experimental; urgency=medium
+
+ * [e55688b] New upstream version 1.2.8
+ (Closes: #760510)
+ * [daa5c92] New upstream version 1.2.8~rc2
+ * [7f85d5e] Bump symbol versions
+ * [ea29953] Rediff patches.
+ Drop patches appplied upstream:
+ Don-t-fail-qemu-driver-intialization-if-we-can-t-det.patch
+ Include-param.h-on-kFreeBSD.patch
+ Make-uri-command-a-bit-more-prominent.patch
+ * [4633967] Verify tarball signature
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 05 Sep 2014 19:56:50 +0200
+
+ libvirt (1.2.7-11) unstable; urgency=medium
+
+ * [6534478] Check status in a systemd 208 compatible way
+ systemd 204 returned 0 when trying to reload a not running service but
+ 208 changed behaviour. So use status instead of is-enabled.
+ Thanks to Neutron Soutmun for his feedback (Closes: #758688)
+
+ -- Guido Günther <agx at sigxcpu.org> Sun, 24 Aug 2014 10:54:26 +0200
+
+ libvirt (1.2.7-10) unstable; urgency=medium
+
+ * [d319f15] Only reexec virtlockd if enabled (Closes: #758688)
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 21 Aug 2014 16:34:36 +0200
+
+ libvirt (1.2.7-9) unstable; urgency=medium
+
+ * [1c2c5ee] Don't let dh_systemd_start guess the package to act on
+ (Closes: #758552)
+ * [ab79901] Don't restart libvirt-guests when using systemd so it's
+ consistent with sysvinit. We'd restart VMs on package upgrads otherwise.
+
+ -- Guido Günther <agx at sigxcpu.org> Tue, 19 Aug 2014 09:59:47 +0200
+
+ libvirt (1.2.7-8) unstable; urgency=medium
+
+ * [d98aa3b] Fix wrong relation in preinst.
+ Thanks to Laurent Bigonville (Closes: #758136)
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 14 Aug 2014 21:06:45 +0200
+
+ libvirt (1.2.7-7) unstable; urgency=medium
+
+ * [42dbd16] Skip more linux specific stuff on kFreeBSD
+ * [a2ff23f] Don't restart virtlockd on upgrade virtlockd must be reloaded so
+ it reexecs itself. (Closes: #757453)
+ * [4914adc] Use symlinks for upstream changelog. This safes 1.9M per
+ package
+ * [3583f4b] Don't fail qemu driver intialization if we can't determine
+ hugepage size. Thanks to a lot to Jamie Heilman for testing it
+ (Closes: #757609)
+ * [3b23724] Make 'uri' command a bit more prominent. (Closes: #688778)
+ * [63e7e51] Also stop libvirt-bin in libvirt-bin's preinst.
+ When libvirt-daemon-system's preinst runs the new libvirt-bin might
+ already be unpacked and therefore the libvirt-bin service file already
+ gone. So additionally stop libvirt-bin in libvirt-bin's preinst.
+ (Closes: #757952)
+
+ -- Guido Günther <agx at sigxcpu.org> Wed, 13 Aug 2014 21:50:07 +0200
+
+ libvirt (1.2.7-6) unstable; urgency=medium
+
+ * [5e39138] Don't provide libvirt-bin via LSB headers.
+ This avoids a conflict when /e/i/libvirt-bin and /e/i/libvirtd
+ are around at the same time during dpkg's configure phase and
+ both init scripts Provide: libvirt-bin.
+ (Closes: #757330)
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 08 Aug 2014 17:58:36 +0200
+
+ libvirt (1.2.7-5) unstable; urgency=medium
+
+ * [06d457c] Bump comparison version so this applies to current failed
+ upgrades too.
+ * [bdae16d] Remove another obsolete conffile (Closes: #757332)
+ * [2f486c5] Don't try to stop libvirt-bin if it's already gone
+ (Closes: #757407)
+ * [a9643a0] Remove another obsolete conffile (Closes: #757332)
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 07 Aug 2014 23:21:39 +0200
+
+ libvirt (1.2.7-4) unstable; urgency=medium
+
+ * [5e71896] Move networking configuration to libvirt-daemon-system too
+ * [32eea48] Remove left over empty directory
+ * [b3a2735] Also purge libvirt-bin.service on new installations.
+ The old service file was in libvirt-bin so we need to remove it when
+ libvirt-daemon-service is first installed (as we did before when
+ the whole code was in the postinst).
+ Thanks to Laurent Bigonville for the analysis (Closes: #757293)
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 07 Aug 2014 10:57:53 +0200
+
+ libvirt (1.2.7-3) unstable; urgency=medium
+
+ * Upload to unstable
+ * [f634d53] Don't try to install qemu configuration on kFreeBSD.
+ QEMU support on kFreeBSD support is currently disabled due to test
+ failures.
+
+ -- Guido Günther <agx at sigxcpu.org> Wed, 06 Aug 2014 20:28:05 +0200
+
+ libvirt (1.2.7-2) experimental; urgency=medium
+
+ * [ebfec9b] Don't try to install lxc.conf on kFreeBSD.
+ Another kFreeBSD build fix
+
+ -- Guido Günther <agx at sigxcpu.org> Mon, 04 Aug 2014 14:10:57 +0200
+
+ libvirt (1.2.7-1) experimental; urgency=medium
+
+ * [65e69d3] New upstream version 1.2.7
+ * [d615910] Don't try to install virt-login-shell on non-linux.
+ It's LXC only. This fixes the build failure on kFreeBSD.
+
+ -- Guido Günther <agx at sigxcpu.org> Sun, 03 Aug 2014 19:20:26 +0200
+
+ libvirt (1.2.7~rc2-1) experimental; urgency=medium
+
+ [ Guido Günther ]
+ * [16575d9] New upstream version 1.2.7~rc2
+ * [bc785a7] Drop left over libvirt-bin references.
+ Fixes more leftovers of #730604.
+ * [ca64c62] Rediff patches
+ * [998e7d4] Update symbols file
+ * [06cf7b4] Make sure libvirt-bin versioned dependencies are recent enough
+
+ [ Laurent Bigonville ]
+ * [daf46fe] Stop the daemon in the preinst script instead of the postinst
+ one when renaming the .service file as it now contains the
+ "Restart=on-failure" option and blindly killing the daemon is not working
+ anymore. This completes the fix for #730604
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 01 Aug 2014 10:52:57 +0200
+
+ libvirt (1.2.6-2) experimental; urgency=medium
+
+ * [501afad] Update copyright information
+
+ -- Guido Günther <agx at sigxcpu.org> Tue, 29 Jul 2014 08:55:26 +0200
+
+ libvirt (1.2.6-1) experimental; urgency=medium
+
+ [ Laurent Bigonville ]
+ * [4c4977e,87fc2db] Rename libvirt-bin.service back to libvirtd.service
+ and use symlink or Alias= instead. This is what upstream uses.
+ (Closes: #730604)
+
+ [ Guido Günther ]
+ * Upload to experimental
+ * [9321997] Drop build-dep on hal-dev too (Closes: #710195)
+ * [899c1d3] New upstream version 1.2.5
+ * [34d54b9] Refresh patches.
+ Dropped, fixed upstream:
+ LSN-2014-0003-Don-t-expand-entities-when-parsing-XML.patch
+ * [12e5468] Update symbols file
+ * [8ae2cf5] Depend on gnutls/gcrypt explicitly (Closes: #753121)
+ * [8881fe5] Recommend iproute2 instead of iproute (Closes: #753713)
+ * [ab710a4] New upstream version 1.2.6
+ * [a23d7fc] Rediff patches
+ * [e6c037b] Bump symbol versions
+ * [7ca6a8a] Split out daemon configuration (Closes: #679074)
+ * [60ec538] Cleanup old conffile (Closes: #748720)
+ * [cc59dd4] Provide build and packager information (Closes: #753306)
+ * [74baa7e] Use sensible-editor as fallback.
+ Based on a patch by Dmitry Smirnov (Closes: #594444)
+
+ -- Guido Günther <agx at sigxcpu.org> Tue, 22 Jul 2014 22:33:51 +0200
+
+ libvirt (1.2.4-3) unstable; urgency=medium
+
+ * [b0b7359] Don't pretend kFreeBSD supports linux only features. So far we
+ worked around missing kFreeBSD features by creating empty dirs this looks
+ bad on the target systems and makes us maintain things in debian rules and
+ *.install. Explicitly invoke dh_install in debian/rules instead.
+ Closes: #747658
+
+ -- Guido Günther <agx at sigxcpu.org> Sat, 10 May 2014 22:23:06 +0200
+
+ libvirt (1.2.4-2) unstable; urgency=medium
+
+ * [8bcbf97] Only linux has apparmor (Closes: #747565)
+ * [0fa7624] Disable tests requiring filesystem attributes since they seem to
+ fail on the buildd (Closes: #747565)
+
+ -- Guido Günther <agx at sigxcpu.org> Sat, 10 May 2014 15:38:57 +0200
+
+libvirt (1.2.4-1~bpo70+1.1) wheezy-backports; urgency=medium
+
+ * Non-maintainer upload.
+ * Revert switch from avahi to avahi-daemon in init script; fixes
+ co-installability with avahi in wheezy.
+
+ -- Julien Cristau <jcristau at debian.org> Sun, 24 Aug 2014 15:02:36 -0700
+
+libvirt (1.2.4-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Rebuild for wheezy-backports.
+ * Fixes LSN-2014-0003
+ * Remaining chnages:
+ * [b46b754] Drop sheepdog support not available in Wheezy
+ * [31a2113] Use libnl1
+ since libnetcf1 is linked against libnl1 in Wheezy. Also make sure we
+ don't pickup up libnetcf-dev using libnl3.
+ * [c5a59dd] Drop version in polkit-1 dependency.
+ This reintroduces CVE-2013-4311 since we don't have a recent enough
+ polkit-1 in wheezy.
+ * [4db6aaa] Disable xenlight support not available in wheezy
+
+ -- Guido Günther <agx at sigxcpu.org> Tue, 06 May 2014 14:12:38 +0200
+
libvirt (1.2.4-1) unstable; urgency=medium
* [b38846c] New upstream version 1.2.4
diff --cc debian/control
index 72f98ad,3df8b75..c6bb67a
--- a/debian/control
+++ b/debian/control
@@@ -10,11 -10,11 +10,11 @@@ Build-Depends
libncurses5-dev,
libreadline-dev,
zlib1g-dev,
- libgcrypt11-dev,
- libgnutls-dev,
+ libgcrypt20-dev,
+ libgnutls28-dev,
libavahi-client-dev,
libsasl2-dev,
- libxen-dev (>= 4.3) [i386 amd64],
+ libxen-dev [i386 amd64],
lvm2 [linux-any],
open-iscsi [linux-any],
libparted0-dev (>= 2.2),
@@@ -22,12 -22,12 +22,11 @@@
libdevmapper-dev [linux-any],
uuid-dev,
libudev-dev [linux-any],
- libhal-dev [!linux-any],
libpciaccess-dev,
kmod [linux-any],
- policykit-1 (>= 0.105-4~),
+ policykit-1,
libcap-ng-dev [linux-any],
- libnl-3-dev [linux-any],
- libnl-route-3-dev [linux-any],
+ libnl-dev [linux-any],
libyajl-dev,
libpcap0.8-dev,
libnuma-dev [amd64 i386 ia64 mips mipsel powerpc],
@@@ -62,22 -66,82 +60,81 @@@ Standards-Version: 3.9.
Package: libvirt-bin
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (= ${binary:Version}), logrotate, gettext-base
+ Depends:
+ ${misc:Depends},
+ libvirt-daemon-system (>= ${binary:Version}),
+ libvirt-clients (>= ${binary:Version}),
+ Section: oldlibs
+ Priority: extra
+ Description: programs for the libvirt library
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This is a transitional package. You can safely remove it.
+
+ Package: libvirt-clients
+ Architecture: any
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libvirt0 (= ${binary:Version}),
+ Section: admin
+ Replaces: libvirt-bin (<< 1.2.6-1~)
+ Conflicts: libvirt-bin (<< 1.2.6-1~)
+ Description: programs for the libvirt library
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains the libvirt shell virsh and other client binaries.
+
+ Package: libvirt-daemon
+ Architecture: any
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libvirt0 (= ${binary:Version}),
Enhances: qemu, qemu-kvm, xen
Section: admin
- Recommends: netcat-openbsd,
- bridge-utils,
- dnsmasq-base (>= 2.46-1),
- iptables (>= 1.4.10),
+ Recommends:
qemu-kvm | qemu (>= 0.9.1),
libxml2-utils,
- ebtables,
+ netcat-openbsd,
+ Description: programs for the libvirt library
+ Libvirt is a C toolkit to interact with the virtualization capabilities
+ of recent versions of Linux (and other OSes). The library aims at providing
+ a long term stable C API for different virtualization mechanisms. It currently
+ supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
+ .
+ This package contains the libvirt-daemon.
+
+ Package: libvirt-daemon-system
+ Architecture: any
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ adduser,
+ gettext-base,
+ libvirt-clients (= ${binary:Version}),
+ libvirt-daemon (= ${binary:Version}),
+ logrotate,
+ Recommends:
+ bridge-utils,
dmidecode,
- iproute,
+ dnsmasq-base (>= 2.46-1),
+ ebtables [linux-any],
+ iproute2,
+ iptables (>= 1.4.10) [linux-any],
parted,
- pm-utils
+ pm-utils,
+ Section: admin
Suggests: policykit-1, radvd, auditd, systemtap, systemd, apparmor
- Description: programs for the libvirt library
-Breaks: avahi-daemon (<< 0.6.31-3~)
+ Replaces: libvirt-bin (<< 1.2.7-4~)
+ Conflicts: libvirt-bin (<< 1.2.6-1~)
+ Description: Libvirt daemon configuration files
Libvirt is a C toolkit to interact with the virtualization capabilities
of recent versions of Linux (and other OSes). The library aims at providing
a long term stable C API for different virtualization mechanisms. It currently
diff --cc debian/libvirt-daemon-system.libvirtd.init
index 0000000,caec3ed..9245088
mode 000000,100755..100755
--- a/debian/libvirt-daemon-system.libvirtd.init
+++ b/debian/libvirt-daemon-system.libvirtd.init
@@@ -1,0 -1,232 +1,232 @@@
+ #! /bin/sh
+ #
+ # Init script for libvirtd
+ #
+ # (c) 2007 Guido Guenther <agx at sigxcpu.org>
+ # based on the skeletons that comes with dh_make
+ #
+ ### BEGIN INIT INFO
+ # Provides: libvirtd
+ # Required-Start: $network $local_fs $remote_fs $syslog
+ # Required-Stop: $local_fs $remote_fs $syslog
-# Should-Start: avahi-daemon cgconfig
-# Should-Stop: avahi-daemon cgconfig
++# Should-Start: avahi cgconfig
++# Should-Stop: avahi cgconfig
+ # Default-Start: 2 3 4 5
+ # Default-Stop: 0 1 6
+ # Short-Description: libvirt management daemon
+ ### END INIT INFO
+
+ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+ export PATH
+ DAEMON=/usr/sbin/libvirtd
+ NAME=libvirtd
+ DESC="libvirt management daemon"
+ cgroups="cpuset cpu cpuacct devices freezer net_cls blkio perf_event"
+ ! grep -qs cgroup_enable=memory /proc/cmdline || cgroups="$cgroups memory"
+
+ test -x $DAEMON || exit 0
+ . /lib/lsb/init-functions
+
+ PIDFILE=/var/run/$NAME.pid
+ DODTIME=1 # Time to wait for the server to die, in seconds
+
+ # Include libvirtd defaults if available
+ if [ -f /etc/default/libvirtd ] ; then
+ . /etc/default/libvirtd
+ fi
+
+ check_start_libvirtd_option() {
+ if [ ! "$start_libvirtd" = "yes" ]; then
+ log_warning_msg "Not starting libvirt management daemon libvirtd, disabled via /etc/default/libvirtd"
+ return 1
+ else
+ return 0
+ fi
+ }
+
+ running_pid()
+ {
+ # Check if a given process pid's cmdline matches a given name
+ pid=$1
+ name=$2
+ [ -z "$pid" ] && return 1
+ [ ! -d /proc/$pid ] && return 1
+ cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+ # Is this the expected child?
+ [ "$cmd" != "$name" ] && return 1
+ return 0
+ }
+
+ running()
+ {
+ # Check if the process is running looking at /proc
+ # (works for all users)
+ # No pidfile, probably no daemon present
+ [ ! -f "$PIDFILE" ] && return 1
+ # Obtain the pid and check it against the binary name
+ pid=`cat $PIDFILE`
+ running_pid $pid $DAEMON || return 1
+ return 0
+ }
+
+ systemd_running()
+ {
+ if [ -d /run/systemd/system ] ; then
+ return 0
+ fi
+ return 1
+ }
+
+ mount_cgroups()
+ {
+ if ! systemd_running
+ then
+ mount -t tmpfs cgroup_root /sys/fs/cgroup || return 1
+ for M in $cgroups; do
+ mkdir /sys/fs/cgroup/$M || return 1
+ mount -t cgroup -o rw,nosuid,nodev,noexec,relatime,$M "cgroup_${M}" "/sys/fs/cgroup/${M}" || return 1
+ done
+ else
+ log_warning_msg "Systemd running, skipping cgroup mount."
+ fi
+
+ }
+
+ umount_cgroups()
+ {
+ if ! systemd_running
+ then
+ for M in $cgroups; do
+ umount "cgroup_${M}"
+ rmdir /sys/fs/cgroup/$M
+ done
+ umount cgroup_root
+ else
+ log_warning_msg "Systemd running, skipping cgroup mount."
+ fi
+ }
+
+ check_mount_cgroup_options() {
+ if [ ! "$mount_cgroups" = "yes" ]; then
+ return 1
+ else
+ return 0
+ fi
+ }
+
+ force_stop() {
+ # Forcefully kill the process
+ [ ! -f "$PIDFILE" ] && return
+ if running ; then
+ kill -15 $pid
+ # Is it really dead?
+ [ -n "$DODTIME" ] && sleep "$DODTIME"s
+ if running ; then
+ kill -9 $pid
+ [ -n "$DODTIME" ] && sleep "$DODTIME"s
+ if running ; then
+ echo "Cannot kill $LABEL (pid=$pid)!"
+ exit 1
+ fi
+ fi
+ fi
+ rm -f $PIDFILE
+ return 0
+ }
+
+ case "$1" in
+ start)
+ if check_start_libvirtd_option; then
+ log_daemon_msg "Starting $DESC" "$NAME"
+ if running ; then
+ log_progress_msg "already running"
+ log_end_msg 0
+ exit 0
+ fi
+ rm -f /var/run/libvirtd.pid
+ if check_mount_cgroup_options; then
+ if ! mount_cgroups;then
+ log_warning_msg "Can not mount cgroups layout"
+ exit 1
+ fi
+ fi
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --exec $DAEMON -- -d $libvirtd_opts
+ if running; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ if ! running ; then
+ log_progress_msg "not running"
+ log_end_msg 0
+ exit 0
+ fi
+ if check_mount_cgroup_options; then
+ umount_cgroups
+ fi
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+ --exec $DAEMON
+ log_end_msg 0
+ ;;
+ force-stop)
+ log_daemon_msg "Forcefully stopping $DESC" "$NAME"
+ force_stop
+ if ! running; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ ;;
+ restart)
+ if check_start_libvirtd_option; then
+ log_daemon_msg "Restarting $DESC" "$DAEMON"
+ start-stop-daemon --oknodo --stop --quiet --pidfile \
+ /var/run/$NAME.pid --exec $DAEMON
+ [ -n "$DODTIME" ] && sleep $DODTIME
+ start-stop-daemon --start --quiet --pidfile \
+ /var/run/$NAME.pid --exec $DAEMON -- -d $libvirtd_opts
+ if running; then
+ log_end_msg 0
+ else
+ log_end_msg 1
+ fi
+ fi
+ ;;
+ reload|force-reload)
+ if running; then
+ log_daemon_msg "Reloading configuration of $DESC" "$NAME"
+ start-stop-daemon --stop --signal 1 --quiet --pidfile \
+ /var/run/$NAME.pid --exec $DAEMON
+ log_end_msg 0
+ else
+ log_warning_msg "libvirtd not running, doing nothing."
+ fi
+ ;;
+ status)
+ log_daemon_msg "Checking status of $DESC" "$NAME"
+ if running ; then
+ log_progress_msg "running"
+ log_end_msg 0
+ else
+ log_progress_msg "not running"
+ log_end_msg 1
+ if [ -f "$PIDFILE" ] ; then
+ exit 1
+ else
+ exit 3
+ fi
+ fi
+ ;;
+ *)
+ N=/etc/init.d/libvirtd
+ echo "Usage: $N {start|stop|restart|reload|force-reload|status|force-stop}" >&2
+ exit 1
+ ;;
+ esac
+
+ exit 0
diff --cc debian/rules
index 5a3b35d,8820ea9..d9b1584
--- a/debian/rules
+++ b/debian/rules
@@@ -71,13 -76,9 +76,15 @@@ els
WITH_VBOX = --without-vbox
endif
+# Not available in wheezy
+WITH_STORAGE_SHEEPDOG = --without-storage-sheepdog
+WITH_STORAGE_RBD = --without-storage-rbd
+WITH_LIBXL = --without-libxl
+WITH_MACVTAP = --without-macvtap
+
DEB_CONFIGURE_EXTRA_ARGS := \
+ --with-packager="$(DEB_BUILDUSER) $(DEB_BUILDDATE) $(DEB_BUILDHOST)" \
+ --with-packager-version="$(DEB_RELEASE)" \
--disable-silent-rules \
--disable-rpath \
$(WITH_QEMU) \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git
More information about the Pkg-libvirt-commits
mailing list