[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.8.3-4-14-g1af66c1
Laurent Léonard
laurent at open-minds.org
Sun Nov 14 00:20:07 UTC 2010
The following commit has been merged in the experimental branch:
commit 5549d65527ea0ceea132daabeb460797806bce47
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sun Nov 14 01:14:33 2010 +0100
Drop patch
0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=679b464bd41667d80b361f3d14397bb8c6180721
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index b82dae2..d0a84a9 100644
--- a/debian/patches/0001-remove-RHism.diff.patch
+++ b/debian/patches/0001-remove-RHism.diff.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] remove-RHism.diff
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.pod b/tools/virsh.pod
-index e0471b1..692dc29 100644
+index 5932aaa..7207b7e 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
-@@ -42,7 +42,7 @@ the program.
+@@ -92,7 +92,7 @@ Output elapsed time information for each command.
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/0003-allow-libvirt-group-to-access-the-socket.patch b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
index 20e8fcc..33e7f26 100644
--- a/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
+++ b/debian/patches/0003-allow-libvirt-group-to-access-the-socket.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] allow libvirt group to access the socket
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index d11c0fb..8de5c82 100644
+index 163a80f..93b010d 100644
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -78,7 +78,7 @@
diff --git a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index 05a3c7b..dce7068 100644
--- a/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
+++ b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
@@ -12,10 +12,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 6246513..84fd73a 100644
+index 3797865..3933c08 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2287,7 +2287,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2285,7 +2285,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/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch b/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
index 5c2bdf1..48bb518 100644
--- a/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+++ b/debian/patches/0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
@@ -16,7 +16,7 @@ Bug: https://bugzilla.redhat.com/show_bug.cgi?id=614420
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index cb0d8e1..5fab9c1 100644
+index c8d9a4d..8d91e45 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -730,7 +730,8 @@ doRemoteOpen (virConnectPtr conn,
diff --git a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index ae0441d..7addf13 100644
--- a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -41,7 +41,7 @@ to savely detect that the command 'info migrate' is not implemented.
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
-index 69971a6..ff9641c 100644
+index d7e128c..f7a4d83 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -1124,7 +1124,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
diff --git a/debian/patches/0008-Disable-CHECKSUM-rule.patch b/debian/patches/0007-Disable-CHECKSUM-rule.patch
similarity index 83%
rename from debian/patches/0008-Disable-CHECKSUM-rule.patch
rename to debian/patches/0007-Disable-CHECKSUM-rule.patch
index cf08c49..ae161f4 100644
--- a/debian/patches/0008-Disable-CHECKSUM-rule.patch
+++ b/debian/patches/0007-Disable-CHECKSUM-rule.patch
@@ -10,10 +10,10 @@ Closes: #598330
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/util/iptables.c b/src/util/iptables.c
-index 1b905bb..2200926 100644
+index fc656b9..07c0c53 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
-@@ -795,6 +795,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
+@@ -878,6 +878,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
int port,
int action)
{
@@ -21,7 +21,7 @@ index 1b905bb..2200926 100644
char portstr[32];
snprintf(portstr, sizeof(portstr), "%d", port);
-@@ -807,6 +808,9 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
+@@ -890,6 +891,9 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
"--destination-port", portstr,
"--jump", "CHECKSUM", "--checksum-fill",
NULL);
diff --git a/debian/patches/0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch b/debian/patches/0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch
deleted file mode 100644
index a02b15d..0000000
--- a/debian/patches/0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Fri, 15 Oct 2010 18:10:47 +0200
-Subject: [PATCH] Don't fail lxc domain start when memory controller support is missing
-
-Debian stock kernel has CONFIG_CGROUP_MEM_RES_CTLR disabled due to the
-overhead [1]. Allow to start containers if the corresponding files in
-the cgroup filesystem are missing.
-
-[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=534964
-
-Closes: #566180
----
- src/lxc/lxc_controller.c | 4 +++-
- src/lxc/lxc_driver.c | 11 ++++++++---
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 7dc51a5..6204763 100644
---- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -107,7 +107,9 @@ static int lxcSetContainerResources(virDomainDefPtr def)
- virReportSystemError(-rc,
- _("Unable to set memory limit for domain %s"),
- def->name);
-- goto cleanup;
-+ /* Don't fail if we can't set memory due to lack of kernel support */
-+ if (rc != -ENOENT)
-+ goto cleanup;
- }
-
- rc = virCgroupDenyAllDevices(cgroup);
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 6fe20b1..4439a98 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -483,7 +483,7 @@ static int lxcDomainGetInfo(virDomainPtr dom,
- lxc_driver_t *driver = dom->conn->privateData;
- virDomainObjPtr vm;
- virCgroupPtr cgroup = NULL;
-- int ret = -1;
-+ int ret = -1, rc;
-
- lxcDriverLock(driver);
- vm = virDomainFindByUUID(&driver->domains, dom->uuid);
-@@ -513,10 +513,15 @@ static int lxcDomainGetInfo(virDomainPtr dom,
- "%s", _("Cannot read cputime for domain"));
- goto cleanup;
- }
-- if (virCgroupGetMemoryUsage(cgroup, &(info->memory)) < 0) {
-+ if ((rc = virCgroupGetMemoryUsage(cgroup, &(info->memory))) < 0) {
- lxcError(VIR_ERR_OPERATION_FAILED,
- "%s", _("Cannot read memory usage for domain"));
-- goto cleanup;
-+ if (rc == -ENOENT) {
-+ /* Don't fail if we can't read memory usage due to a lack of
-+ * kernel support */
-+ info->memory = 0;
-+ } else
-+ goto cleanup;
- }
- }
-
---
diff --git a/debian/patches/series b/debian/patches/series
index 69a573f..db58619 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,4 @@
0004-fix-Debian-specific-path-to-hvm-loader.patch
0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
-0007-Fix-block-statistics-with-newer-versions-of-Xen.patch
-0008-Disable-CHECKSUM-rule.patch
-0009-Don-t-fail-lxc-domain-start-when-memory-controller-s.patch
+0007-Disable-CHECKSUM-rule.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list