[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.6.3-4-7-g05e9a39
Guido Günther
agx at sigxcpu.org
Fri Jun 12 16:32:34 UTC 2009
The following commit has been merged in the master branch:
commit 30d86c18bc73118ceec0f1b63308065e9e66ed6e
Author: Guido Günther <agx at sigxcpu.org>
Date: Thu Jun 4 12:48:38 2009 +0200
drop patches
0005-don-t-crash-with-def-NULL.patch - applied upstream
0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch - fixed upstream
0007-Declare-support-for-QEMU-migration-in-capabilities.patch - fixed upstream
diff --git a/debian/patches/0002-qemu-disable-network.diff.patch b/debian/patches/0002-qemu-disable-network.diff.patch
index 1308329..120b7f4 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/qemud/Makefile.am b/qemud/Makefile.am
-index 924e8ad..436b396 100644
+index 403846a..c3f41d4 100644
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
-@@ -155,9 +155,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
+@@ -161,9 +161,6 @@ install-data-local: install-init install-data-sasl install-data-polkit \
test -z "$(UUID)" || \
sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
$(DESTDIR)$(sysconfdir)/$(default_xml_dest)
@@ -22,10 +22,10 @@ index 924e8ad..436b396 100644
mkdir -p $(DESTDIR)$(localstatedir)/run/libvirt
mkdir -p $(DESTDIR)$(localstatedir)/lib/libvirt
diff --git a/qemud/Makefile.in b/qemud/Makefile.in
-index 99afa00..9711335 100644
+index dbc6bb3..e8dfa5b 100644
--- a/qemud/Makefile.in
+++ b/qemud/Makefile.in
-@@ -1295,9 +1295,6 @@ remote_protocol.c: remote_protocol.h
+@@ -1307,9 +1307,6 @@ remote_protocol.c: remote_protocol.h
@WITH_LIBVIRTD_TRUE@ test -z "$(UUID)" || \
@WITH_LIBVIRTD_TRUE@ sed -i -e "s,</name>,</name>\n <uuid>$(UUID)</uuid>," \
@WITH_LIBVIRTD_TRUE@ $(DESTDIR)$(sysconfdir)/$(default_xml_dest)
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 e3cd57c..8dcaca9 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
@@ -8,10 +8,10 @@ Closes: #517059
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/xen_internal.c b/src/xen_internal.c
-index 7a88ca2..0031c78 100644
+index 06b0cba..252772d 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
-@@ -2187,7 +2187,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
+@@ -2202,7 +2202,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-don-t-crash-with-def-NULL.patch b/debian/patches/0005-don-t-crash-with-def-NULL.patch
deleted file mode 100644
index 9921b44..0000000
--- a/debian/patches/0005-don-t-crash-with-def-NULL.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 4 May 2009 21:29:15 +0200
-Subject: [PATCH] don't crash with def == NULL
-
-happens when calling libvirt_lxc without arguments
----
- src/lxc_controller.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/lxc_controller.c b/src/lxc_controller.c
-index 3f9add2..e0fb05d 100644
---- a/src/lxc_controller.c
-+++ b/src/lxc_controller.c
-@@ -745,7 +745,8 @@ int main(int argc, char *argv[])
-
-
- cleanup:
-- virFileDeletePid(LXC_STATE_DIR, def->name);
-+ if (def)
-+ virFileDeletePid(LXC_STATE_DIR, def->name);
- lxcControllerCleanupInterfaces(nveths, veths);
- unlink(sockpath);
- VIR_FREE(sockpath);
---
diff --git a/debian/patches/0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch b/debian/patches/0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch
deleted file mode 100644
index 4294580..0000000
--- a/debian/patches/0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: Daniel P. Berrange <berrange at redhat.com>
-Date: Mon, 11 May 2009 15:14:24 +0000
-Subject: [PATCH] Fix QEMU ARGV detection with kvm >= 85
-
----
- src/qemu_conf.c | 18 ++++++++++++++----
- src/qemu_driver.c | 12 ++----------
- 2 files changed, 16 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 64415ec..a0b406b 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -431,18 +431,28 @@ int qemudExtractVersionInfo(const char *qemu,
- return -1;
-
- char *help = NULL;
-- enum { MAX_HELP_OUTPUT_SIZE = 8192 };
-+ enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
- int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
-- if (len < 0)
-+ if (len < 0) {
-+ virReportSystemError(NULL, errno, "%s",
-+ _("Unable to read QEMU help output"));
- goto cleanup2;
-+ }
-
- if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)",
- &major, &minor, µ, &kvm_version) != 4)
- kvm_version = 0;
-
-- if (!kvm_version && sscanf(help, "QEMU PC emulator version %u.%u.%u",
-- &major, &minor, µ) != 3)
-+ if (!kvm_version &&
-+ sscanf(help, "QEMU PC emulator version %u.%u.%u",
-+ &major, &minor, µ) != 3) {
-+ char *eol = strchr(help, '\n');
-+ if (eol) *eol = '\0';
-+ qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+ _("cannot parse QEMU version number in '%s'"),
-+ help);
- goto cleanup2;
-+ }
-
- version = (major * 1000 * 1000) + (minor * 1000) + micro;
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index f9fe2ba..4b51a65 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1379,12 +1379,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-
- if (qemudExtractVersionInfo(emulator,
- NULL,
-- &qemuCmdFlags) < 0) {
-- qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-- _("Cannot determine QEMU argv syntax %s"),
-- emulator);
-+ &qemuCmdFlags) < 0)
- goto cleanup;
-- }
-
- if (qemuPrepareHostDevices(conn, vm->def) < 0)
- goto cleanup;
-@@ -3614,12 +3610,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
-
- if (qemudExtractVersionInfo(vm->def->emulator,
- NULL,
-- &qemuCmdFlags) < 0) {
-- qemudReportError(conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
-- _("Cannot determine QEMU argv syntax %s"),
-- vm->def->emulator);
-+ &qemuCmdFlags) < 0)
- return -1;
-- }
-
- if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
- if (!(devname = qemudDiskDeviceName(conn, newdisk)))
---
diff --git a/debian/patches/0007-Declare-support-for-QEMU-migration-in-capabilities.patch b/debian/patches/0007-Declare-support-for-QEMU-migration-in-capabilities.patch
deleted file mode 100644
index 6003c95..0000000
--- a/debian/patches/0007-Declare-support-for-QEMU-migration-in-capabilities.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Daniel P. Berrange <berrange at redhat.com>
-Date: Mon, 18 May 2009 15:10:51 +0000
-Subject: [PATCH] Declare support for QEMU migration in capabilities
-
----
- src/qemu_conf.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index a0b406b..4bd616a 100644
---- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -370,7 +370,7 @@ virCapsPtr qemudCapsInit(void) {
- uname (&utsname);
-
- if ((caps = virCapabilitiesNew(utsname.machine,
-- 0, 0)) == NULL)
-+ 1, 1)) == NULL)
- goto no_memory;
-
- /* Using KVM's mac prefix for QEMU too */
-@@ -379,6 +379,9 @@ virCapsPtr qemudCapsInit(void) {
- if (virCapsInitNUMA(caps) < 0)
- goto no_memory;
-
-+ virCapabilitiesAddHostMigrateTransport(caps,
-+ "tcp");
-+
- /* First the pure HVM guests */
- for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_hvm) ; i++)
- if (qemudCapsInitGuest(caps,
---
diff --git a/debian/patches/series b/debian/patches/series
index bde3fe3..a8c0f9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,3 @@
0002-qemu-disable-network.diff.patch
0003-allow-libvirt-group-to-access-the-socket.patch
0004-fix-Debian-specific-path-to-hvm-loader.patch
-0005-don-t-crash-with-def-NULL.patch
-0006-Fix-QEMU-ARGV-detection-with-kvm-85.patch
-0007-Declare-support-for-QEMU-migration-in-capabilities.patch
--
Libvirt debian packaging
More information about the Pkg-libvirt-commits
mailing list