-diff -urp libvirt-2.3.0.orig/src/qemu/qemu_command.c libvirt-2.3.0/src/qemu/qemu_command.c
---- libvirt-2.3.0.orig/src/qemu/qemu_command.c 2016-10-28 19:15:31.893715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_command.c 2016-10-28 19:15:54.915715000 +0000
-@@ -7536,6 +7536,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu_command.c libvirt-3.0.0/src/qemu/qemu_command.c
+--- libvirt-3.0.0.orig/src/qemu/qemu_command.c 2017-02-11 16:00:09.943362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu_command.c 2017-02-11 16:01:03.437361961 +0000
+@@ -7650,6 +7650,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
/* TODO: Support ACLs later */
}
virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
---- libvirt-2.3.0.orig/src/qemu/qemu.conf 2016-10-28 19:15:31.898715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu.conf 2016-10-28 19:15:54.916715000 +0000
-@@ -104,6 +104,15 @@
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
+--- libvirt-3.0.0.orig/src/qemu/qemu.conf 2017-02-11 16:00:09.945362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu.conf 2017-02-11 16:01:03.438361961 +0000
+@@ -118,6 +118,15 @@
#vnc_sasl = 1
# The default SASL configuration file is located in /etc/sasl/
# When running libvirtd unprivileged, it may be desirable to
# override the configs in this location. Set this parameter to
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu_conf.c libvirt-2.3.0/src/qemu/qemu_conf.c
---- libvirt-2.3.0.orig/src/qemu/qemu_conf.c 2016-10-28 19:15:31.894715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_conf.c 2016-10-28 19:15:54.917715000 +0000
-@@ -468,6 +468,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.c libvirt-3.0.0/src/qemu/qemu_conf.c
+--- libvirt-3.0.0.orig/src/qemu/qemu_conf.c 2017-02-11 16:00:09.943362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu_conf.c 2017-02-11 16:01:03.438361961 +0000
+@@ -487,6 +487,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
goto cleanup;
if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
goto cleanup;
if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu_conf.h libvirt-2.3.0/src/qemu/qemu_conf.h
---- libvirt-2.3.0.orig/src/qemu/qemu_conf.h 2016-10-28 19:15:31.894715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_conf.h 2016-10-28 19:15:54.917715000 +0000
-@@ -116,6 +116,7 @@ struct _virQEMUDriverConfig {
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu_conf.h libvirt-3.0.0/src/qemu/qemu_conf.h
+--- libvirt-3.0.0.orig/src/qemu/qemu_conf.h 2017-02-11 16:00:09.943362563 +0000
++++ libvirt-3.0.0/src/qemu/qemu_conf.h 2017-02-11 16:01:03.438361961 +0000
+@@ -119,6 +119,7 @@ struct _virQEMUDriverConfig {
bool vncTLS;
bool vncTLSx509verify;
bool vncSASL;
-diff -urp libvirt-2.3.0.orig/daemon/libvirtd.conf libvirt-2.3.0/daemon/libvirtd.conf
---- libvirt-2.3.0.orig/daemon/libvirtd.conf 2016-10-28 19:13:22.641715000 +0000
-+++ libvirt-2.3.0/daemon/libvirtd.conf 2016-10-28 19:13:48.452715000 +0000
+diff -urp libvirt-3.0.0.orig/daemon/libvirtd.conf libvirt-3.0.0/daemon/libvirtd.conf
+--- libvirt-3.0.0.orig/daemon/libvirtd.conf 2017-02-11 15:58:23.924363757 +0000
++++ libvirt-3.0.0/daemon/libvirtd.conf 2017-02-11 15:58:43.786363533 +0000
@@ -123,7 +123,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-2.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am
---- libvirt-2.3.0.orig/daemon/Makefile.am 2016-10-28 19:13:22.638715000 +0000
-+++ libvirt-2.3.0/daemon/Makefile.am 2016-10-28 19:13:48.468715000 +0000
-@@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup
+diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am
+--- libvirt-3.0.0.orig/daemon/Makefile.am 2017-02-11 15:58:23.923363757 +0000
++++ libvirt-3.0.0/daemon/Makefile.am 2017-02-11 15:58:43.786363533 +0000
+@@ -532,13 +532,13 @@ POD2MAN = pod2man -c "Virtualization Sup
# the WITH_LIBVIRTD conditional
if WITH_SASL
install-data-sasl:
else ! WITH_SASL
install-data-sasl:
uninstall-data-sasl:
-diff -urp libvirt-2.3.0.orig/daemon/Makefile.in libvirt-2.3.0/daemon/Makefile.in
---- libvirt-2.3.0.orig/daemon/Makefile.in 2016-10-28 19:13:22.638715000 +0000
-+++ libvirt-2.3.0/daemon/Makefile.in 2016-10-28 19:13:48.469715000 +0000
-@@ -2847,13 +2847,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
+diff -urp libvirt-3.0.0.orig/daemon/Makefile.in libvirt-3.0.0/daemon/Makefile.in
+--- libvirt-3.0.0.orig/daemon/Makefile.in 2017-02-11 15:58:23.923363757 +0000
++++ libvirt-3.0.0/daemon/Makefile.in 2017-02-11 15:58:43.786363533 +0000
+@@ -2932,13 +2932,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
# This is needed for clients too, so can't wrap in
# the WITH_LIBVIRTD conditional
@WITH_SASL_TRUE@install-data-sasl:
@WITH_SASL_FALSE@install-data-sasl:
@WITH_SASL_FALSE@uninstall-data-sasl:
-diff -urp libvirt-2.3.0.orig/docs/auth.html libvirt-2.3.0/docs/auth.html
---- libvirt-2.3.0.orig/docs/auth.html 2016-10-28 19:13:22.665715000 +0000
-+++ libvirt-2.3.0/docs/auth.html 2016-10-28 19:13:48.470715000 +0000
-@@ -415,7 +415,7 @@ again:
+diff -urp libvirt-3.0.0.orig/docs/auth.html libvirt-3.0.0/docs/auth.html
+--- libvirt-3.0.0.orig/docs/auth.html 2017-02-11 15:58:23.865363758 +0000
++++ libvirt-3.0.0/docs/auth.html 2017-02-11 15:58:43.787363533 +0000
+@@ -257,7 +257,7 @@ again:
The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
username+password style authentication. To enable Kerberos single-sign-on instead,
The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
instead of the default <code>digest-md5</code>, and keytab should be set to
<code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-diff -urp libvirt-2.3.0.orig/docs/auth.html.in libvirt-2.3.0/docs/auth.html.in
---- libvirt-2.3.0.orig/docs/auth.html.in 2016-10-28 19:13:22.677715000 +0000
-+++ libvirt-2.3.0/docs/auth.html.in 2016-10-28 19:13:48.474715000 +0000
+diff -urp libvirt-3.0.0.orig/docs/auth.html.in libvirt-3.0.0/docs/auth.html.in
+--- libvirt-3.0.0.orig/docs/auth.html.in 2017-02-11 15:58:23.867363758 +0000
++++ libvirt-3.0.0/docs/auth.html.in 2017-02-11 15:58:43.787363533 +0000
@@ -246,7 +246,7 @@ again:
The plain TCP socket of the libvirt daemon defaults to using SASL for authentication.
The SASL mechanism configured by default is DIGEST-MD5, which provides a basic
The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
instead of the default <code>digest-md5</code>, and keytab should be set to
<code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-Only in libvirt-2.3.0: libvirt-sasl.patch
-diff -urp libvirt-2.3.0.orig/libvirt.spec libvirt-2.3.0/libvirt.spec
---- libvirt-2.3.0.orig/libvirt.spec 2016-10-28 19:13:22.458715000 +0000
-+++ libvirt-2.3.0/libvirt.spec 2016-10-28 19:13:48.474715000 +0000
-@@ -1832,7 +1832,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
+diff -urp libvirt-3.0.0.orig/libvirt.spec libvirt-3.0.0/libvirt.spec
+--- libvirt-3.0.0.orig/libvirt.spec 2017-02-11 15:58:23.878363757 +0000
++++ libvirt-3.0.0/libvirt.spec 2017-02-11 15:58:43.787363533 +0000
+@@ -1844,7 +1844,7 @@ exit 0
+
+ %{_datadir}/libvirt/test-screenshot.png
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
%files admin
%{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.3.0.orig/libvirt.spec.in libvirt-2.3.0/libvirt.spec.in
---- libvirt-2.3.0.orig/libvirt.spec.in 2016-10-28 19:13:22.455715000 +0000
-+++ libvirt-2.3.0/libvirt.spec.in 2016-10-28 19:13:48.475715000 +0000
-@@ -1832,7 +1832,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
+diff -urp libvirt-3.0.0.orig/libvirt.spec.in libvirt-3.0.0/libvirt.spec.in
+--- libvirt-3.0.0.orig/libvirt.spec.in 2017-02-11 15:58:23.877363757 +0000
++++ libvirt-3.0.0/libvirt.spec.in 2017-02-11 15:58:43.787363533 +0000
+@@ -1844,7 +1844,7 @@ exit 0
+
+ %{_datadir}/libvirt/test-screenshot.png
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
%files admin
%{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
---- libvirt-2.3.0.orig/src/qemu/qemu.conf 2016-10-28 19:13:22.586715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu.conf 2016-10-28 19:13:48.475715000 +0000
-@@ -98,18 +98,18 @@
+diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf
+--- libvirt-3.0.0.orig/src/qemu/qemu.conf 2017-02-11 15:58:23.898363757 +0000
++++ libvirt-3.0.0/src/qemu/qemu.conf 2017-02-11 15:58:43.788363533 +0000
+@@ -112,18 +112,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
#
# QEMU implements an extension for providing audio over a VNC connection,
-@@ -173,17 +173,17 @@
+@@ -187,17 +187,17 @@
# Enable use of SASL encryption on the SPICE server. This requires
# a SPICE client which supports the SASL protocol extension.
#
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -urp libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-2.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-10-28 19:13:22.588715000 +0000
-+++ libvirt-2.3.0/src/qemu/test_libvirtd_qemu.aug.in 2016-10-28 19:14:27.032715000 +0000
-@@ -11,7 +11,7 @@ module Test_libvirtd_qemu =
+diff -urp libvirt-3.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.0.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-3.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-02-11 15:58:23.898363757 +0000
++++ libvirt-3.0.0/src/qemu/test_libvirtd_qemu.aug.in 2017-02-11 15:58:43.788363533 +0000
+@@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
{ "vnc_sasl" = "1" }
{ "vnc_allow_host_audio" = "0" }
{ "spice_listen" = "0.0.0.0" }
{ "spice_tls" = "1" }
-@@ -19,7 +19,7 @@ module Test_libvirtd_qemu =
+@@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
{ "spice_auto_unix_socket" = "1" }
{ "spice_password" = "XYZ12345" }
{ "spice_sasl" = "1" }
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
---- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-10-28 19:13:23.321715000 +0000
-+++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-10-28 19:13:48.476715000 +0000
+diff -urp libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args
+--- libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2017-02-11 15:58:23.938363757 +0000
++++ libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2017-02-11 15:58:43.788363533 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
---- libvirt-2.3.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-10-28 19:13:23.321715000 +0000
-+++ libvirt-2.3.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-10-28 19:13:48.476715000 +0000
+diff -urp libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args
+--- libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2017-02-11 15:58:23.938363757 +0000
++++ libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2017-02-11 15:58:43.788363533 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
---- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:23.399715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-10-28 19:13:48.476715000 +0000
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args
+--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-02-11 15:58:23.949363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-02-11 15:58:43.788363533 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
QEMU_AUDIO_DRV=spice \
/usr/bin/qemu \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
---- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-10-28 19:13:23.399715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-10-28 19:13:48.477715000 +0000
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args
+--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2017-02-11 15:58:23.950363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2017-02-11 15:58:43.788363533 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
---- libvirt-2.3.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-10-28 19:13:23.399715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-10-28 19:13:48.477715000 +0000
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
+--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2017-02-11 15:58:23.950363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2017-02-11 15:58:43.788363533 +0000
@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \
-name QEMUGuest1 \
-diff -urp libvirt-2.3.0.orig/tests/qemuxml2argvtest.c libvirt-2.3.0/tests/qemuxml2argvtest.c
---- libvirt-2.3.0.orig/tests/qemuxml2argvtest.c 2016-10-28 19:13:22.696715000 +0000
-+++ libvirt-2.3.0/tests/qemuxml2argvtest.c 2016-10-28 19:13:48.478715000 +0000
-@@ -978,7 +978,7 @@ mymain(void)
+diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvtest.c libvirt-3.0.0/tests/qemuxml2argvtest.c
+--- libvirt-3.0.0.orig/tests/qemuxml2argvtest.c 2017-02-11 15:58:23.934363757 +0000
++++ libvirt-3.0.0/tests/qemuxml2argvtest.c 2017-02-11 15:59:22.996363092 +0000
+@@ -1033,7 +1033,7 @@ mymain(void)
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
- ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
+ ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
- DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC);
+ DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1002,7 +1002,7 @@ mymain(void)
+@@ -1057,7 +1057,7 @@ mymain(void)
DO_TEST("graphics-spice-no-args",
- QEMU_CAPS_SPICE);
+ QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->spiceSASL = 1;
- ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
+ ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
DO_TEST("graphics-spice-sasl",
- QEMU_CAPS_VGA_QXL,
QEMU_CAPS_SPICE,
-diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.3.0/tests/virconfdata/libvirtd.conf
---- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:23.469715000 +0000
-+++ libvirt-2.3.0/tests/virconfdata/libvirtd.conf 2016-10-28 19:13:48.478715000 +0000
+ QEMU_CAPS_DEVICE_QXL);
+diff -urp libvirt-3.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.0.0/tests/virconfdata/libvirtd.conf
+--- libvirt-3.0.0.orig/tests/virconfdata/libvirtd.conf 2017-02-11 15:58:24.047363756 +0000
++++ libvirt-3.0.0/tests/virconfdata/libvirtd.conf 2017-02-11 15:58:43.789363533 +0000
@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
# the network providing auth (eg, TLS/x509 certificates)
#
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out libvirt-2.3.0/tests/virconfdata/libvirtd.out
---- libvirt-2.3.0.orig/tests/virconfdata/libvirtd.out 2016-10-28 19:13:23.469715000 +0000
-+++ libvirt-2.3.0/tests/virconfdata/libvirtd.out 2016-10-28 19:13:48.479715000 +0000
+diff -urp libvirt-3.0.0.orig/tests/virconfdata/libvirtd.out libvirt-3.0.0/tests/virconfdata/libvirtd.out
+--- libvirt-3.0.0.orig/tests/virconfdata/libvirtd.out 2017-02-11 15:58:24.047363756 +0000
++++ libvirt-3.0.0/tests/virconfdata/libvirtd.out 2017-02-11 15:58:43.789363533 +0000
@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
# the network providing auth (eg, TLS/x509 certificates)
#