SHA256
1
0
forked from pool/libvirt

- Update to libvirt 1.0.0

- virNodeGetCPUMap: Define public API
  - Add systemd journal support
  - Add a qemu capabilities cache manager
  - USB migration support
  - various improvement and fixes when using QMP QEmu interface
  - Support for Xen 4.2 in legacy xen driver
  - Lot of localization enhancements

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=237
This commit is contained in:
2012-11-02 17:55:26 +00:00
committed by Git OBS Bridge
parent b3c36f0cbc
commit f38c7dff24
19 changed files with 101 additions and 369 deletions

View File

@@ -1,38 +0,0 @@
commit 2b32735af480055e27400068d27364d521071117
Author: Richard W.M. Jones <rjones@redhat.com>
Date: Mon Sep 24 17:35:47 2012 +0100
command: Change virCommandAddEnv so it replaces existing environment variables.
Index: libvirt-0.10.2/src/util/command.c
===================================================================
--- libvirt-0.10.2.orig/src/util/command.c
+++ libvirt-0.10.2/src/util/command.c
@@ -985,11 +985,26 @@ virCommandNonblockingFDs(virCommandPtr c
}
/* Add an environment variable to the cmd->env list. 'env' is a
- * string like "name=value".
+ * string like "name=value". If the named environment variable is
+ * already set, then it is replaced in the list.
*/
static inline void
virCommandAddEnv(virCommandPtr cmd, char *env)
{
+ size_t namelen;
+ size_t i;
+
+ /* Search for the name in the existing environment. */
+ namelen = strcspn(env, "=");
+ for (i = 0; i < cmd->nenv; ++i) {
+ /* + 1 because we want to match the '=' character too. */
+ if (STREQLEN(cmd->env[i], env, namelen + 1)) {
+ VIR_FREE(cmd->env[i]);
+ cmd->env[i] = env;
+ return;
+ }
+ }
+
/* Arg plus trailing NULL. */
if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) {
VIR_FREE(env);

View File

@@ -1,32 +0,0 @@
commit 371ddc98664cbbd8542593e5452115ea7918dae2
Author: Jim Fehlig <jfehlig@suse.com>
Date: Wed Sep 26 10:34:17 2012 -0600
Support Xen sysctl version 9 in Xen 4.2
Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9.
Support this sysctl version in the xen_hypervisor sub-driver.
Index: libvirt-0.10.2/src/xen/xen_hypervisor.c
===================================================================
--- libvirt-0.10.2.orig/src/xen/xen_hypervisor.c
+++ libvirt-0.10.2/src/xen/xen_hypervisor.c
@@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVe
goto done;
}
+ /* Xen 4.2
+ * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604
+ * domctl version 8 -> unchanged from Xen 4.1
+ */
+ hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */
+ if (virXen_getdomaininfo(fd, 0, &info) == 1) {
+ hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */
+ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
+ VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8");
+ goto done;
+ }
+ }
/*
* we failed to make the getdomaininfolist hypercall

View File

@@ -1,64 +0,0 @@
commit 416eca189b1934cfa8575ab72d142ec77600fcf9
Author: Jim Fehlig <jfehlig@suse.com>
Date: Wed Sep 26 15:20:35 2012 -0600
Fix compilation of legacy xen driver with Xen 4.2
In Xen 4.2, xs.h is deprecated in favor of xenstore.h. xs.h now
contains
#warning xs.h is deprecated use xenstore.h instead
#include <xenstore.h>
which fails compilation when warnings are treated as errors.
Introduce a configure-time check for xenstore.h and if found,
use it instead of xs.h.
Index: libvirt-0.10.2/configure.ac
===================================================================
--- libvirt-0.10.2.orig/configure.ac
+++ libvirt-0.10.2/configure.ac
@@ -768,6 +768,8 @@ if test "$with_xen" != "no" ; then
fi
if test "$with_xen" != "no" ; then
+ dnl In Xen 4.2, xs.h is deprecated in favor of xenstore.h.
+ AC_CHECK_HEADERS([xenstore.h])
AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[
if test "$with_xen" = "yes"; then
fail=1
Index: libvirt-0.10.2/src/xen/block_stats.c
===================================================================
--- libvirt-0.10.2.orig/src/xen/block_stats.c
+++ libvirt-0.10.2/src/xen/block_stats.c
@@ -32,7 +32,11 @@
# include <unistd.h>
# include <regex.h>
-# include <xs.h>
+# if HAVE_XENSTORE_H
+# include <xenstore.h>
+# else
+# include <xs.h>
+# endif
# include "virterror_internal.h"
# include "datatypes.h"
Index: libvirt-0.10.2/src/xen/xs_internal.c
===================================================================
--- libvirt-0.10.2.orig/src/xen/xs_internal.c
+++ libvirt-0.10.2/src/xen/xs_internal.c
@@ -35,7 +35,11 @@
#include <xen/dom0_ops.h>
#include <xen/version.h>
-#include <xs.h>
+#if HAVE_XENSTORE_H
+# include <xenstore.h>
+#else
+# include <xs.h>
+#endif
#include "virterror_internal.h"
#include "datatypes.h"

View File

@@ -1,48 +0,0 @@
commit 9785f2b6f203ad5f153e68829b95f0e8c30a1560
Author: Jim Fehlig <jfehlig@suse.com>
Date: Tue Oct 23 11:18:20 2012 -0600
Fix detection of Xen sysctl version 9
In commit 371ddc98, I mistakenly added the check for sysctl
version 9 after setting the hypercall version to 1, which will
fail with
error : xenHypervisorDoV1Op:967 : Unable to issue hypervisor
ioctl 3166208: Function not implemented
This check should be included along with the others that use
hypercall version 2.
Index: libvirt-0.10.2/src/xen/xen_hypervisor.c
===================================================================
--- libvirt-0.10.2.orig/src/xen/xen_hypervisor.c
+++ libvirt-0.10.2/src/xen/xen_hypervisor.c
@@ -2157,13 +2157,6 @@ xenHypervisorInit(struct xenHypervisorVe
}
}
- hv_versions.hypervisor = 1;
- hv_versions.sys_interface = -1;
- if (virXen_getdomaininfo(fd, 0, &info) == 1) {
- VIR_DEBUG("Using hypervisor call v1");
- goto done;
- }
-
/* Xen 4.2
* sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604
* domctl version 8 -> unchanged from Xen 4.1
@@ -2177,6 +2170,13 @@ xenHypervisorInit(struct xenHypervisorVe
}
}
+ hv_versions.hypervisor = 1;
+ hv_versions.sys_interface = -1;
+ if (virXen_getdomaininfo(fd, 0, &info) == 1) {
+ VIR_DEBUG("Using hypervisor call v1");
+ goto done;
+ }
+
/*
* we failed to make the getdomaininfolist hypercall
*/

View File

@@ -1,7 +1,7 @@
Index: libvirt-0.10.2/src/util/virnetdev.c Index: libvirt-1.0.0/src/util/virnetdev.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/util/virnetdev.c --- libvirt-1.0.0.orig/src/util/virnetdev.c
+++ libvirt-0.10.2/src/util/virnetdev.c +++ libvirt-1.0.0/src/util/virnetdev.c
@@ -81,7 +81,7 @@ static int virNetDevSetupControlFull(con @@ -81,7 +81,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname, static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr) struct ifreq *ifr)
@@ -11,10 +11,10 @@ Index: libvirt-0.10.2/src/util/virnetdev.c
} }
#endif #endif
Index: libvirt-0.10.2/src/util/virnetdevbridge.c Index: libvirt-1.0.0/src/util/virnetdevbridge.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/util/virnetdevbridge.c --- libvirt-1.0.0.orig/src/util/virnetdevbridge.c
+++ libvirt-0.10.2/src/util/virnetdevbridge.c +++ libvirt-1.0.0/src/util/virnetdevbridge.c
@@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con @@ -84,7 +84,7 @@ static int virNetDevSetupControlFull(con
static int virNetDevSetupControl(const char *ifname, static int virNetDevSetupControl(const char *ifname,
struct ifreq *ifr) struct ifreq *ifr)

View File

@@ -2,7 +2,7 @@ Index: src/lxc/lxc_container.c
=================================================================== ===================================================================
--- src/lxc/lxc_container.c.orig --- src/lxc/lxc_container.c.orig
+++ src/lxc/lxc_container.c +++ src/lxc/lxc_container.c
@@ -1932,6 +1932,9 @@ int lxcContainerStart(virDomainDefPtr de @@ -1937,6 +1937,9 @@ int lxcContainerStart(virDomainDefPtr de
ttyPaths, nttyPaths, handshakefd}; ttyPaths, nttyPaths, handshakefd};
/* allocate a stack for the container */ /* allocate a stack for the container */
@@ -12,7 +12,7 @@ Index: src/lxc/lxc_container.c
if (VIR_ALLOC_N(stack, stacksize) < 0) { if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError(); virReportOOMError();
return -1; return -1;
@@ -1951,7 +1954,11 @@ int lxcContainerStart(virDomainDefPtr de @@ -1956,7 +1959,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET; cflags |= CLONE_NEWNET;
} }
@@ -24,7 +24,7 @@ Index: src/lxc/lxc_container.c
VIR_FREE(stack); VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid); VIR_DEBUG("clone() completed, new container PID is %d", pid);
@@ -1977,6 +1984,7 @@ int lxcContainerAvailable(int features) @@ -1982,6 +1989,7 @@ int lxcContainerAvailable(int features)
int cpid; int cpid;
char *childStack; char *childStack;
char *stack; char *stack;
@@ -32,7 +32,7 @@ Index: src/lxc/lxc_container.c
if (features & LXC_CONTAINER_FEATURE_USER) if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER; flags |= CLONE_NEWUSER;
@@ -1984,14 +1992,21 @@ int lxcContainerAvailable(int features) @@ -1989,14 +1997,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET) if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET; flags |= CLONE_NEWNET;

View File

@@ -1,88 +0,0 @@
commit f644361b1eeb78fd59be4cd7ec85567bbf300506
Author: Richard W.M. Jones <rjones@redhat.com>
Date: Mon Sep 24 17:30:18 2012 +0100
command: Move environ-adding code to common function virCommandAddEnv.
This is just code motion. The semantics of the code should be
identical after this change.
Index: libvirt-0.10.2/src/util/command.c
===================================================================
--- libvirt-0.10.2.orig/src/util/command.c
+++ libvirt-0.10.2/src/util/command.c
@@ -984,6 +984,22 @@ virCommandNonblockingFDs(virCommandPtr c
cmd->flags |= VIR_EXEC_NONBLOCK;
}
+/* Add an environment variable to the cmd->env list. 'env' is a
+ * string like "name=value".
+ */
+static inline void
+virCommandAddEnv(virCommandPtr cmd, char *env)
+{
+ /* Arg plus trailing NULL. */
+ if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) {
+ VIR_FREE(env);
+ cmd->has_error = ENOMEM;
+ return;
+ }
+
+ cmd->env[cmd->nenv++] = env;
+}
+
/**
* virCommandAddEnvFormat:
* @cmd: the command to modify
@@ -1009,14 +1025,7 @@ virCommandAddEnvFormat(virCommandPtr cmd
}
va_end(list);
- /* Arg plus trailing NULL. */
- if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) {
- VIR_FREE(env);
- cmd->has_error = ENOMEM;
- return;
- }
-
- cmd->env[cmd->nenv++] = env;
+ virCommandAddEnv(cmd, env);
}
/**
@@ -1056,14 +1065,7 @@ virCommandAddEnvString(virCommandPtr cmd
return;
}
- /* env plus trailing NULL */
- if (VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) {
- VIR_FREE(env);
- cmd->has_error = ENOMEM;
- return;
- }
-
- cmd->env[cmd->nenv++] = env;
+ virCommandAddEnv(cmd, env);
}
@@ -1084,9 +1086,7 @@ virCommandAddEnvBuffer(virCommandPtr cmd
return;
}
- /* env plus trailing NULL. */
- if (virBufferError(buf) ||
- VIR_RESIZE_N(cmd->env, cmd->maxenv, cmd->nenv, 1 + 1) < 0) {
+ if (virBufferError(buf)) {
cmd->has_error = ENOMEM;
virBufferFreeAndReset(buf);
return;
@@ -1096,7 +1096,7 @@ virCommandAddEnvBuffer(virCommandPtr cmd
return;
}
- cmd->env[cmd->nenv++] = virBufferContentAndReset(buf);
+ virCommandAddEnv(cmd, virBufferContentAndReset(buf));
}

View File

@@ -1,7 +1,7 @@
Index: libvirt-0.10.2/examples/apparmor/Makefile.am Index: libvirt-1.0.0/examples/apparmor/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/examples/apparmor/Makefile.am --- libvirt-1.0.0.orig/examples/apparmor/Makefile.am
+++ libvirt-0.10.2/examples/apparmor/Makefile.am +++ libvirt-1.0.0/examples/apparmor/Makefile.am
@@ -1,8 +1,39 @@ @@ -1,8 +1,39 @@
## Copyright (C) 2005-2011 Red Hat, Inc. ## Copyright (C) 2005-2011 Red Hat, Inc.
## See COPYING.LIB for the License of this software ## See COPYING.LIB for the License of this software
@@ -47,10 +47,10 @@ Index: libvirt-0.10.2/examples/apparmor/Makefile.am
+ rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE + rm -f $(DESTDIR)$(sysconfdir)/apparmor.d/libvirt/TEMPLATE
+ +
+endif +endif
Index: libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in Index: libvirt-1.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in +++ libvirt-1.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+# Last Modified: Fri Aug 19 11:21:48 2011 +# Last Modified: Fri Aug 19 11:21:48 2011
+#include <tunables/global> +#include <tunables/global>
@@ -92,9 +92,9 @@ Index: libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper.in
+ /var/lib/kvm/images/ r, + /var/lib/kvm/images/ r,
+ /var/lib/kvm/images/** r, + /var/lib/kvm/images/** r,
+} +}
Index: libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper Index: libvirt-1.0.0/examples/apparmor/usr.lib.libvirt.virt-aa-helper
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper --- libvirt-1.0.0.orig/examples/apparmor/usr.lib.libvirt.virt-aa-helper
+++ /dev/null +++ /dev/null
@@ -1,38 +0,0 @@ @@ -1,38 +0,0 @@
-# Last Modified: Mon Apr 5 15:10:27 2010 -# Last Modified: Mon Apr 5 15:10:27 2010
@@ -135,9 +135,9 @@ Index: libvirt-0.10.2/examples/apparmor/usr.lib.libvirt.virt-aa-helper
- /var/lib/libvirt/images/ r, - /var/lib/libvirt/images/ r,
- /var/lib/libvirt/images/** r, - /var/lib/libvirt/images/** r,
-} -}
Index: libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd Index: libvirt-1.0.0/examples/apparmor/usr.sbin.libvirtd
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/examples/apparmor/usr.sbin.libvirtd --- libvirt-1.0.0.orig/examples/apparmor/usr.sbin.libvirtd
+++ /dev/null +++ /dev/null
@@ -1,52 +0,0 @@ @@ -1,52 +0,0 @@
-# Last Modified: Mon Apr 5 15:03:58 2010 -# Last Modified: Mon Apr 5 15:03:58 2010
@@ -192,10 +192,10 @@ Index: libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd
- change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, - change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
- -
-} -}
Index: libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd.in Index: libvirt-1.0.0/examples/apparmor/usr.sbin.libvirtd.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd.in +++ libvirt-1.0.0/examples/apparmor/usr.sbin.libvirtd.in
@@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
+# Last Modified: Fri Aug 19 11:20:36 2011 +# Last Modified: Fri Aug 19 11:20:36 2011
+#include <tunables/global> +#include <tunables/global>
@@ -254,10 +254,10 @@ Index: libvirt-0.10.2/examples/apparmor/usr.sbin.libvirtd.in
+ change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, + change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*,
+ +
+} +}
Index: libvirt-0.10.2/examples/apparmor/libvirt-qemu Index: libvirt-1.0.0/examples/apparmor/libvirt-qemu
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/examples/apparmor/libvirt-qemu --- libvirt-1.0.0.orig/examples/apparmor/libvirt-qemu
+++ libvirt-0.10.2/examples/apparmor/libvirt-qemu +++ libvirt-1.0.0/examples/apparmor/libvirt-qemu
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
# access to firmware's etc # access to firmware's etc
/usr/share/kvm/** r, /usr/share/kvm/** r,

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c155e0805275688128abdcd0f43eb32907dc80c5ea6c5cb485723ddf03d0646
size 15629786

3
libvirt-1.0.0.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e99395473b2e2639ac2031526a27295c348a1e87788b508674ed9950267650e
size 15558831

View File

@@ -1,7 +1,7 @@
Index: libvirt-0.10.2/configure.ac Index: libvirt-1.0.0/configure.ac
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/configure.ac --- libvirt-1.0.0.orig/configure.ac
+++ libvirt-0.10.2/configure.ac +++ libvirt-1.0.0/configure.ac
@@ -102,6 +102,7 @@ AVAHI_REQUIRED="0.6.0" @@ -102,6 +102,7 @@ AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6" POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0" PARTED_REQUIRED="1.8.0"
@@ -10,7 +10,7 @@ Index: libvirt-0.10.2/configure.ac
UDEV_REQUIRED=145 UDEV_REQUIRED=145
PCIACCESS_REQUIRED=0.10.0 PCIACCESS_REQUIRED=0.10.0
XMLRPC_REQUIRED=1.14.0 XMLRPC_REQUIRED=1.14.0
@@ -1950,6 +1951,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit @@ -1960,6 +1961,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_CFLAGS])
AC_SUBST([NETCF_LIBS]) AC_SUBST([NETCF_LIBS])
@@ -49,7 +49,7 @@ Index: libvirt-0.10.2/configure.ac
AC_ARG_WITH([secrets], AC_ARG_WITH([secrets],
AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes])
@@ -3185,6 +3218,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ @@ -3193,6 +3226,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
else else
AC_MSG_NOTICE([ netcf: no]) AC_MSG_NOTICE([ netcf: no])
fi fi
@@ -61,11 +61,11 @@ Index: libvirt-0.10.2/configure.ac
if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
else else
Index: libvirt-0.10.2/src/Makefile.am Index: libvirt-1.0.0/src/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/Makefile.am --- libvirt-1.0.0.orig/src/Makefile.am
+++ libvirt-0.10.2/src/Makefile.am +++ libvirt-1.0.0/src/Makefile.am
@@ -1050,6 +1050,24 @@ libvirt_driver_interface_la_LIBADD += .. @@ -1064,6 +1064,24 @@ libvirt_driver_interface_la_LIBADD += ..
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
endif endif
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
@@ -90,25 +90,23 @@ Index: libvirt-0.10.2/src/Makefile.am
endif endif
if WITH_SECRETS if WITH_SECRETS
Index: libvirt-0.10.2/tools/virsh.c Index: libvirt-1.0.0/tools/virsh.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/tools/virsh.c --- libvirt-1.0.0.orig/tools/virsh.c
+++ libvirt-0.10.2/tools/virsh.c +++ libvirt-1.0.0/tools/virsh.c
@@ -2708,6 +2708,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE @@ -2710,6 +2710,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
vshPrint(ctl, " Interface");
# if defined(WITH_NETCF)
vshPrint(ctl, " netcf"); vshPrint(ctl, " netcf");
+# else # elif defined(HAVE_UDEV)
+# ifdef WITH_NETCONTROL vshPrint(ctl, " udev");
+ vshPrint(ctl, " Interface"); +# elif defined(WITH_NETCONTROL)
+# endif + vshPrint(ctl, " netcontrol");
# endif # endif
#endif #endif
#ifdef WITH_NWFILTER #ifdef WITH_NWFILTER
Index: libvirt-0.10.2/src/interface/interface_backend_netcf.c Index: libvirt-1.0.0/src/interface/interface_backend_netcf.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/interface/interface_backend_netcf.c --- libvirt-1.0.0.orig/src/interface/interface_backend_netcf.c
+++ libvirt-0.10.2/src/interface/interface_backend_netcf.c +++ libvirt-1.0.0/src/interface/interface_backend_netcf.c
@@ -23,7 +23,12 @@ @@ -23,7 +23,12 @@
#include <config.h> #include <config.h>

View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Nov 2 11:19:46 MDT 2012 - jfehlig@suse.com
- Update to libvirt 1.0.0
- virNodeGetCPUMap: Define public API
- Add systemd journal support
- Add a qemu capabilities cache manager
- USB migration support
- various improvement and fixes when using QMP QEmu interface
- Support for Xen 4.2 in legacy xen driver
- Lot of localization enhancements
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 23 14:33:40 MDT 2012 - jfehlig@suse.com Tue Oct 23 14:33:40 MDT 2012 - jfehlig@suse.com

View File

@@ -328,7 +328,7 @@ BuildRequires: systemd
Name: libvirt Name: libvirt
Url: http://libvirt.org/ Url: http://libvirt.org/
Version: 0.10.2 Version: 1.0.0
Release: 0 Release: 0
Summary: A C toolkit to interact with the virtualization capabilities of Linux Summary: A C toolkit to interact with the virtualization capabilities of Linux
License: LGPL-2.1+ License: LGPL-2.1+
@@ -411,11 +411,6 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf Source99: baselibs.conf
# Upstream patches # Upstream patches
Patch0: 371ddc98-xen-sysctl-9.patch
Patch1: 416eca18-xenstore-header-fix.patch
Patch2: f644361b-virCommand-env.patch
Patch3: 2b32735a-virCommand-env.patch
Patch4: 9785f2b6-fix-xen-sysctl9.patch
# Need to go upstream # Need to go upstream
Patch100: xen-name-for-devid.patch Patch100: xen-name-for-devid.patch
Patch101: clone.patch Patch101: clone.patch
@@ -551,11 +546,6 @@ Authors:
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch100 -p1 %patch100 -p1
%patch101 %patch101
%patch102 -p1 %patch102 -p1
@@ -1022,6 +1012,7 @@ fi
%doc %{_docdir}/%{name}/*.gif %doc %{_docdir}/%{name}/*.gif
%doc %{_docdir}/%{name}/*.css %doc %{_docdir}/%{name}/*.css
%doc %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html
%doc %{_docdir}/%{name}/internals
%if %{with_sanlock} %if %{with_sanlock}
@@ -1040,6 +1031,7 @@ fi
%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
%dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/sanlock %dir %attr(0700, root, root) %{_localstatedir}/lib/%{name}/sanlock
%{_sbindir}/virt-sanlock-cleanup %{_sbindir}/virt-sanlock-cleanup
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_sanlock_helper
%endif %endif
%if %{with_python} %if %{with_python}

View File

@@ -1,7 +1,7 @@
Index: libvirt-0.10.2/daemon/libvirtd.conf Index: libvirt-1.0.0/daemon/libvirtd.conf
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/daemon/libvirtd.conf --- libvirt-1.0.0.orig/daemon/libvirtd.conf
+++ libvirt-0.10.2/daemon/libvirtd.conf +++ libvirt-1.0.0/daemon/libvirtd.conf
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before # It is necessary to setup a CA and issue server certificates before
# using this capability. # using this capability.
@@ -13,10 +13,10 @@ Index: libvirt-0.10.2/daemon/libvirtd.conf
# Listen for unencrypted TCP connections on the public TCP/IP port. # Listen for unencrypted TCP connections on the public TCP/IP port.
# NB, must pass the --listen flag to the libvirtd process for this to # NB, must pass the --listen flag to the libvirtd process for this to
Index: libvirt-0.10.2/daemon/libvirtd-config.c Index: libvirt-1.0.0/daemon/libvirtd-config.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/daemon/libvirtd-config.c --- libvirt-1.0.0.orig/daemon/libvirtd-config.c
+++ libvirt-0.10.2/daemon/libvirtd-config.c +++ libvirt-1.0.0/daemon/libvirtd-config.c
@@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT @@ -233,7 +233,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL; return NULL;
} }

View File

@@ -7,10 +7,10 @@ drivers as loadable modules instead of built-in to the
daemon. Then the qemu driver would only be loaded when needed, daemon. Then the qemu driver would only be loaded when needed,
which would never be the case on a xen-only configuration. which would never be the case on a xen-only configuration.
Index: libvirt-0.10.2/src/qemu/qemu_conf.c Index: libvirt-1.0.0/src/qemu/qemu_conf.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/qemu/qemu_conf.c --- libvirt-1.0.0.orig/src/qemu/qemu_conf.c
+++ libvirt-0.10.2/src/qemu/qemu_conf.c +++ libvirt-1.0.0/src/qemu/qemu_conf.c
@@ -350,9 +350,7 @@ int qemudLoadDriverConfig(struct qemud_d @@ -350,9 +350,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1; return -1;
} }

View File

@@ -1,7 +1,7 @@
Index: libvirt-0.10.2/src/qemu/qemu.conf Index: libvirt-1.0.0/src/qemu/qemu.conf
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/qemu/qemu.conf --- libvirt-1.0.0.orig/src/qemu/qemu.conf
+++ libvirt-0.10.2/src/qemu/qemu.conf +++ libvirt-1.0.0/src/qemu/qemu.conf
@@ -169,7 +169,16 @@ @@ -169,7 +169,16 @@
# a special value; security_driver can be set to that value in # a special value; security_driver can be set to that value in
# isolation, but it cannot appear in a list of drivers. # isolation, but it cannot appear in a list of drivers.
@@ -14,12 +14,12 @@ Index: libvirt-0.10.2/src/qemu/qemu.conf
+# confinement of qemu instances. +# confinement of qemu instances.
+# +#
#security_driver = "selinux" #security_driver = "selinux"
+#security_driver = "apparmor" +# security_driver = "apparmor"
+security_driver = "none" +security_driver = "none"
# If set to non-zero, then the default security labeling # If set to non-zero, then the default security labeling
# will make guests confined. If set to zero, then guests # will make guests confined. If set to zero, then guests
@@ -342,6 +351,15 @@ @@ -357,6 +366,15 @@
#allow_disk_format_probing = 1 #allow_disk_format_probing = 1

View File

@@ -1,8 +1,8 @@
Index: libvirt-0.10.2/tools/Makefile.am Index: libvirt-1.0.0/tools/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/tools/Makefile.am --- libvirt-1.0.0.orig/tools/Makefile.am
+++ libvirt-0.10.2/tools/Makefile.am +++ libvirt-1.0.0/tools/Makefile.am
@@ -169,24 +169,22 @@ install-data-local: install-init install @@ -179,24 +179,22 @@ install-data-local: install-init install
uninstall-local: uninstall-init uninstall-systemd uninstall-local: uninstall-init uninstall-systemd
install-sysconfig: install-sysconfig:
@@ -33,10 +33,10 @@ Index: libvirt-0.10.2/tools/Makefile.am
if LIBVIRT_INIT_SCRIPT_RED_HAT if LIBVIRT_INIT_SCRIPT_RED_HAT
Index: libvirt-0.10.2/tools/libvirt-guests.sysconf Index: libvirt-1.0.0/tools/libvirt-guests.sysconf
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/tools/libvirt-guests.sysconf --- libvirt-1.0.0.orig/tools/libvirt-guests.sysconf
+++ libvirt-0.10.2/tools/libvirt-guests.sysconf +++ libvirt-1.0.0/tools/libvirt-guests.sysconf
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +
@@ -101,10 +101,10 @@ Index: libvirt-0.10.2/tools/libvirt-guests.sysconf
# some file systems. # some file systems.
-#BYPASS_CACHE=0 -#BYPASS_CACHE=0
+BYPASS_CACHE=0 +BYPASS_CACHE=0
Index: libvirt-0.10.2/tools/libvirt-guests.init.sh Index: libvirt-1.0.0/tools/libvirt-guests.init.sh
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/tools/libvirt-guests.init.sh --- libvirt-1.0.0.orig/tools/libvirt-guests.init.sh
+++ libvirt-0.10.2/tools/libvirt-guests.init.sh +++ libvirt-1.0.0/tools/libvirt-guests.init.sh
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
# #
### BEGIN INIT INFO ### BEGIN INIT INFO
@@ -252,11 +252,11 @@ Index: libvirt-0.10.2/tools/libvirt-guests.init.sh
esac esac
-exit $RETVAL -exit $RETVAL
+rc_exit +rc_exit
Index: libvirt-0.10.2/daemon/Makefile.am Index: libvirt-1.0.0/daemon/Makefile.am
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/daemon/Makefile.am --- libvirt-1.0.0.orig/daemon/Makefile.am
+++ libvirt-0.10.2/daemon/Makefile.am +++ libvirt-1.0.0/daemon/Makefile.am
@@ -259,39 +259,23 @@ uninstall-logrotate: @@ -265,39 +265,23 @@ uninstall-logrotate:
rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || :
install-sysconfig: install-sysconfig:
@@ -300,10 +300,10 @@ Index: libvirt-0.10.2/daemon/Makefile.am
else else
install-init-redhat: install-init-redhat:
uninstall-init-redhat: uninstall-init-redhat:
Index: libvirt-0.10.2/daemon/libvirtd.sysconf Index: libvirt-1.0.0/daemon/libvirtd.sysconf
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/daemon/libvirtd.sysconf --- libvirt-1.0.0.orig/daemon/libvirtd.sysconf
+++ libvirt-0.10.2/daemon/libvirtd.sysconf +++ libvirt-1.0.0/daemon/libvirtd.sysconf
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
+## Path: System/Virtualization/libvirt +## Path: System/Virtualization/libvirt
+ +

View File

@@ -13,10 +13,10 @@ Date: Wed Jan 27 16:11:41 2010 -0700
This approach allows removing a disk when domain is inactive. We This approach allows removing a disk when domain is inactive. We
obviously can't search xenstore when the domain is inactive. obviously can't search xenstore when the domain is inactive.
Index: libvirt-0.10.2/src/xen/xend_internal.c Index: libvirt-1.0.0/src/xen/xend_internal.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/xen/xend_internal.c --- libvirt-1.0.0.orig/src/xen/xend_internal.c
+++ libvirt-0.10.2/src/xen/xend_internal.c +++ libvirt-1.0.0/src/xen/xend_internal.c
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@
static int static int

View File

@@ -1,8 +1,8 @@
Index: libvirt-0.10.2/src/xenxs/xen_sxpr.c Index: libvirt-1.0.0/src/xenxs/xen_sxpr.c
=================================================================== ===================================================================
--- libvirt-0.10.2.orig/src/xenxs/xen_sxpr.c --- libvirt-1.0.0.orig/src/xenxs/xen_sxpr.c
+++ libvirt-0.10.2/src/xenxs/xen_sxpr.c +++ libvirt-1.0.0/src/xenxs/xen_sxpr.c
@@ -340,7 +340,7 @@ error: @@ -341,7 +341,7 @@ error:
static int static int
xenParseSxprDisks(virDomainDefPtr def, xenParseSxprDisks(virDomainDefPtr def,
const struct sexpr *root, const struct sexpr *root,
@@ -11,7 +11,7 @@ Index: libvirt-0.10.2/src/xenxs/xen_sxpr.c
int xendConfigVersion) int xendConfigVersion)
{ {
const struct sexpr *cur, *node; const struct sexpr *cur, *node;
@@ -391,7 +391,6 @@ xenParseSxprDisks(virDomainDefPtr def, @@ -392,7 +392,6 @@ xenParseSxprDisks(virDomainDefPtr def,
/* There is a case without the uname to the CD-ROM device */ /* There is a case without the uname to the CD-ROM device */
offset = strchr(dst, ':'); offset = strchr(dst, ':');
if (!offset || if (!offset ||