Guido Günther · Guido Günther · Guido Günther · Guido Günther · Guido Günther · Guido Günther
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,7 +14,7 @@ Christian Ehrhardt <christian.ehrhardt@canonical.com>
 Christophe Fergeau <cfergeau@redhat.com>
 Claudio Bley <claudio.bley@gmail.com>
 Cole Robinson <crobinso@redhat.com>
-Daniel Berrange <berrange@redhat.com>
+Daniel P. Berrangé <berrange@redhat.com>
 Daniel Veillard <veillard@redhat.com>
 Doug Goldstein <cardoe@gentoo.org>
 Eric Blake <eblake@redhat.com>
@@ -25,6 +25,7 @@ Ján Tomko <jtomko@redhat.com>
 Jim Fehlig <jfehlig@suse.com>
 Jiří Denemark <jdenemar@redhat.com>
 John Ferlan <jferlan@redhat.com>
+Katerina Koukiou <kkoukiou@redhat.com>
 Laine Stump <laine@redhat.com>
 Mark McLoughlin <markmc@redhat.com>
 Martin Kletzander <mkletzan@redhat.com>
@@ -93,7 +94,7 @@ Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com>
 Adam Litke <agl@us.ibm.com>
 Adam Walters <adam@pandorasboxen.com>
 Alan Pevec <apevec@redhat.com>
-Alex Jia <ajia@redhat.com>
+Ales Musil <amusil@redhat.com>
 Alex Williamson <alex.williamson@redhat.com>
 Alexander Burluka <aburluka@parallels.com>
 Alexander Burluka <aburluka@virtuozzo.com>
@@ -107,11 +108,9 @@ Alvaro Polo <apoloval@gmail.com>
 Amy Fong <amy.fong@windriver.com>
 Amy Griffis <amy.griffis@hp.com>
 Anatole Denis <natolumin@gmail.com>
-Andrea Bolognani <abologna@redhat.com>
 Andres Lagar-Cavilla <andres@lagarcavilla.org>
 Anirban Chakraborty <abchak@juniper.net>
 Ansis Atteka <aatteka@nicira.com>
-Anthony Liguori <aliguori@us.ibm.com>
 Anthony PERARD <anthony.perard@citrix.com>
 Antoine Millet <antoine.millet@tdf.fr>
 Anton Khramov <anton@endocode.com>
@@ -124,7 +123,6 @@ Ashish Mittal <Ashish.Mittal@veritas.com>
 Ashish Mittal <ashmit602@gmail.com>
 Ata E Husain Bohra <ata.husain@hotmail.com>
 Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>
-Atsushi SAKAI <sakaia@jp.fujitsu.com>
 Aurelien Rougemont <beorn@binaries.fr>
 Bamvor Jian Zhang <bamv2005@gmail.com>
 Bamvor Jian Zhang <bjzhang@suse.com>
@@ -136,7 +134,9 @@ Bing Bu Cao <mars@linux.vnet.ibm.com>
 Bjoern Walk <bwalk@linux.ibm.com>
 Bjoern Walk <bwalk@linux.vnet.ibm.com>
 Bob Liu <bob.liu@oracle.com>
+Bobo Du <dubo163@126.com>
 Bogdan Purcareata <bogdan.purcareata@freescale.com>
+Boris Fiuczynski <fiuczy@linux.ibm.com>
 Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
 Brandon Bennett <bbennett@fb.com>
 Brian Candler <b.candler@pobox.com>
@@ -152,34 +152,26 @@ Chen Fan <chen.fan.fnst@cn.fujitsu.com>
 Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 Chen Hanxiao <chenhanxiao@gmail.com>
 Chris J Arges <chris.j.arges@canonical.com>
-Chris Lalancette <clalance@redhat.com>
 Chris St. Pierre <chris.a.st.pierre@gmail.com>
 Chris Wong <wongc-redhat@hoku.net>
 Chris Wright <chrisw@redhat.com>
 Christian Benvenuti <benve@cisco.com>
-Christian Ehrhardt <christian.ehrhardt@canonical.com>
 Christian Franke <nobody@nowhere.ws>
 Christian Loehle <cloehle@linutronix.de>
 Christoffer Dall <cdall@linaro.org>
-Christophe Fergeau <cfergeau@redhat.com>
 Chuck Short <chuck.short@canonical.com>
 Chuck Short <zulcss@gmail.com>
 Chunhe Li <lichunhe@huawei.com>
 Chunyan Liu <cyliu@suse.com>
 Clark Laughlin <clark.laughlin@linaro.org>
 Claudio André <claudioandre.br@gmail.com>
-Claudio Bley <claudio.bley@gmail.com>
 Clementine Hayat <clem@lse.epita.fr>
-Cole Robinson <crobinso@redhat.com>
 Collin L. Walling <walling@linux.vnet.ibm.com>
 Conrad Meyer <cse.cem@gmail.com>
 Corey S. McQuay <csmcquay@linux.vnet.ibm.com>
 Cristian Klein <cristiklein@gmail.com>
-Cédric Bosdonnat <cbosdonnat@suse.com>
-Cédric Bosdonnat <cedric.bosdonnat@free.fr>
 Dan Horák <dan@danny.cz>
 Dan Kenigsberg <danken@redhat.com>
-Dan Smith <danms@us.ibm.com>
 Dan Zheng <dzheng@redhat.com>
 Daniel Berteaud <daniel@firewall-services.com>
 Daniel Gollub <gollub@b1-systems.de>
@@ -187,13 +179,8 @@ Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>
 Daniel J Walsh <dwalsh@redhat.com>
 Daniel Liu <srwx4096@gmail.com>
 Daniel Nicoletti <dantti12@gmail.com>
-Daniel P. Berrange <berrange@redhat.com>
-Daniel P. Berrangé <berrange@redhat.com>
-Daniel Veillard <veillard@redhat.com>
 Dario Faggioli <dario.faggioli@citrix.com>
 Darryl L. Pierce <dpierce@redhat.com>
-Dave Allan <dallan@redhat.com>
-David Allan <dallan@redhat.com>
 David Dai <zdai@linux.vnet.ibm.com>
 David Jorm <dfj@redhat.com>
 David Kiarie <davidkiarie4@gmail.com>
@@ -216,7 +203,6 @@ Diego Woitasen <diego.woitasen@vhgroup.net>
 Dipankar Sarma <dipankar@in.ibm.com>
 Dirk Herrendoerfer <d.herrendoerfer@herrendoerfer.name>
 Dmitry Andreev <dandreev@virtuozzo.com>
-Dmitry Guryanov <dguryanov@parallels.com>
 Dmitry Mishin <dim@virtuozzo.com>
 Dominik Perpeet <dperpeet@redhat.com>
 Don Dugger <n0ano@n0ano.com>
@@ -235,10 +221,8 @@ Eduardo Otubo <otubo@linux.vnet.ibm.com>
 Eiichi Tsukata <eiichi.tsukata.xh@hitachi.com>
 Eli Qiao <liyong.qiao@intel.com>
 Eli Qiao <taget@linux.vnet.ibm.com>
-Eric Blake <eblake@redhat.com>
 Eric Farman <farman@linux.vnet.ibm.com>
 Eric W. Biederman <ebiederm@xmission.com>
-Erik Skultety <eskultet@redhat.com>
 Ersek Laszlo <lacos@caesar.elte.hu>
 Eugen Feller <eugen.feller@inria.fr>
 Fabian Freyer <fabian.freyer@physik.tu-berlin.de>
@@ -272,9 +256,7 @@ Gerhard Stenzel <gerhard.stenzel@de.ibm.com>
 Giuseppe Scrivano <gscrivan@redhat.com>
 Gordon Messmer <gordon@dragonsdawn.net>
 Guan Qiang <hzguanqiang@corp.netease.com>
-Guannan Ren <gren@redhat.com>
 Gui Jianfeng <guijianfeng@cn.fujitsu.com>
-Guido Günther <agx@sigxcpu.org>
 Han Cheng <hanc.fnst@cn.fujitsu.com>
 Han Han <hhan@redhat.com>
 Hao Liu <hliu@redhat.com>
@@ -321,8 +303,6 @@ Jesse J. Cook <jesse.j.cook@member.fsf.org>
 Jianwei Hu <jiahu@redhat.com>
 Jie Wang <wangjie88@huawei.com>
 JieWang <wangjie88@huawei.com>
-Jim Fehlig <jfehlig@suse.com>
-Jim Meyering <meyering@redhat.com>
 Jim Paris <jim@jtan.com>
 Jincheng Miao <jmiao@redhat.com>
 Jingjing Shao <jishao@redhat.com>
@@ -330,8 +310,6 @@ Jiri Denemark <jdenemar@redhat.com>
 Joao Martins <joao.m.martins@oracle.com>
 Joel SIMOES <joel.simoes@laposte.net>
 John Eckersberg <jeckersb@redhat.com>
-John Ferlan <jferlan@redhat.com>
-John Levon <john.levon@sun.com>
 John Morrissey <jwm@horde.net>
 John Williams <john.williams@petalogix.com>
 Jonas Eriksson <jonas.j.eriksson@ericsson.com>
@@ -344,14 +322,9 @@ Juan Hernandez <jhernand@redhat.com>
 Juerg Haefliger <juerg.haefliger@hp.com>
 Julio Faracco <jcfaracco@gmail.com>
 Jun Koi <junkoi2004@gmail.com>
-Justin Clift <jclift@redhat.com>
-Ján Tomko <jtomko@redhat.com>
 KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
 Kai Kang <kai.kang@windriver.com>
-Karel Zak <kzak@redhat.com>
 Kashyap Chamarthy <kchamart@redhat.com>
-Katerina Koukiou <k.koukiou@googlemail.com>
-Katerina Koukiou <kkoukiou@redhat.com>
 Kay Schubert <kayegypt@web.de>
 Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com>
 Kenneth Nagin <NAGIN@il.ibm.com>
@@ -364,7 +337,6 @@ Kyle DeFrancia <kdef@linux.vnet.ibm.com>
 Kyle Mestery <kmestery@cisco.com>
 Ladi Prosek <lprosek@redhat.com>
 Lai Jiangshan <laijs@cn.fujitsu.com>
-Laine Stump <laine@redhat.com>
 Laszlo Ersek <lersek@redhat.com>
 Laurent Bigonville <bigon@bigon.be>
 Laurent Léonard <laurent@open-minds.org>
@@ -391,27 +363,23 @@ Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
 Marc-André Lureau <marcandre.lureau@redhat.com>
 Marcelo Cerri <mhcerri@linux.vnet.ibm.com>
 Marco Bozzolan <bozzolan@gmail.com>
+Marcos Paulo de Souza <marcos.souza.org@gmail.com>
 Marek Marczykowski <marmarek@invisiblethingslab.com>
 Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
 Marian Neagul <marian@info.uvt.ro>
-Mark McLoughlin <markmc@redhat.com>
 Mark Wu <dwu@redhat.com>
 Marko Myllynen <myllynen@redhat.com>
 Markus Groß <gross@univention.de>
 Marti Raudsepp <marti@juffo.org>
-Martin Kletzander <mkletzan@redhat.com>
 Martin Pietsch <martin.pietsch@tu-dresden.de>
 Martin Wilck <mwilck@suse.de>
 Matthew Booth <mbooth@redhat.com>
 Matthew Rosato <mjrosato@linux.vnet.ibm.com>
-Matthias Bolte <matthias.bolte@googlemail.com>
 Matthias Dahl <mdvirt@designassembly.de>
 Matthias Gatto <matthias.gatto@outscale.com>
 Matthieu Coudron <mattator@gmail.com>
 Mattias Bolte <matthias.bolte@googlemail.com>
 Matwey V. Kornilov <matwey.kornilov@gmail.com>
-Maxim Nestratov <mnestratov@parallels.com>
-Maxim Nestratov <mnestratov@virtuozzo.com>
 Maxim Perevedentsev <mperevedentsev@virtuozzo.com>
 Maxime Leroy <maxime.leroy@6wind.com>
 Maximilian Wilhelm <max@rfc2324.org>
@@ -425,9 +393,6 @@ Michael Wood <esiotrot@gmail.com>
 Michal Dubiel <md@semihalf.com>
 Michal Koutný <mkoutny@suse.com>
 Michal Novotny <minovotn@redhat.com>
-Michal Privoznik <miso.privoznik@gmail.com>
-Michal Privoznik <mprivozn@redhat.com>
-Michal Prívozník <mprivozn@redhat.com>
 Michał Łomnicki <michal.lomnicki@gmail.com>
 Michel Normand <normand@linux.vnet.ibm.com>
 Michele Paolino <m.paolino@virtualopensystems.com>
@@ -449,8 +414,6 @@ Nehal J Wani <nehaljw.kkd1@gmail.com>
 Neil Wilson <neil@aldur.co.uk>
 Nguyen Anh Quynh <aquynh@gmail.com>
 Niels de Vos <ndevos@redhat.com>
-Nikolay Shirokovskiy <nshirokovskiy@parallels.com>
-Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
 Nikos Mavrogiannopoulos <nmav@redhat.com>
 Nikunj A. Dadhania <nikunj@linux.vnet.ibm.com>
 Nishank Trivedi <nistrive@cisco.com>
@@ -464,8 +427,6 @@ Olga Krishtal <okrishtal@virtuozzo.com>
 Olivia Yin <Hong-Hua.Yin@freescale.com>
 Olivia Yin <hong-hua.yin@freescale.com>
 Olivier Fourdan <ofourdan@redhat.com>
-Osier Yang <jyang@redhat.com>
-Osier Yang <osier@yunify.com>
 Oskari Saarenmaa <os@ohmu.fi>
 Ossi Herrala <oherrala@gmail.com>
 Paolo Bonzini <pbonzini@redhat.com>
@@ -476,14 +437,12 @@ Paul Eggert <eggert@cs.ucla.edu>
 Pavel Boldin <pboldin@mirantis.com>
 Pavel Fedin <p.fedin@samsung.com>
 Pavel Glushchak <pglushchak@virtuozzo.com>
-Pavel Hrdina <phrdina@redhat.com>
 Pavel Raiskup <praiskup@redhat.com>
 Pavel Timofeev <timp87@gmail.com>
 Paweł Krześniak <pawel.krzesniak@gmail.com>
 Peng Zhou <ailvpeng25@gmail.com>
 Peter Feiner <peter@gridcentric.ca>
 Peter Kieser <peter@kieser.ca>
-Peter Krempa <pkrempa@redhat.com>
 Peter Robinson <pbrobinson@gmail.com>
 Phil Petty <phpetty@cisco.com>
 Philipp Hahn <hahn@univention.de>
@@ -505,15 +464,12 @@ Rainer Müller <raimue@codingfarm.de>
 Ramon Medeiros <ramonn@linux.vnet.ibm.com>
 Reinier Schoof <reinier@transip.nl>
 Richa Marwaha <rmarwah@linux.vnet.ibm.com>
-Richard Jones <rjones@redhat.com>
 Richard Laager <rlaager@wiktel.com>
-Richard W.M. Jones <rjones@redhat.com>
 Richard Weinberger <richard@nod.at>
 Rick Harris <rconradharris@gmail.com>
 Riku Voipio <riku.voipio@linaro.org>
 Roland Schulz <schullzroll@gmail.com>
 Rolf Eike Beer <eike@sf-mail.de>
-Roman Bogorodskiy <bogorodskiy@gmail.com>
 Roman Mohr <rmohr@redhat.com>
 Rommer <rommer@active.by>
 Ron Yorston <rmy@tigress.co.uk>
@@ -547,12 +503,15 @@ Shanzhi Yu <shyu@redhat.com>
 ShaoHe Feng <shaohe.feng@intel.com>
 Shaohe Feng <shaohe.feng@intel.com>
 Sharadha Prabhakar <sharadha.prabhakar@citrix.com>
+Shi Lei <shilei.massclouds@gmx.com>
+Shichangkuo <shi.changkuo@h3c.com>
 Shivangi Dhir <shivangi.dhir.02@gmail.com>
 Shivaprasad G Bhat <sbhat@linux.vnet.ibm.com>
 Shivaprasad G Bhat <shivaprasadbhat@gmail.com>
 Shradha Shah <sshah@solarflare.com>
 Shuang He <shuang.he@zstack.io>
 Simon Arlott <bugzilla.redhat.simon@arlott.org>
+Simon Kobyda <skobyda@redhat.com>
 Simon McVittie <smcv@debian.org>
 Simone Gotti <simone.gotti@gmail.com>
 Soren Hansen <soren@linux2go.dk>
@@ -561,7 +520,6 @@ Sri Ramanujam <sramanujam@datto.com>
 Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
 Stef Walter <stefw@gnome.org>
 Stefan Bader <stefan.bader@canonical.com>
-Stefan Berger <stefanb@us.ibm.com>
 Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
 Stefan Hajnoczi <stefanha@redhat.com>
 Stefan Seyfried <seife@b1-systems.de>
@@ -615,7 +573,6 @@ Wei Jiangang <weijg.fnst@cn.fujitsu.com>
 Wei Liu <wei.liu2@citrix.com>
 Weilun Zhu <zhuweilun@huawei.com>
 Weiwei Li <nuonuoli@tencent.com>
-Wen Congyang <wency@cn.fujitsu.com>
 Wido den Hollander <wido@widodh.nl>
 Wieland Hoffmann <themineo@googlemail.com>
 William Grant <wgrant@ubuntu.com>
@@ -680,8 +637,6 @@ yuelongguang <yuelongguang@le.com>
 zhang bo <oscar.zhangbo@huawei.com>
 Марк Коренберг <socketpair@gmail.com>

-[....send patches to get your name here....]
-
 The libvirt logo was designed by Diana Fong

 -- End

--- a/AUTHORS.in
+++ b/AUTHORS.in
@@ -14,7 +14,7 @@ Christian Ehrhardt <christian.ehrhardt@canonical.com>
 Christophe Fergeau <cfergeau@redhat.com>
 Claudio Bley <claudio.bley@gmail.com>
 Cole Robinson <crobinso@redhat.com>
-Daniel Berrange <berrange@redhat.com>
+Daniel P. Berrangé <berrange@redhat.com>
 Daniel Veillard <veillard@redhat.com>
 Doug Goldstein <cardoe@gentoo.org>
 Eric Blake <eblake@redhat.com>
@@ -25,6 +25,7 @@ Ján Tomko <jtomko@redhat.com>
 Jim Fehlig <jfehlig@suse.com>
 Jiří Denemark <jdenemar@redhat.com>
 John Ferlan <jferlan@redhat.com>
+Katerina Koukiou <kkoukiou@redhat.com>
 Laine Stump <laine@redhat.com>
 Mark McLoughlin <markmc@redhat.com>
 Martin Kletzander <mkletzan@redhat.com>
@@ -90,9 +91,7 @@ Stefan de Konink <dekonink@kinkrsoftware.nl>
 Takahashi Tomohiro <takatom@jp.fujitsu.com>
 Tatsuro Enokura <fj7716hz@aa.jp.fujitsu.com>

-#authorslist#
-
-[....send patches to get your name here....]
+#contributorslist#

 The libvirt logo was designed by Diana Fong


--- a/ChangeLog
+++ b/ChangeLog
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,7 @@ check-access:
 cov: clean-cov
 	$(MKDIR_P) $(top_builddir)/coverage
 	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-	  -d $(top_builddir)/src  -d $(top_builddir)/daemon \
+	  -d $(top_builddir)/src \
 	  -d $(top_builddir)/tests
 	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
 	  -o $(top_builddir)/coverage/libvirt.info
@@ -109,9 +109,17 @@ gen-ChangeLog:

 .PHONY: gen-AUTHORS
 gen-AUTHORS:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then \
-	    out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
-	    perl -p -e "s/#authorslist#// and print '$$out'" \
+	$(AM_V_GEN)\
+	if test -d $(srcdir)/.git; then \
+	  ( \
+	    cd $(srcdir) && \
+	    git log --pretty=format:'%aN <%aE>' | sort -u \
+	  ) > all.list && \
+	  sort -u $(srcdir)/AUTHORS.in > maint.list && \
+	  comm -23 all.list maint.list > contrib.list && \
+	  contrib="`cat contrib.list`" && \
+	  perl -p -e "s/#contributorslist#// and print '$$contrib'" \
 	    < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
-	    mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
+	  mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \
+	  rm -f all.list maint.list contrib.list; \
 	fi
--- a/Makefile.in
+++ b/Makefile.in
@@ -131,7 +131,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/getugroups.m4 $(top_srcdir)/m4/glibc21.m4 \
 	$(top_srcdir)/m4/gnulib-common.m4 \
 	$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/grantpt.m4 \
-	$(top_srcdir)/m4/hard-locale.m4 \
 	$(top_srcdir)/m4/host-cpu-c-abi.m4 $(top_srcdir)/m4/hostent.m4 \
 	$(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inet_ntop.m4 \
 	$(top_srcdir)/m4/inet_pton.m4 $(top_srcdir)/m4/intlmacosx.m4 \
@@ -262,7 +261,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
 	$(top_srcdir)/m4/virt-gnutls.m4 $(top_srcdir)/m4/virt-hal.m4 \
 	$(top_srcdir)/m4/virt-host-validate.m4 \
 	$(top_srcdir)/m4/virt-init-script.m4 \
-	$(top_srcdir)/m4/virt-lib.m4 $(top_srcdir)/m4/virt-libnl.m4 \
+	$(top_srcdir)/m4/virt-jansson.m4 $(top_srcdir)/m4/virt-lib.m4 \
+	$(top_srcdir)/m4/virt-libnl.m4 \
 	$(top_srcdir)/m4/virt-libpcap.m4 \
 	$(top_srcdir)/m4/virt-libssh.m4 \
 	$(top_srcdir)/m4/virt-libxml.m4 \
@@ -1086,6 +1086,7 @@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
 HAVE_DECL_TANL = @HAVE_DECL_TANL@
 HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@
 HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@
+HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@
 HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@
 HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@
 HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
@@ -1143,6 +1144,7 @@ HAVE_HYPOTL = @HAVE_HYPOTL@
 HAVE_ILOGB = @HAVE_ILOGB@
 HAVE_ILOGBF = @HAVE_ILOGBF@
 HAVE_ILOGBL = @HAVE_ILOGBL@
+HAVE_IMAXDIV_T = @HAVE_IMAXDIV_T@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISBLANK = @HAVE_ISBLANK@
 HAVE_ISNAND = @HAVE_ISNAND@
@@ -1303,7 +1305,6 @@ HAVE_TANL = @HAVE_TANL@
 HAVE_TERMIOS_H = @HAVE_TERMIOS_H@
 HAVE_TIMEGM = @HAVE_TIMEGM@
 HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
-HAVE_TRUNCATE = @HAVE_TRUNCATE@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_TZSET = @HAVE_TZSET@
 HAVE_UNAME = @HAVE_UNAME@
@@ -1380,6 +1381,8 @@ IP6TABLES_PATH = @IP6TABLES_PATH@
 IPTABLES_PATH = @IPTABLES_PATH@
 IP_PATH = @IP_PATH@
 ISCSIADM = @ISCSIADM@
+JANSSON_CFLAGS = @JANSSON_CFLAGS@
+JANSSON_LIBS = @JANSSON_LIBS@
 LD = @LD@
 LDEXP_LIBM = @LDEXP_LIBM@
 LDFLAGS = @LDFLAGS@
@@ -1596,7 +1599,6 @@ PVCREATE = @PVCREATE@
 PVREMOVE = @PVREMOVE@
 PVS = @PVS@
 PYTHON = @PYTHON@
-QEMU = @QEMU@
 QEMU_BRIDGE_HELPER = @QEMU_BRIDGE_HELPER@
 QEMU_PR_HELPER = @QEMU_PR_HELPER@
 RADVD = @RADVD@
@@ -1860,6 +1862,8 @@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
 SSH2_CFLAGS = @SSH2_CFLAGS@
 SSH2_LIBS = @SSH2_LIBS@
+STABLE_ORDERING_JANSSON_CFLAGS = @STABLE_ORDERING_JANSSON_CFLAGS@
+STABLE_ORDERING_JANSSON_LIBS = @STABLE_ORDERING_JANSSON_LIBS@
 STATIC_BINARIES = @STATIC_BINARIES@
 STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
@@ -1912,8 +1916,6 @@ XENAPI_LIBS = @XENAPI_LIBS@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
 XSLTPROC = @XSLTPROC@
-YAJL_CFLAGS = @YAJL_CFLAGS@
-YAJL_LIBS = @YAJL_LIBS@
 ZFS = @ZFS@
 ZPOOL = @ZPOOL@
 abs_aux_dir = @abs_aux_dir@
@@ -2559,7 +2561,7 @@ check-access:
 cov: clean-cov
 	$(MKDIR_P) $(top_builddir)/coverage
 	$(LCOV) -c -o $(top_builddir)/coverage/libvirt.info.tmp \
-	  -d $(top_builddir)/src  -d $(top_builddir)/daemon \
+	  -d $(top_builddir)/src \
 	  -d $(top_builddir)/tests
 	$(LCOV) -r $(top_builddir)/coverage/libvirt.info.tmp \
 	  -o $(top_builddir)/coverage/libvirt.info
@@ -2582,11 +2584,19 @@ gen-ChangeLog:

 .PHONY: gen-AUTHORS
 gen-AUTHORS:
-	$(AM_V_GEN)if test -d $(srcdir)/.git; then \
-	    out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
-	    perl -p -e "s/#authorslist#// and print '$$out'" \
+	$(AM_V_GEN)\
+	if test -d $(srcdir)/.git; then \
+	  ( \
+	    cd $(srcdir) && \
+	    git log --pretty=format:'%aN <%aE>' | sort -u \
+	  ) > all.list && \
+	  sort -u $(srcdir)/AUTHORS.in > maint.list && \
+	  comm -23 all.list maint.list > contrib.list && \
+	  contrib="`cat contrib.list`" && \
+	  perl -p -e "s/#contributorslist#// and print '$$contrib'" \
 	    < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
-	    mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
+	  mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS && \
+	  rm -f all.list maint.list contrib.list; \
 	fi

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

--- a/NEWS
+++ b/NEWS
 libvirt releases
 ================

+# v4.6.0 (2018-08-06)
+
+  * New features
+
+    - qemu: Implement the HTM pSeries feature
+        Users can now decide whether HTM (Hardware Transactional Memory)
+        support should be available to the guest.
+
+    - qemu: Enable VNC console for mediated devices
+        Host devices now support a new atribute 'display' which can be used to
+        turn on frame buffer rendering on a vgpu mediated device instead of on
+        an emulated GPU, like QXL.
+
+  * Improvements
+
+    - qemu: Introduce a new video model of type 'none'
+        Introduce a new video model type that disables the automatic addition
+        of a video device to domains with 'graphics' specified in their XML.
+        This can be useful with GPU mediated devices which can serve as the
+        only rendering devices within the guest.
+
+    - virsh: Add --alias to attach-disk and attach-interface commands
+        Add option --alias to set customized device alias name when using
+        attach-disk or attach-interface commands.
+
+    - virsh: Support usb and sata address to attach-disk
+        Usb or sata address could be used when attach-disk with --address. For
+        example, use usb address as usb:<bus>.<port>, use sata address as
+        <controller>.<bus>.<unit>.
+
+  * Bug fixes
+
 # v4.5.0 (2018-07-02)

  * New features

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1569,7 +1569,6 @@ m4_include([m4/glibc21.m4])
 m4_include([m4/gnulib-common.m4])
 m4_include([m4/gnulib-comp.m4])
 m4_include([m4/grantpt.m4])
-m4_include([m4/hard-locale.m4])
 m4_include([m4/host-cpu-c-abi.m4])
 m4_include([m4/hostent.m4])
 m4_include([m4/include_next.m4])
@@ -1787,6 +1786,7 @@ m4_include([m4/virt-gnutls.m4])
 m4_include([m4/virt-hal.m4])
 m4_include([m4/virt-host-validate.m4])
 m4_include([m4/virt-init-script.m4])
+m4_include([m4/virt-jansson.m4])
 m4_include([m4/virt-lib.m4])
 m4_include([m4/virt-libnl.m4])
 m4_include([m4/virt-libpcap.m4])

--- a/cfg.mk
+++ b/cfg.mk
@@ -1057,6 +1057,17 @@ sc_prohibit_backslash_alignment:
 	halt='Do not attempt to right-align backslashes' \
 	  $(_sc_search_regexp)

+# Some syntax rules pertaining to the usage of cleanup macros
+# implementing GNU C's cleanup attribute
+
+# Rule to ensure that varibales declared using a cleanup macro are
+# always initialized.
+sc_require_attribute_cleanup_initialization:
+	@prohibit='VIR_AUTO(FREE|PTR)\(.+\) *[^=]+;' \
+	in_vc_files='\.[chx]$$' \
+	halt='variable declared with a cleanup macro must be initialized' \
+	  $(_sc_search_regexp)
+
 # We don't use this feature of maint.mk.
 prev_version_file = /dev/null


--- a/config-post.h
+++ b/config-post.h
@@ -36,6 +36,7 @@
 # undef WITH_DEVMAPPER
 # undef WITH_DTRACE_PROBES
 # undef WITH_GNUTLS
+# undef WITH_JANSSON
 # undef WITH_LIBSSH
 # undef WITH_MACVTAP
 # undef WITH_NUMACTL
@@ -43,8 +44,6 @@
 # undef WITH_SSH2
 # undef WITH_SYSTEMD_DAEMON
 # undef WITH_VIRTUALPORT
-# undef WITH_YAJL
-# undef WITH_YAJL2
 #endif

 /*

--- a/config.h.in
+++ b/config.h.in
@@ -58,6 +58,39 @@
 #ifndef __powerpc64_elfv2__
 #undef __powerpc64_elfv2__
 #endif
+#ifndef __riscv32__
+#undef __riscv32__
+#endif
+#ifndef __riscv64__
+#undef __riscv64__
+#endif
+#ifndef __riscv32_ilp32__
+#undef __riscv32_ilp32__
+#endif
+#ifndef __riscv32_ilp32f__
+#undef __riscv32_ilp32f__
+#endif
+#ifndef __riscv32_ilp32d__
+#undef __riscv32_ilp32d__
+#endif
+#ifndef __riscv64_ilp32__
+#undef __riscv64_ilp32__
+#endif
+#ifndef __riscv64_ilp32f__
+#undef __riscv64_ilp32f__
+#endif
+#ifndef __riscv64_ilp32d__
+#undef __riscv64_ilp32d__
+#endif
+#ifndef __riscv64_lp64__
+#undef __riscv64_lp64__
+#endif
+#ifndef __riscv64_lp64f__
+#undef __riscv64_lp64f__
+#endif
+#ifndef __riscv64_lp64d__
+#undef __riscv64_lp64d__
+#endif
 #ifndef __s390__
 #undef __s390__
 #endif
@@ -1072,6 +1105,10 @@
   */
 #undef HAVE_DECL_WCTOB

+/* Define to 1 if you have the declaration of `_fseeki64', and to 0 if you
+   don't. */
+#undef HAVE_DECL__FSEEKI64
+
 /* Define to 1 if you have the declaration of `_putenv', and to 0 if you
   don't. */
 #undef HAVE_DECL__PUTENV
@@ -1115,9 +1152,6 @@
 /* Define to 1 if you have the <features.h> header file. */
 #undef HAVE_FEATURES_H

-/* Define to 1 if you have the 'ffs' function. */
-#undef HAVE_FFS
-
 /* Define to 1 if you have the 'ffsl' function. */
 #undef HAVE_FFSL

@@ -1193,9 +1227,6 @@
 /* Define to 1 if you have the `getopt_long_only' function. */
 #undef HAVE_GETOPT_LONG_ONLY

-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
 /* Define to 1 if you have the `getpass' function. */
 #undef HAVE_GETPASS

@@ -1220,9 +1251,6 @@
 /* Define to 1 if you have the 'getuid' function. */
 #undef HAVE_GETUID

-/* Define to 1 if you have the `grantpt' function. */
-#undef HAVE_GRANTPT
-
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H

@@ -1365,9 +1393,6 @@
 /* Define to 1 if you have the `libxl_domain_config_from_json' function. */
 #undef HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON

-/* Define to 1 if you have the `yajl' library (-lyajl). */
-#undef HAVE_LIBYAJL
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H

@@ -1983,10 +2008,10 @@
 /* Define to 1 if you have the `table' function. */
 #undef HAVE_TABLE

-/* Define to 1 if you have the 'tcgetattr' function. */
+/* Define to 1 if the system has the 'tcgetattr' function. */
 #undef HAVE_TCGETATTR

-/* Define to 1 if you have the 'tcsetattr' function. */
+/* Define to 1 if the system has the 'tcsetattr' function. */
 #undef HAVE_TCSETATTR

 /* Define to 1 if you have the <termios.h> header file. */
@@ -2117,6 +2142,9 @@
 /* Define to 1 if you have the `xdr_u_int64_t' function. */
 #undef HAVE_XDR_U_INT64_T

+/* Define to 1 if you have the <xfs/xfs.h> header file. */
+#undef HAVE_XFS_XFS_H
+
 /* Define to 1 if you have the <xlocale.h> header file. */
 #undef HAVE_XLOCALE_H

@@ -2716,6 +2744,9 @@
 /* whether the interface driver is enabled */
 #undef WITH_INTERFACE

+/* whether jansson >= 2.5 is available */
+#undef WITH_JANSSON
+
 /* whether libparted >= $PARTED_REQUIRED is available */
 #undef WITH_LIBPARTED

@@ -2806,6 +2837,9 @@
 /* whether libssh2 >= 1.3 is available */
 #undef WITH_SSH2

+/* whether jansson >= 2.8 is available */
+#undef WITH_STABLE_ORDERING_JANSSON
+
 /* Define to 1 if at least one storage backend is in use */
 #undef WITH_STORAGE

@@ -2875,12 +2909,6 @@
 /* whether libxenserver is available */
 #undef WITH_XENAPI

-/* whether libyajl is available */
-#undef WITH_YAJL
-
-/* whether libyajl is available */
-#undef WITH_YAJL2
-
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
   significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
@@ -3246,6 +3274,13 @@
 # define _GL_ATTRIBUTE_CONST /* empty */
 #endif

+/* The __malloc__ attribute was added in gcc 3.  */
+#if 3 <= __GNUC__
+# define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+#else
+# define _GL_ATTRIBUTE_MALLOC /* empty */
+#endif
+

 /* Define to an unsigned 32-bit type if <sys/types.h> lacks this type. */
 #undef useconds_t

--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with this library.  If not, see
 dnl <http://www.gnu.org/licenses/>.

-AC_INIT([libvirt], [4.5.0], [libvir-list@redhat.com], [], [https://libvirt.org])
+AC_INIT([libvirt], [4.6.0], [libvir-list@redhat.com], [], [https://libvirt.org])
 AC_CONFIG_SRCDIR([src/libvirt.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
@@ -250,6 +250,7 @@ LIBVIRT_ARG_FIREWALLD
 LIBVIRT_ARG_FUSE
 LIBVIRT_ARG_GLUSTER
 LIBVIRT_ARG_HAL
+LIBVIRT_ARG_JANSSON
 LIBVIRT_ARG_LIBPCAP
 LIBVIRT_ARG_LIBSSH
 LIBVIRT_ARG_LIBXML
@@ -290,6 +291,7 @@ LIBVIRT_CHECK_FUSE
 LIBVIRT_CHECK_GLUSTER
 LIBVIRT_CHECK_GNUTLS
 LIBVIRT_CHECK_HAL
+LIBVIRT_CHECK_JANSSON
 LIBVIRT_CHECK_LIBNL
 LIBVIRT_CHECK_LIBPARTED
 LIBVIRT_CHECK_LIBPCAP
@@ -625,6 +627,13 @@ if test "$with_linux" = "yes"; then
    AC_CHECK_HEADERS([linux/btrfs.h])
 fi

+dnl
+dnl check for xfs dev headers required by xfs ioctl
+dnl
+if test "$with_linux" = "yes"; then
+    AC_CHECK_HEADERS([xfs/xfs.h])
+fi
+
 dnl
 dnl check for DEVLINK_CMD_ESWITCH_GET
 dnl
@@ -963,6 +972,7 @@ LIBVIRT_RESULT_FUSE
 LIBVIRT_RESULT_GLUSTER
 LIBVIRT_RESULT_GNUTLS
 LIBVIRT_RESULT_HAL
+LIBVIRT_RESULT_JANSSON
 LIBVIRT_RESULT_LIBNL
 LIBVIRT_RESULT_LIBPCAP
 LIBVIRT_RESULT_LIBSSH

--- a/debian/changelog
+++ b/debian/changelog
+libvirt (4.6.0-1) unstable; urgency=medium
+
+  * [afd5e39] d/control: Fix typo in libnss-libvirt's short description.
+    Thanks to Salvatore Bonaccorso (Closes: #904738)
+  * [f2f7871] New upstream version 4.6.0
+  * [a81e098] Drop apparmor-Fix-forgotten-comma-at-EOL.patch applied upstream
+  * [d53b4b1] Use jansson instead of yajl.  The later is no longer supported
+    upstream
+  * [bf99d36] Bump symbol versions
+
+ -- Guido Günther <agx@sigxcpu.org>  Mon, 06 Aug 2018 21:54:45 +0200
+
 libvirt (4.5.0-1) unstable; urgency=medium

  * [c2b3afc] New upstream version 4.5.0

--- a/debian/control
+++ b/debian/control
@@ -31,8 +31,8 @@ Build-Depends:
 libpolkit-gobject-1-dev,
 libcap-ng-dev [linux-any],
 libnl-3-dev [linux-any],
+ libjansson-dev,
 libnl-route-3-dev [linux-any],
- libyajl-dev,
 libpcap0.8-dev,
 libnuma-dev [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64 ppc64el],
 numad [amd64 arm64 i386 ia64 mips mipsel powerpc ppc64 ppc64el],

--- a/debian/libvirt0.symbols
+++ b/debian/libvirt0.symbols
@@ -114,7 +114,8 @@ libvirt.so.0 libvirt0 #MINVER#
 *@LIBVIRT_4.3.0 4.3.0
 *@LIBVIRT_4.4.0 4.4.0
 *@LIBVIRT_4.5.0 4.5.0
- *@LIBVIRT_PRIVATE_4.5.0 4.5.0
+ *@LIBVIRT_4.6.0 4.6.0
+ *@LIBVIRT_PRIVATE_4.6.0 4.6.0

 libvirt-qemu.so.0 libvirt0 #MINVER#
 *@LIBVIRT_QEMU_0.8.3 0.8.3
@@ -136,4 +137,4 @@ libvirt-admin.so.0 libvirt0 #MINVER#
 *@LIBVIRT_ADMIN_1.3.0 1.2.18
 *@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
 *@LIBVIRT_ADMIN_3.0.0 3.0.0
- *@LIBVIRT_ADMIN_PRIVATE_4.5.0 4.5.0
+ *@LIBVIRT_ADMIN_PRIVATE_4.6.0 4.6.0
--- a/debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
+++ b/debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch
@@ -13,10 +13,10 @@ require the 'TERM' environment variable to be set to the terminal type.
 1 file changed, 2 insertions(+)

 diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 7087abe..d7e26cb 100644
+index 55de3b2..743e4f8 100644
 --- a/src/rpc/virnetsocket.c
 +++ b/src/rpc/virnetsocket.c
-@@ -847,6 +847,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
+@@ -846,6 +846,8 @@ int virNetSocketNewConnectSSH(const char *nodename,
     virCommandAddEnvPassBlockSUID(cmd, "KRB5CCNAME", NULL);
     virCommandAddEnvPassBlockSUID(cmd, "SSH_AUTH_SOCK", NULL);
     virCommandAddEnvPassBlockSUID(cmd, "SSH_ASKPASS", NULL);

--- a/debian/patches/apparmor-Allow-virt-aa-helper-to-access-the-name-service-.patch
+++ b/debian/patches/apparmor-Allow-virt-aa-helper-to-access-the-name-service-.patch
@@ -8,7 +8,7 @@ Closes: #882979
 1 file changed, 1 insertion(+)

 diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-index d57c5bb..8aa9dd2 100644
+index 60c1d50..665094a 100644
 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 @@ -3,6 +3,7 @@

--- a/debian/patches/apparmor-Fix-forgotten-comma-at-EOL.patch
+++ b/debian/patches/apparmor-Fix-forgotten-comma-at-EOL.patch
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 4 Jul 2018 07:49:35 +0200
-Subject: apparmor: Fix forgotten comma at EOL
-
-The commit of 1fff379ff6e778 forgot comma at the end of the line
-rendering the file invalid in syntax.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
- examples/apparmor/usr.lib.libvirt.virt-aa-helper | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-index 8aa9dd2..665094a 100644
--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-@@ -51,7 +51,7 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-   @{HOME}/** r,
-   /var/lib/libvirt/images/ r,
-   /var/lib/libvirt/images/** r,
-  /var/lib/nova/instances/_base/* r
-+  /var/lib/nova/instances/_base/* r,
-   /{media,mnt,opt,srv}/** r,
-   # For virt-sandbox
-   /{,var/}run/libvirt/**/[sv]d[a-z] r,
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -9,10 +9,10 @@ to not interfere with existing network configurations
 2 files changed, 2 insertions(+), 4 deletions(-)

 diff --git a/src/Makefile.in b/src/Makefile.in
-index 106d3b8..4040cfb 100644
+index 6b93a2b..c1530a4 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -13091,8 +13091,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
+@@ -13124,8 +13124,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \
 @WITH_NETWORK_TRUE@	      $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
 @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
 @WITH_NETWORK_TRUE@	( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \

--- a/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch
+++ b/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch
@@ -11,7 +11,7 @@ Closes: #895145
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.ac b/configure.ac
-index e25bf0a..106b4bf 100644
+index c6287f6..71666ba 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -110,7 +110,7 @@ then