Rediff remaining patches
Guido Günther
12 years ago
| 12 | 12 |
2 files changed, 26 insertions(+), 8 deletions(-)
|
| 13 | 13 |
|
| 14 | 14 |
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
|
| 15 | |
index 41b691a..ffe49c3 100644
|
|
15 |
index 88dc2a4..f08846f 100644
|
| 16 | 16 |
--- a/src/rpc/virnetsocket.c
|
| 17 | 17 |
+++ b/src/rpc/virnetsocket.c
|
| 18 | |
@@ -628,9 +628,26 @@ int virNetSocketNewConnectSSH(const char *nodename,
|
|
18 |
@@ -632,9 +632,26 @@ int virNetSocketNewConnectSSH(const char *nodename,
|
| 19 | 19 |
"-e", "none", NULL);
|
| 20 | 20 |
if (noVerify)
|
| 21 | 21 |
virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
|
|
| 46 | 46 |
return virNetSocketNewConnectCommand(cmd, retsock);
|
| 47 | 47 |
}
|
| 48 | 48 |
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
|
| 49 | |
index e72b9a0..3816b3c 100644
|
|
49 |
index fae15a3..b3a2705 100644
|
| 50 | 50 |
--- a/tests/virnetsockettest.c
|
| 51 | 51 |
+++ b/tests/virnetsockettest.c
|
| 52 | 52 |
@@ -496,7 +496,7 @@ mymain(void)
|
| 7 | 7 |
1 files changed, 2 insertions(+), 0 deletions(-)
|
| 8 | 8 |
|
| 9 | 9 |
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
|
| 10 | |
index 3816b3c..319dbc0 100644
|
|
10 |
index b3a2705..f6da0b8 100644
|
| 11 | 11 |
--- a/tests/virnetsockettest.c
|
| 12 | 12 |
+++ b/tests/virnetsockettest.c
|
| 13 | 13 |
@@ -488,10 +488,12 @@ mymain(void)
|
| 7 | 7 |
2 files changed, 10 insertions(+), 5 deletions(-)
|
| 8 | 8 |
|
| 9 | 9 |
diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
|
| 10 | |
index 95e43dd..8876ce7 100644
|
|
10 |
index da3983e..7cfb324 100644
|
| 11 | 11 |
--- a/daemon/libvirtd.conf
|
| 12 | 12 |
+++ b/daemon/libvirtd.conf
|
| 13 | 13 |
@@ -78,7 +78,7 @@
|
| 11 | 11 |
5 files changed, 6 insertions(+), 6 deletions(-)
|
| 12 | 12 |
|
| 13 | 13 |
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
|
| 14 | |
index 0309d8a..8c50f20 100644
|
|
14 |
index 77085c9..efe1f10 100644
|
| 15 | 15 |
--- a/src/xen/xen_hypervisor.c
|
| 16 | 16 |
+++ b/src/xen/xen_hypervisor.c
|
| 17 | |
@@ -2341,7 +2341,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
|
|
17 |
@@ -2317,7 +2317,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
|
| 18 | 18 |
"/usr/lib64/xen/bin/qemu-dm" :
|
| 19 | 19 |
"/usr/lib/xen/bin/qemu-dm"),
|
| 20 | 20 |
(guest_archs[i].hvm ?
|
| 41 | 41 |
1 files changed, 9 insertions(+), 1 deletions(-)
|
| 42 | 42 |
|
| 43 | 43 |
diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
|
| 44 | |
index 84941f9..635cf93 100644
|
|
44 |
index cedf582..a32cb66 100644
|
| 45 | 45 |
--- a/src/qemu/qemu_monitor_text.c
|
| 46 | 46 |
+++ b/src/qemu/qemu_monitor_text.c
|
| 47 | |
@@ -1259,7 +1259,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
|
| 48 | |
*total *= 1024;
|
| 49 | |
|
|
47 |
@@ -1491,7 +1491,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
|
|
48 |
}
|
|
49 |
*total += disk_total * 1024;
|
| 50 | 50 |
}
|
| 51 | 51 |
- }
|
| 52 | 52 |
+ } else if (strstr(reply, "info migration") != NULL) {
|
| 7 | 7 |
2 files changed, 0 insertions(+), 6 deletions(-)
|
| 8 | 8 |
|
| 9 | 9 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
| 10 | |
index 46b92a8..0125489 100644
|
|
10 |
index 738ee91..b1c25a2 100644
|
| 11 | 11 |
--- a/src/Makefile.am
|
| 12 | 12 |
+++ b/src/Makefile.am
|
| 13 | |
@@ -1432,9 +1432,6 @@ if WITH_NETWORK
|
|
13 |
@@ -1501,9 +1501,6 @@ if WITH_NETWORK
|
| 14 | 14 |
cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
|
| 15 | 15 |
$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
|
| 16 | 16 |
rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
|
|
| 21 | 21 |
|
| 22 | 22 |
uninstall-local::
|
| 23 | 23 |
diff --git a/src/Makefile.in b/src/Makefile.in
|
| 24 | |
index 8bcf3b5..0e86d15 100644
|
|
24 |
index b421da7..2a8066e 100644
|
| 25 | 25 |
--- a/src/Makefile.in
|
| 26 | 26 |
+++ b/src/Makefile.in
|
| 27 | |
@@ -6352,9 +6352,6 @@ install-data-local:
|
|
27 |
@@ -6585,9 +6585,6 @@ install-data-local:
|
| 28 | 28 |
@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
|
| 29 | 29 |
@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
|
| 30 | 30 |
@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
|
| 6 | 6 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
| 7 | 7 |
|
| 8 | 8 |
diff --git a/tools/virsh.pod b/tools/virsh.pod
|
| 9 | |
index 5b7fa9c..b995837 100644
|
|
9 |
index 88dee26..8a2fa3f 100644
|
| 10 | 10 |
--- a/tools/virsh.pod
|
| 11 | 11 |
+++ b/tools/virsh.pod
|
| 12 | |
@@ -97,7 +97,7 @@ Output elapsed time information for each command.
|
|
12 |
@@ -98,7 +98,7 @@ Output elapsed time information for each command.
|
| 13 | 13 |
|
| 14 | 14 |
Most B<virsh> operations rely upon the libvirt library being able to
|
| 15 | 15 |
connect to an already running libvirtd service. This can usually be
|
| 0 | |
From: Debian Libvirt Maintainers <pkg-libvirt-maintainers@lists.alioth.debian.org>
|
|
0 |
From: Debian Libvirt Maintainers
|
|
1 |
<pkg-libvirt-maintainers@lists.alioth.debian.org>
|
| 1 | 2 |
Date: Mon, 11 Apr 2011 23:31:09 +0200
|
| 2 | 3 |
Subject: virsh: Initialize library before calling virResetLastError
|
| 3 | 4 |
|
|
| 24 | 25 |
1 files changed, 3 insertions(+), 0 deletions(-)
|
| 25 | 26 |
|
| 26 | 27 |
diff --git a/tools/virsh.c b/tools/virsh.c
|
| 27 | |
index f2fd9e5..39d41a1 100644
|
|
28 |
index e5ea9d7..5bf4551 100644
|
| 28 | 29 |
--- a/tools/virsh.c
|
| 29 | 30 |
+++ b/tools/virsh.c
|
| 30 | |
@@ -14340,6 +14340,9 @@ vshInit(vshControl *ctl)
|
|
31 |
@@ -15501,6 +15501,9 @@ vshInit(vshControl *ctl)
|
| 31 | 32 |
/* set up the signals handlers to catch disconnections */
|
| 32 | 33 |
vshSetupSignals();
|
| 33 | 34 |
|