[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.8.5-1-5-g5947f42
Laurent Léonard
laurent at open-minds.org
Tue Nov 30 22:50:21 UTC 2010
The following commit has been merged in the experimental branch:
commit 5b081c300ac677597666d074aba94d32f390fb51
Author: Laurent Léonard <laurent at open-minds.org>
Date: Tue Nov 30 23:30:27 2010 +0100
Drop patch
0008-Move-MAX_VIRT_CPUS-so-all-xen-code-can-see-it.patch - fixed upstream http://libvirt.org/git/?p=libvirt.git;a=commit;h=dc27e089bf40ef0336667e2678774b6dadd876a5
diff --git a/debian/patches/0001-remove-RHism.diff.patch b/debian/patches/0001-remove-RHism.diff.patch
index d0a84a9..3aeab1e 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 5932aaa..7207b7e 100644
+index c97786a..b0c312c 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
-@@ -92,7 +92,7 @@ Output elapsed time information for each command.
+@@ -97,7 +97,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/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index daaf0a3..841c7f2 100644
--- a/debian/patches/0002-qemu-disable-network.diff.patch
+++ b/debian/patches/0002-qemu-disable-network.diff.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] qemu-disable-network.diff
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index 4a11c37..708cfd8 100644
+index a9a1986..8ec162a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -1204,9 +1204,6 @@ if WITH_NETWORK
+@@ -1197,9 +1197,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; }
@@ -22,10 +22,10 @@ index 4a11c37..708cfd8 100644
uninstall-local::
diff --git a/src/Makefile.in b/src/Makefile.in
-index f4bc639..939a44e 100644
+index 7893ea5..1a8853e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -5149,9 +5149,6 @@ install-data-local:
+@@ -5174,9 +5174,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/0004-fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/0004-fix-Debian-specific-path-to-hvm-loader.patch
index dce7068..820c168 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 3797865..3933c08 100644
+index b7661c0..87155ab 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
-@@ -2285,7 +2285,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2269,7 +2269,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 48bb518..17d0288 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,10 +16,10 @@ 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 c8d9a4d..8d91e45 100644
+index e6eb9b5..65bb6a0 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
-@@ -730,7 +730,8 @@ doRemoteOpen (virConnectPtr conn,
+@@ -737,7 +737,8 @@ doRemoteOpen (virConnectPtr conn,
}
case trans_ssh: {
@@ -29,7 +29,7 @@ index c8d9a4d..8d91e45 100644
if (username) nr_args += 2; /* For -l username */
if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */
-@@ -763,12 +764,44 @@ doRemoteOpen (virConnectPtr conn,
+@@ -770,12 +771,44 @@ doRemoteOpen (virConnectPtr conn,
cmd_argv[j++] = strdup ("none");
}
cmd_argv[j++] = strdup (priv->hostname);
diff --git a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
index 7addf13..ced03b8 100644
--- a/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
+++ b/debian/patches/0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
@@ -41,10 +41,10 @@ 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 d7e128c..f7a4d83 100644
+index 64ec57b..d938800 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
-@@ -1124,7 +1124,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
+@@ -1125,7 +1125,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
*total *= 1024;
}
diff --git a/debian/patches/0007-Disable-CHECKSUM-rule.patch b/debian/patches/0007-Disable-CHECKSUM-rule.patch
index ae161f4..a38ac05 100644
--- a/debian/patches/0007-Disable-CHECKSUM-rule.patch
+++ b/debian/patches/0007-Disable-CHECKSUM-rule.patch
@@ -10,7 +10,7 @@ Closes: #598330
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/util/iptables.c b/src/util/iptables.c
-index fc656b9..07c0c53 100644
+index fe78d1c..e47aeda 100644
--- a/src/util/iptables.c
+++ b/src/util/iptables.c
@@ -878,6 +878,7 @@ iptablesOutputFixUdpChecksum(iptablesContext *ctx,
diff --git a/debian/patches/0008-Move-MAX_VIRT_CPUS-so-all-xen-code-can-see-it.patch b/debian/patches/0008-Move-MAX_VIRT_CPUS-so-all-xen-code-can-see-it.patch
deleted file mode 100644
index 366e916..0000000
--- a/debian/patches/0008-Move-MAX_VIRT_CPUS-so-all-xen-code-can-see-it.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 15 Nov 2010 11:33:26 +0100
-Subject: [PATCH] Move MAX_VIRT_CPUS so all xen code can see it
-
----
- src/xen/xen_driver.h | 8 ++++++++
- src/xen/xen_hypervisor.c | 8 --------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h
-index 53f97d4..16d22f1 100644
---- a/src/xen/xen_driver.h
-+++ b/src/xen/xen_driver.h
-@@ -29,6 +29,14 @@
- # include <winsock2.h>
- # endif
-
-+/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
-+ * headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS.
-+ * Ensure MAX_VIRT_CPUS is defined accordingly.
-+ */
-+# if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS)
-+# define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS
-+# endif
-+
- extern int xenRegister (void);
-
- # define XEN_UNIFIED_HYPERVISOR_OFFSET 0
-diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
-index 3933c08..02c6b6f 100644
---- a/src/xen/xen_hypervisor.c
-+++ b/src/xen/xen_hypervisor.c
-@@ -109,14 +109,6 @@ typedef privcmd_hypercall_t hypercall_t;
- # define SYS_IFACE_MIN_VERS_NUMA 4
- #endif
-
--/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public
-- * headers. Its semanitc was retained with XEN_LEGACY_MAX_VCPUS.
-- * Ensure MAX_VIRT_CPUS is defined accordingly.
-- */
--#if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS)
--# define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS
--#endif
--
- static int xen_ioctl_hypercall_cmd = 0;
- static int initialized = 0;
- static int in_init = 0;
---
diff --git a/debian/patches/series b/debian/patches/series
index bbf703f..db58619 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
0007-Disable-CHECKSUM-rule.patch
-0008-Move-MAX_VIRT_CPUS-so-all-xen-code-can-see-it.patch
--
Libvirt Debian packaging
More information about the Pkg-libvirt-commits
mailing list