[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.5-4-4-gf7b7a6a

[Laurent Léonard]

The following commit has been merged in the master branch:
commit f7b7a6add882dd50f783715f0d096d1debbc79b4
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Tue Jan 19 01:52:58 2010 +0100

    Update 0009-Fix-QEMU-driver-custom-domain-status-XML-extensions.patch.

diff --git a/debian/patches/0009-Fix-QEMU-driver-custom-domain-status-XML-extensions.patch b/debian/patches/0009-Fix-QEMU-driver-custom-domain-status-XML-extensions.patch
index c25189e..b73ce71 100644
--- a/debian/patches/0009-Fix-QEMU-driver-custom-domain-status-XML-extensions.patch
+++ b/debian/patches/0009-Fix-QEMU-driver-custom-domain-status-XML-extensions.patch
@@ -1,4 +1,3 @@
-From 8baa88ec8d89140126aaa168287a17b5cf918fb3 Mon Sep 17 00:00:00 2001
 From: Daniel P. Berrange <berrange at redhat.com>
 Date: Mon, 18 Jan 2010 16:24:25 +0000
 Subject: [PATCH] Fix QEMU driver custom domain status XML extensions
@@ -19,10 +18,10 @@ called from all locations, ensuring reliable rebuilds.
  1 files changed, 53 insertions(+), 57 deletions(-)
 
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 2d80774..9a3ddfb 100644
+index 9e44b46..0d4833e 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -892,34 +892,6 @@ qemuReconnectDomains(struct qemud_driver *driver)
+@@ -885,34 +885,6 @@ qemuReconnectDomains(struct qemud_driver *driver)
  
  
  static int
@@ -57,7 +56,7 @@ index 2d80774..9a3ddfb 100644
  qemudSecurityInit(struct qemud_driver *qemud_drv)
  {
      int ret;
-@@ -940,15 +912,52 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
+@@ -933,15 +905,52 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
      qemud_drv->securityDriver = security_drv;
  
      VIR_INFO("Initialized security driver %s", security_drv->name);
@@ -116,7 +115,7 @@ index 2d80774..9a3ddfb 100644
  
  /**
   * qemudStartup:
-@@ -1074,13 +1083,12 @@ qemudStartup(int privileged) {
+@@ -1067,13 +1076,12 @@ qemudStartup(int privileged) {
                   virStrerror(-rc, buf, sizeof(buf)));
      }
  
@@ -135,7 +134,7 @@ index 2d80774..9a3ddfb 100644
  
      if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL)
          goto error;
-@@ -1104,10 +1112,6 @@ qemudStartup(int privileged) {
+@@ -1097,10 +1105,6 @@ qemudStartup(int privileged) {
          }
      }
  
@@ -146,7 +145,7 @@ index 2d80774..9a3ddfb 100644
      /* If hugetlbfs is present, then we need to create a sub-directory within
       * it, since we can't assume the root mount point has permissions that
       * will let our spawned QEMU instances use it.
-@@ -3255,15 +3259,12 @@ static char *qemudGetCapabilities(virConnectPtr conn) {
+@@ -2859,15 +2863,12 @@ static char *qemudGetCapabilities(virConnectPtr conn) {
      char *xml = NULL;
  
      qemuDriverLock(driver);
@@ -167,7 +166,7 @@ index 2d80774..9a3ddfb 100644
  
      virCapabilitiesFree(qemu_driver->caps);
      qemu_driver->caps = caps;
-@@ -3275,11 +3276,6 @@ cleanup:
+@@ -2879,11 +2880,6 @@ cleanup:
      qemuDriverUnlock(driver);
  
      return xml;
@@ -180,4 +179,3 @@ index 2d80774..9a3ddfb 100644
  
  
 -- 
-1.6.5.2

-- 
Libvirt Debian packaging