- updated to 2.1.0

[packages/libvirt.git] / libvirt-qemu-acl.patch

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index fda5d6508f23432b3079a21615d9204b1bf9cb2e..e2de6e56806e13b835e38e018345cf727e1c3676 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,20 +1,20 @@
-diff -urp libvirt-1.3.2.orig/src/qemu/qemu_command.c libvirt-1.3.2/src/qemu/qemu_command.c
---- libvirt-1.3.2.orig/src/qemu/qemu_command.c 2016-02-24 01:55:16.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu_command.c      2016-03-18 12:33:26.562768000 +0000
-@@ -6047,6 +6047,10 @@ qemuBuildGraphicsSPICECommandLine(virQEM
-         } else {
-             virBufferAddLit(&opt, ",disable-agent-file-xfer");
-         }
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
+--- libvirt-2.1.0.orig/src/qemu/qemu_command.c 2016-08-20 10:12:37.332554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu_command.c      2016-08-20 10:13:30.288554000 +0000
+@@ -7519,6 +7519,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
 +
-+        if (cfg->vncACL) 
++        if (cfg->vncACL)
 +           virBufferAddLit(&opt, ",acl");
 +
      }
  
-     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) {
-diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf
---- libvirt-1.3.2.orig/src/qemu/qemu.conf      2016-03-18 12:16:11.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu.conf   2016-03-18 12:33:26.556768000 +0000
+     virCommandAddArg(cmd, "-vnc");
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
+--- libvirt-2.1.0.orig/src/qemu/qemu.conf      2016-08-20 10:12:37.337554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu.conf   2016-08-20 10:13:30.289554000 +0000
 @@ -80,6 +80,15 @@
  #vnc_sasl = 1
  
@@ -31,21 +31,22 @@ diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf
  # 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-1.3.2.orig/src/qemu/qemu_conf.c libvirt-1.3.2/src/qemu/qemu_conf.c
---- libvirt-1.3.2.orig/src/qemu/qemu_conf.c    2016-02-24 01:55:16.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu_conf.c 2016-03-18 12:33:26.563768000 +0000
-@@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-     GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
-     GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
-     GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio);
-+    GET_VALUE_LONG("vnc_acl", cfg->vncACL);
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
+--- libvirt-2.1.0.orig/src/qemu/qemu_conf.c    2016-08-20 10:12:37.334554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu_conf.c 2016-08-20 10:15:22.160554000 +0000
+@@ -425,6 +425,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+         goto cleanup;
+     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
+         goto cleanup;
++    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
++        goto cleanup;
+ 
  
-     p = virConfGetValue(conf, "security_driver");
-     if (p && p->type == VIR_CONF_LIST) {
-diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.h libvirt-1.3.2/src/qemu/qemu_conf.h
---- libvirt-1.3.2.orig/src/qemu/qemu_conf.h    2016-01-10 01:57:37.000000000 +0000
-+++ libvirt-1.3.2/src/qemu/qemu_conf.h 2016-03-18 12:33:26.563768000 +0000
-@@ -112,6 +112,7 @@ struct _virQEMUDriverConfig {
+     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
+diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
+--- libvirt-2.1.0.orig/src/qemu/qemu_conf.h    2016-08-20 10:12:37.334554000 +0000
++++ libvirt-2.1.0/src/qemu/qemu_conf.h 2016-08-20 10:13:30.294554000 +0000
+@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;