New upstream version 1.2.3

17 files changed, 52 insertions, 18 deletions

diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am
index 2630fef23..a741e940d 100644
--- a/examples/apparmor/Makefile.am
+++ b/examples/apparmor/Makefile.am
@@ -17,6 +17,7 @@
 EXTRA_DIST=				\
 	TEMPLATE			\
 	libvirt-qemu			\
+	libvirt-lxc 			\
 	usr.lib.libvirt.virt-aa-helper	\
 	usr.sbin.libvirtd
 
@@ -30,6 +31,7 @@ apparmor_DATA = \
 abstractionsdir = $(apparmordir)/abstractions
 abstractions_DATA = \
 	libvirt-qemu \
+	libvirt-lxc \
 	$(NULL)
 
 templatesdir = $(apparmordir)/libvirt
diff --git a/examples/apparmor/Makefile.in b/examples/apparmor/Makefile.in
index 43db4abf4..36c535a97 100644
--- a/examples/apparmor/Makefile.in
+++ b/examples/apparmor/Makefile.in
@@ -1213,6 +1213,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
@@ -1735,6 +1736,7 @@ ws_plugindir = @ws_plugindir@
 EXTRA_DIST = \
 	TEMPLATE			\
 	libvirt-qemu			\
+	libvirt-lxc 			\
 	usr.lib.libvirt.virt-aa-helper	\
 	usr.sbin.libvirtd
 
@@ -1747,6 +1749,7 @@ EXTRA_DIST = \
 @WITH_APPARMOR_PROFILES_TRUE@abstractionsdir = $(apparmordir)/abstractions
 @WITH_APPARMOR_PROFILES_TRUE@abstractions_DATA = \
 @WITH_APPARMOR_PROFILES_TRUE@	libvirt-qemu \
+@WITH_APPARMOR_PROFILES_TRUE@	libvirt-lxc \
 @WITH_APPARMOR_PROFILES_TRUE@	$(NULL)
 
 @WITH_APPARMOR_PROFILES_TRUE@templatesdir = $(apparmordir)/libvirt
diff --git a/examples/apparmor/TEMPLATE b/examples/apparmor/TEMPLATE
index 008a22124..187dec5a7 100644
--- a/examples/apparmor/TEMPLATE
+++ b/examples/apparmor/TEMPLATE
@@ -5,5 +5,5 @@
 #include <tunables/global>
 
 profile LIBVIRT_TEMPLATE {
-  #include <abstractions/libvirt-qemu>
+  #include <abstractions/libvirt-driver>
 }
diff --git a/examples/apparmor/libvirt-lxc b/examples/apparmor/libvirt-lxc
new file mode 100644
index 000000000..d404328bc
--- /dev/null
+++ b/examples/apparmor/libvirt-lxc
@@ -0,0 +1,17 @@
+# Last Modified: Fri Feb  7 13:01:36 2014
+
+  #include <abstractions/base>
+
+  # Needed for lxc-enter-namespace
+  capability sys_admin,
+  capability sys_chroot,
+
+  # Added for lxc-enter-namespace --cmd /bin/bash
+  /bin/bash PUx,
+
+  /usr/sbin/cron PUx,
+  /usr/lib/systemd/systemd PUx,
+
+  /usr/lib/libsystemd-*.so.* mr,
+  /usr/lib/libudev-*.so.* mr,
+  /etc/ld.so.cache mr,
diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
index e1980b7cb..83814ecf5 100644
--- a/examples/apparmor/libvirt-qemu
+++ b/examples/apparmor/libvirt-qemu
@@ -110,6 +110,7 @@
   /usr/bin/qemu-sparc32plus rmix,
   /usr/bin/qemu-sparc64 rmix,
   /usr/bin/qemu-x86_64 rmix,
+  /usr/lib/qemu/block-curl.so mr,
 
   # for save and resume
   /bin/dash rmix,
diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
index fd6def1d8..3011eff3f 100644
--- a/examples/apparmor/usr.sbin.libvirtd
+++ b/examples/apparmor/usr.sbin.libvirtd
@@ -25,6 +25,9 @@
   capability fsetid,
   capability audit_write,
 
+  # Needed for vfio
+  capability sys_resource,
+
   network inet stream,
   network inet dgram,
   network inet6 stream,
diff --git a/examples/dominfo/Makefile.in b/examples/dominfo/Makefile.in
index 417de81e5..415c27621 100644
--- a/examples/dominfo/Makefile.in
+++ b/examples/dominfo/Makefile.in
@@ -1239,6 +1239,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
diff --git a/examples/dominfo/info1.c b/examples/dominfo/info1.c
index 4d578bcae..cd7ecd1ca 100644
--- a/examples/dominfo/info1.c
+++ b/examples/dominfo/info1.c
@@ -19,7 +19,8 @@
  * extract the domain 0 information
  */
 static void
-getDomainInfo(int id) {
+getDomainInfo(int id)
+{
     virConnectPtr conn = NULL; /* the hypervisor connection */
     virDomainPtr dom = NULL;   /* the domain being checked */
     virDomainInfo info;        /* the information being fetched */
@@ -48,15 +49,15 @@ getDomainInfo(int id) {
 
     printf("Domains %d: %d CPUs\n", id, info.nrVirtCpu);
 
-error:
+ error:
     if (dom != NULL)
         virDomainFree(dom);
     if (conn != NULL)
         virConnectClose(conn);
 }
 
-int main() {
-
+int main()
+{
     getDomainInfo(0);
 
     return 0;
diff --git a/examples/domsuspend/Makefile.in b/examples/domsuspend/Makefile.in
index e90c7e7a3..16579c043 100644
--- a/examples/domsuspend/Makefile.in
+++ b/examples/domsuspend/Makefile.in
@@ -1239,6 +1239,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c
index f61a5d1aa..b1c49eca2 100644
--- a/examples/domsuspend/suspend.c
+++ b/examples/domsuspend/suspend.c
@@ -130,7 +130,7 @@ parse_argv(int argc, char *argv[],
         *dom_name = argv[optind];
 
     ret = 0;
-cleanup:
+ cleanup:
     return ret;
 }
 
@@ -161,7 +161,7 @@ fetch_domains(virConnectPtr conn)
     }
 
     ret = 0;
-cleanup:
+ cleanup:
     free(domains);
     return ret;
 }
@@ -216,7 +216,7 @@ suspend_and_resume(virConnectPtr conn,
     }
 
     ret = 0;
-cleanup:
+ cleanup:
     if (dom)
         virDomainFree(dom);
     return ret;
@@ -257,7 +257,7 @@ main(int argc, char *argv[])
         goto cleanup;
 
     ret = EXIT_SUCCESS;
-cleanup:
+ cleanup:
     if (conn) {
         int tmp;
         tmp = virConnectClose(conn);
diff --git a/examples/hellolibvirt/Makefile.in b/examples/hellolibvirt/Makefile.in
index 6ef6dda07..e18d9249e 100644
--- a/examples/hellolibvirt/Makefile.in
+++ b/examples/hellolibvirt/Makefile.in
@@ -1236,6 +1236,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
diff --git a/examples/hellolibvirt/hellolibvirt.c b/examples/hellolibvirt/hellolibvirt.c
index 0179fad35..c64fa9658 100644
--- a/examples/hellolibvirt/hellolibvirt.c
+++ b/examples/hellolibvirt/hellolibvirt.c
@@ -46,7 +46,7 @@ showHypervisorInfo(virConnectPtr conn)
            minor,
            release);
 
-out:
+ out:
     return ret;
 }
 
@@ -107,7 +107,7 @@ showDomains(virConnectPtr conn)
     }
     free(nameList);
 
-out:
+ out:
     return ret;
 }
 
@@ -155,7 +155,7 @@ main(int argc, char *argv[])
         goto disconnect;
     }
 
-disconnect:
+ disconnect:
     if (0 != virConnectClose(conn)) {
         printf("Failed to disconnect from hypervisor: %s\n",
                virGetLastErrorMessage());
@@ -164,6 +164,6 @@ disconnect:
         printf("Disconnected from hypervisor\n");
     }
 
-out:
+ out:
     return ret;
 }
diff --git a/examples/object-events/Makefile.in b/examples/object-events/Makefile.in
index 5b8760532..2f098728c 100644
--- a/examples/object-events/Makefile.in
+++ b/examples/object-events/Makefile.in
@@ -1237,6 +1237,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
diff --git a/examples/openauth/Makefile.in b/examples/openauth/Makefile.in
index 1d67c5310..92ef9e3d2 100644
--- a/examples/openauth/Makefile.in
+++ b/examples/openauth/Makefile.in
@@ -1236,6 +1236,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
diff --git a/examples/openauth/openauth.c b/examples/openauth/openauth.c
index e7058febb..fae96e07b 100644
--- a/examples/openauth/openauth.c
+++ b/examples/openauth/openauth.c
@@ -40,7 +40,7 @@ showError(virConnectPtr conn)
     virResetError(err);
     free(err);
 
-out:
+ out:
     return;
 }
 
@@ -82,7 +82,7 @@ showHypervisorInfo(virConnectPtr conn)
            minor,
            release);
 
-out:
+ out:
     return ret;
 }
 
@@ -144,7 +144,7 @@ showDomains(virConnectPtr conn)
         free(*(nameList + i));
     }
 
-out:
+ out:
     free(nameList);
     return ret;
 }
@@ -274,7 +274,7 @@ main(int argc, char *argv[])
         goto disconnect;
     }
 
-  disconnect:
+ disconnect:
     if (virConnectClose(conn) != 0) {
         printf("Failed to disconnect from hypervisor\n");
         showError(conn);
@@ -283,6 +283,6 @@ main(int argc, char *argv[])
         printf("Disconnected from hypervisor\n");
     }
 
-  out:
+ out:
     return ret;
 }
diff --git a/examples/systemtap/Makefile.in b/examples/systemtap/Makefile.in
index 731367a54..e26858c4c 100644
--- a/examples/systemtap/Makefile.in
+++ b/examples/systemtap/Makefile.in
@@ -1182,6 +1182,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@
diff --git a/examples/xml/nwfilter/Makefile.in b/examples/xml/nwfilter/Makefile.in
index a6b249047..ae139c08a 100644
--- a/examples/xml/nwfilter/Makefile.in
+++ b/examples/xml/nwfilter/Makefile.in
@@ -1182,6 +1182,7 @@ LIB_EXECINFO = @LIB_EXECINFO@
 LIB_FDATASYNC = @LIB_FDATASYNC@
 LIB_NANOSLEEP = @LIB_NANOSLEEP@
 LIB_POLL = @LIB_POLL@
+LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_SELECT = @LIB_SELECT@