[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, experimental, updated. debian/0.5.1-1-18-gddb6d13
Guido Guenther
agx at sigxcpu.org
Sat Dec 6 10:31:17 UTC 2008
The following commit has been merged in the experimental branch:
commit d46313f053052cbc510eee1b8a957a28f58fb483
Author: Guido Günther <agx at sigxcpu.org>
Date: Sat Dec 6 10:31:09 2008 +0100
drop patches for issues fixed upstream
0007-also-look-for-usr-bin-kvm.patch
0008-Increase-initial-qemu-monitor-read-timeout.patch
0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
0010-raise-error-on-invalid-volume-format.patch
diff --git a/debian/patches/0007-also-look-for-usr-bin-kvm.patch b/debian/patches/0007-also-look-for-usr-bin-kvm.patch
deleted file mode 100644
index abe2833..0000000
--- a/debian/patches/0007-also-look-for-usr-bin-kvm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From de516e669fcc0e4d1268698dd0a48e9c79da1eaf Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 4 Dec 2008 11:51:13 +0100
-Subject: [PATCH] also look for /usr/bin/kvm
-
----
- src/qemu_driver.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 58530aa..0d5e768 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1749,6 +1749,7 @@ static const char *qemudProbe(void)
- {
- if ((virFileExists("/usr/bin/qemu")) ||
- (virFileExists("/usr/bin/qemu-kvm")) ||
-+ (virFileExists("/usr/bin/kvm")) ||
- (virFileExists("/usr/bin/xenner"))) {
- if (getuid() == 0) {
- return("qemu:///system");
---
-1.6.0.3
-
diff --git a/debian/patches/0008-Increase-initial-qemu-monitor-read-timeout.patch b/debian/patches/0008-Increase-initial-qemu-monitor-read-timeout.patch
deleted file mode 100644
index bcc8b06..0000000
--- a/debian/patches/0008-Increase-initial-qemu-monitor-read-timeout.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b797c0fc100d75b8252b594670d007db888a10bd Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso at redhat.com>
-Date: Mon, 1 Dec 2008 17:36:51 -0500
-Subject: [PATCH] Increase initial qemu monitor read timeout
-
-Closes: #499720
----
- src/qemu_driver.c | 11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 0d5e768..ffe2dd2 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -418,9 +418,9 @@ qemudReadMonitorOutput(virConnectPtr conn,
- char *buf,
- int buflen,
- qemudHandlerMonitorOutput func,
-- const char *what)
-+ const char *what,
-+ int timeout)
- {
--#define MONITOR_TIMEOUT 3000
- int got = 0;
- buf[0] = '\0';
-
-@@ -446,7 +446,7 @@ qemudReadMonitorOutput(virConnectPtr conn,
- return -1;
- }
-
-- ret = poll(&pfd, 1, MONITOR_TIMEOUT);
-+ ret = poll(&pfd, 1, timeout);
- if (ret == 0) {
- qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
- _("Timed out while reading %s startup output"), what);
-@@ -480,7 +480,6 @@ qemudReadMonitorOutput(virConnectPtr conn,
- _("Out of space while reading %s startup output"), what);
- return -1;
-
--#undef MONITOR_TIMEOUT
- }
-
- static int
-@@ -526,7 +525,7 @@ static int qemudOpenMonitor(virConnectPtr conn,
- driver, vm, monfd,
- buf, sizeof(buf),
- qemudCheckMonitorPrompt,
-- "monitor");
-+ "monitor", 10000);
-
- /* Keep monitor open upon success */
- if (ret == 0)
-@@ -640,7 +639,7 @@ static int qemudWaitForMonitor(virConnectPtr conn,
- driver, vm, vm->stderr_fd,
- buf, sizeof(buf),
- qemudFindCharDevicePTYs,
-- "console");
-+ "console", 3000);
-
- buf[sizeof(buf)-1] = '\0';
-
---
-1.6.0.3
-
diff --git a/debian/patches/0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch b/debian/patches/0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
deleted file mode 100644
index ea650a4..0000000
--- a/debian/patches/0009-Open-qemu-monitor-log-O_APPEND-instead-of-O_TRUNC.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1aa12b4920dba52405fcdde02953e3ca15cec398 Mon Sep 17 00:00:00 2001
-From: Harald Staub <harald.staub at switch.ch>
-Date: Tue, 2 Dec 2008 13:14:33 +0100
-Subject: [PATCH] Open qemu monitor log O_APPEND instead of O_TRUNC
-
-makes logrotate work (O_APPEND) and keeps old log information (!O_TRUNC)
-(#507553)
----
- src/qemu_driver.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index ffe2dd2..c9bf8d7 100644
---- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -894,7 +894,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- return -1;
- }
-
-- if ((vm->logfile = open(logfile, O_CREAT | O_TRUNC | O_WRONLY,
-+ if ((vm->logfile = open(logfile, O_CREAT | O_APPEND | O_WRONLY,
- S_IRUSR | S_IWUSR)) < 0) {
- qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
- _("failed to create logfile %s: %s"),
---
-1.6.0.3
-
diff --git a/debian/patches/0010-raise-error-on-invalid-volume-format.patch b/debian/patches/0010-raise-error-on-invalid-volume-format.patch
deleted file mode 100644
index 53c541c..0000000
--- a/debian/patches/0010-raise-error-on-invalid-volume-format.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ed71be2693133d640b4a99eb4b6f90c51bdffff8 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 4 Dec 2008 16:22:52 +0100
-Subject: [PATCH] raise error on invalid volume format
-
----
- src/storage_conf.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/storage_conf.c b/src/storage_conf.c
-index 29d74c8..f0d2b94 100644
---- a/src/storage_conf.c
-+++ b/src/storage_conf.c
-@@ -753,6 +753,8 @@ virStorageVolDefParseDoc(virConnectPtr conn,
- if (options->formatFromString) {
- char *format = virXPathString(conn, "string(/volume/target/format/@type)", ctxt);
- if ((ret->target.format = (options->formatFromString)(conn, format)) < 0) {
-+ virStorageReportError(conn, VIR_ERR_XML_ERROR,
-+ _("unknown volume format type %s"), format);
- VIR_FREE(format);
- goto cleanup;
- }
---
-1.6.0.3
-
--
Libvirt debian packaging
More information about the Pkg-libvirt-commits
mailing list