[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.13-1-7-gcf9666c

Guido Günther agx at sigxcpu.org
Wed Aug 29 07:16:27 UTC 2012


The following commit has been merged in the experimental branch:
commit 72ed7390a6bae40d75709f1db01a4b6421774556
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Aug 28 09:26:34 2012 +0200

    Update patches
    
    Dropped patches:
        security/CVE-2012-3445.patch - fixed upstream
        virsh-Initialize-library-before-calling-virResetLast.patch - fixed upstream

diff --git a/debian/patches/Disable-failing-virnetsockettest.patch b/debian/patches/Disable-failing-virnetsockettest.patch
index 3ee553a..c2f375d 100644
--- a/debian/patches/Disable-failing-virnetsockettest.patch
+++ b/debian/patches/Disable-failing-virnetsockettest.patch
@@ -8,10 +8,10 @@ until we debugged the interaction with pbuilder
  1 file changed, 2 insertions(+)
 
 diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
-index 204113e..f025f52 100644
+index 0395601..c887db4 100644
 --- a/tests/virnetsockettest.c
 +++ b/tests/virnetsockettest.c
-@@ -491,10 +491,12 @@ mymain(void)
+@@ -496,10 +496,12 @@ mymain(void)
      if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
          ret = -1;
  
diff --git a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
index a38e8d5..f4baef3 100644
--- a/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
+++ b/debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch
@@ -3,22 +3,20 @@ Date: Sat, 14 Jan 2012 18:09:01 +0100
 Subject: Don't fail if we can't setup avahi
 
 ---
- src/rpc/virnetserver.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ src/rpc/virnetserver.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index 247ddd7..deaee13 100644
+index 0a6ecdc..0520b32 100644
 --- a/src/rpc/virnetserver.c
 +++ b/src/rpc/virnetserver.c
-@@ -672,9 +672,8 @@ void virNetServerRun(virNetServerPtr srv)
+@@ -709,8 +709,7 @@ void virNetServerRun(virNetServerPtr srv)
+ 
      virNetServerLock(srv);
  
- #if HAVE_AVAHI
 -    if (srv->mdns &&
 -        virNetServerMDNSStart(srv->mdns) < 0)
--        goto cleanup;
 +    if (srv->mdns)
-+        virNetServerMDNSStart(srv->mdns);
- #endif
+         goto cleanup;
  
-     if (srv->autoShutdownTimeout &&
+     srv->quit = 0;
diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
index 754e522..96ff8e3 100644
--- a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -10,10 +10,10 @@ Closes: #663931
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/util/util.c b/src/util/util.c
-index f886ea7..36eabc9 100644
+index 9068e0f..7ed7bf1 100644
 --- a/src/util/util.c
 +++ b/src/util/util.c
-@@ -2901,7 +2901,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+@@ -2973,7 +2973,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
  void virFileWaitForDevices(void)
  {
  # ifdef UDEVADM
diff --git a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
index df47d75..d62d6fc 100644
--- a/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch
@@ -7,7 +7,7 @@ Subject: Allow libvirt group to access the socket
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index 56e880b..624f352 100644
+index 3d296cd..2ab3de6 100644
 --- a/daemon/libvirtd.conf
 +++ b/daemon/libvirtd.conf
 @@ -78,7 +78,7 @@
diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 43e1ea8..2b60bf0 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -6,13 +6,14 @@ Origin: vendor
 
 
 
+
 ---
  tools/libvirt-guests.init.sh |   41 +++++++++++++----------------------------
  tools/libvirt-guests.sysconf |    4 ++--
  2 files changed, 15 insertions(+), 30 deletions(-)
 
 diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh
-index d5d42d6..51bb0d6 100644
+index 99ef331..1285df7 100644
 --- a/tools/libvirt-guests.init.sh
 +++ b/tools/libvirt-guests.init.sh
 @@ -4,8 +4,8 @@
@@ -80,7 +81,7 @@ index d5d42d6..51bb0d6 100644
  
  RETVAL=0
  
-@@ -503,8 +489,7 @@ gueststatus() {
+@@ -538,8 +524,7 @@ gueststatus() {
  
  # rh_status
  # Display current status: whether saved state exists, and whether start
diff --git a/debian/patches/debian/Debianize-systemd-service-files.patch b/debian/patches/debian/Debianize-systemd-service-files.patch
index ae68d69..6de0b9c 100644
--- a/debian/patches/debian/Debianize-systemd-service-files.patch
+++ b/debian/patches/debian/Debianize-systemd-service-files.patch
@@ -8,11 +8,11 @@ Subject: Debianize systemd service files
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
-index 33724ee..9b2c443 100644
+index b7afadf..32e40b4 100644
 --- a/daemon/libvirtd.service.in
 +++ b/daemon/libvirtd.service.in
-@@ -8,8 +8,8 @@ Description=Virtualization daemon
- Before=libvirt-guests.service
+@@ -9,8 +9,8 @@ Before=libvirt-guests.service
+ After=network.target
  
  [Service]
 -EnvironmentFile=-/etc/sysconfig/libvirtd
@@ -23,7 +23,7 @@ index 33724ee..9b2c443 100644
  KillMode=process
  # Override the maximum number of opened files
 diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
-index bc63e91..ea1902a 100644
+index 0f0c41c..b9d8a91 100644
 --- a/tools/libvirt-guests.service.in
 +++ b/tools/libvirt-guests.service.in
 @@ -3,7 +3,7 @@ Description=Suspend Active Libvirt Guests
diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
index 84104dc..0ccdca2 100644
--- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
+++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch
@@ -6,16 +6,17 @@ to not interfere with existing network configurations
 
 
 
+
 ---
  src/Makefile.am |    3 ---
  src/Makefile.in |    3 ---
  2 files changed, 6 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 2309984..a197759 100644
+index 95e1bea..52c22a5 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1639,9 +1639,6 @@ if WITH_NETWORK
+@@ -1729,9 +1729,6 @@ if WITH_NETWORK
  	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
@@ -26,10 +27,10 @@ index 2309984..a197759 100644
  
  uninstall-local::
 diff --git a/src/Makefile.in b/src/Makefile.in
-index 9f48cf6..1f21b0b 100644
+index 2e2f6eb..1aee11f 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -7694,9 +7694,6 @@ install-data-local:
+@@ -6751,9 +6751,6 @@ install-data-local:
  @WITH_NETWORK_TRUE@	    cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
  @WITH_NETWORK_TRUE@	      $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
  @WITH_NETWORK_TRUE@	    rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
diff --git a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
index dce8f0c..d31940c 100644
--- a/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
+++ b/debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch
@@ -7,20 +7,60 @@ Thanks: Luca Capello
 
 
 
+
 ---
- src/nwfilter/nwfilter_ebiptables_driver.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/nwfilter/nwfilter_ebiptables_driver.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
-index 1b0bbf4..24afb7b 100644
+index 11fd04c..ad1d055 100644
 --- a/src/nwfilter/nwfilter_ebiptables_driver.c
 +++ b/src/nwfilter/nwfilter_ebiptables_driver.c
-@@ -4135,7 +4135,7 @@ ebiptablesDriverInit(bool privileged)
+@@ -84,7 +84,7 @@ static char *ebtables_cmd_path;
+ static char *iptables_cmd_path;
+ static char *ip6tables_cmd_path;
+ static char *grep_cmd_path;
+-static char *gawk_cmd_path;
++static char *awk_cmd_path;
+ 
+ #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \
+     snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname)
+@@ -586,7 +586,7 @@ static int iptablesLinkIPTablesBaseChain(virBufferPtr buf,
+                       grep_cmd_path, udchain,
+ 
+                       syschain, pos, udchain,
+-                      gawk_cmd_path,
++                      awk_cmd_path,
+ 
+                       pos,
+ 
+@@ -4288,7 +4288,7 @@ ebiptablesDriverInit(bool privileged)
      if (virMutexInit(&execCLIMutex) < 0)
          return -EINVAL;
  
 -    gawk_cmd_path = virFindFileInPath("gawk");
-+    gawk_cmd_path = virFindFileInPath("awk");
++    awk_cmd_path = virFindFileInPath("awk");
      grep_cmd_path = virFindFileInPath("grep");
  
-     ebtables_cmd_path = virFindFileInPath("ebtables");
+     /*
+@@ -4302,9 +4302,9 @@ ebiptablesDriverInit(bool privileged)
+     /* make sure tools are available and work */
+     ebiptablesDriverTestCLITools();
+ 
+-    /* ip(6)tables support needs gawk & grep, ebtables doesn't */
++    /* ip(6)tables support needs awk & grep, ebtables doesn't */
+     if ((iptables_cmd_path != NULL || ip6tables_cmd_path != NULL) &&
+-        (!grep_cmd_path || !gawk_cmd_path)) {
++        (!grep_cmd_path || !awk_cmd_path)) {
+         VIR_ERROR(_("essential tools to support ip(6)tables "
+                   "firewalls could not be located"));
+         VIR_FREE(iptables_cmd_path);
+@@ -4326,7 +4326,7 @@ ebiptablesDriverInit(bool privileged)
+ static void
+ ebiptablesDriverShutdown(void)
+ {
+-    VIR_FREE(gawk_cmd_path);
++    VIR_FREE(awk_cmd_path);
+     VIR_FREE(grep_cmd_path);
+     VIR_FREE(ebtables_cmd_path);
+     VIR_FREE(iptables_cmd_path);
diff --git a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
index 4e6e239..1df3162 100644
--- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch
@@ -6,6 +6,7 @@ Closes: #517059
 
 
 
+
 ---
  src/xen/xen_hypervisor.c               |    2 +-
  tests/xencapsdata/xen-i686-pae-hvm.xml |    2 +-
@@ -15,10 +16,10 @@ Closes: #517059
  5 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index b4ec579..5160d53 100644
+index 86e0514..2e081b6 100644
 --- a/src/xen/xen_hypervisor.c
 +++ b/src/xen/xen_hypervisor.c
-@@ -2359,7 +2359,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2350,7 +2350,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
                                                "/usr/lib64/xen/bin/qemu-dm" :
                                                "/usr/lib/xen/bin/qemu-dm"),
                                               (guest_archs[i].hvm ?
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 42b22b3..5b101ca 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,10 +7,10 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 93fdac7..1aa4015 100644
+index cad5b1c..a5d2d5d 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
-@@ -104,7 +104,7 @@ alphabetic character, @, [, ], \, ^, _.
+@@ -103,7 +103,7 @@ alphabetic character, @, [, ], \, ^, _.
  
  Most B<virsh> operations rely upon the libvirt library being able to
  connect to an already running libvirtd service.  This can usually be
diff --git a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 4c47074..93ef92f 100644
--- a/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -42,7 +42,7 @@ to savely detect that the command 'info migrate' is not implemented.
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index edb5dfd..65c7d8d 100644
+index a575e30..407187b 100644
 --- a/src/qemu/qemu_monitor_text.c
 +++ b/src/qemu/qemu_monitor_text.c
 @@ -1658,7 +1658,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
@@ -54,7 +54,7 @@ index edb5dfd..65c7d8d 100644
 +        /* 'info migrate' returned help for info commands and the help page
 +         * advertises 'info migration' command. Therefore we have an old
 +         * command implementation installed and this must be kvm 72 on debian */
-+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
++        virReportError(VIR_ERR_INTERNAL_ERROR,
 +                        _("command 'info migrate' is not implemented in kvm,"
 +                          " please update to qemu-kvm"));
 +        goto cleanup;
diff --git a/debian/patches/security/CVE-2012-3445.patch b/debian/patches/security/CVE-2012-3445.patch
deleted file mode 100644
index 3bfc1b6..0000000
--- a/debian/patches/security/CVE-2012-3445.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 1 Aug 2012 13:11:34 +0200
-Subject: CVE-2012-3445
-
-Patch taken from upstream commit
-6039a2cb49c8af4c68460d2faf365a7e1c686c7b.
-
----
- daemon/remote.c |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/daemon/remote.c b/daemon/remote.c
-index b8c2aab..ed5c6af 100644
---- a/daemon/remote.c
-+++ b/daemon/remote.c
-@@ -964,7 +964,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUTE_UNUS
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0)
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0)
-         goto no_memory;
- 
-     if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
-@@ -1073,7 +1073,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATTRIBUTE
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0)
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0)
-         goto no_memory;
- 
-     if (!(dom = get_nonnull_domain(priv->conn, args->dom)))
-@@ -1254,7 +1254,7 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSED,
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0) {
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0) {
-         virReportOOMError();
-         goto cleanup;
-     }
-@@ -1728,7 +1728,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0) {
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0) {
-         virReportOOMError();
-         goto cleanup;
-     }
-@@ -1793,7 +1793,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0) {
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0) {
-         virReportOOMError();
-         goto cleanup;
-     }
-@@ -1858,7 +1858,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UNUSED,
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0) {
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0) {
-         virReportOOMError();
-         goto cleanup;
-     }
-@@ -2118,7 +2118,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED,
-         goto cleanup;
-     }
- 
--    if (VIR_ALLOC_N(params, nparams) < 0) {
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0) {
-         virReportOOMError();
-         goto cleanup;
-     }
-@@ -3621,7 +3621,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUTE_UNUS
-         virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
-         goto cleanup;
-     }
--    if (VIR_ALLOC_N(params, nparams) < 0) {
-+    if (nparams && VIR_ALLOC_N(params, nparams) < 0) {
-         virReportOOMError();
-         goto cleanup;
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 6eeff25..875c15b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,10 +5,8 @@ debian/fix-Debian-specific-path-to-hvm-loader.patch
 debian/Debianize-libvirt-guests.patch
 debian/Don-t-require-gawk-for-a-simple-print-expression.patch
 patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
-virsh-Initialize-library-before-calling-virResetLast.patch
 Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
 Reduce-udevadm-settle-timeout-to-10-seconds.patch
 debian/Debianize-systemd-service-files.patch
-security/CVE-2012-3445.patch
diff --git a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch b/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
deleted file mode 100644
index 2d74024..0000000
--- a/debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Debian Libvirt Maintainers
- <pkg-libvirt-maintainers at lists.alioth.debian.org>
-Date: Mon, 11 Apr 2011 23:31:09 +0200
-Subject: virsh: Initialize library before calling virResetLastError
-
-so the error system gets intialized via virErrorInitialize.
-
-Otherwise this results in crashes like:
-
- #0  0x40567537 in raise () from /lib/libc.so.6
- (gdb) bt
- #0  0x40567537 in raise () from /lib/libc.so.6
- #1  0x4056a922 in abort () from /lib/libc.so.6
- #2  0x4059dfbd in ?? () from /lib/libc.so.6
- #3  0x405a80ca in ?? () from /lib/libc.so.6
- #4  0x405a9918 in ?? () from /lib/libc.so.6
- #5  0x405aca5d in free () from /lib/libc.so.6
- #6  0x40057803 in virFree (ptrptr=0x892e048) at util/memory.c:310
- #7  0x400683cf in virResetError (err=0x892e028) at util/virterror.c:408
- #8  0x40068673 in virResetLastError () at util/virterror.c:439
- #9  0x4004bf53 in virEventRegisterDefaultImpl () at util/event.c:150
- #10 0x08066e78 in vshInit (argc=5, argv=0xbf9c2cd4) at virsh.c:12075
- #11 main (argc=5, argv=0xbf9c2cd4) at virsh.c:12751
----
- tools/virsh.c |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tools/virsh.c b/tools/virsh.c
-index a783f47..7221bf3 100644
---- a/tools/virsh.c
-+++ b/tools/virsh.c
-@@ -20289,6 +20289,9 @@ vshInit(vshControl *ctl)
-     /* set up the signals handlers to catch disconnections */
-     vshSetupSignals();
- 
-+    if (virInitialize() < 0)
-+        return false;
-+
-     if (virEventRegisterDefaultImpl() < 0)
-         return false;
- 

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list