Commit 66f2a93d34a26914a12a407121e17c3bdbc46ab5 - libvirt

+3

-3

debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch less more

18	18	12 files changed, 24 insertions(+), 26 deletions(-)
19	19
20	20	diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
21		index aee03d7..6ffe626 100644
	21	index d2d9776..fd31d1c 100644
22	22	--- a/docs/schemas/capability.rng
23	23	+++ b/docs/schemas/capability.rng
24	24	@@ -271,13 +271,13 @@

38	38	</define>
39	39
40	40	diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
41		index 8a89c32..9221c62 100644
	41	index 30a14e7..e425e15 100644
42	42	--- a/src/xen/xen_hypervisor.c
43	43	+++ b/src/xen/xen_hypervisor.c
44		@@ -2139,11 +2139,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
	44	@@ -2142,11 +2142,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
45	45	if ((guest = virCapabilitiesAddGuest(caps,
46	46	guest_archs[i].hvm ? "hvm" : "xen",
47	47	guest_archs[i].arch,

+2

-2

debian/patches/Disable-failing-virnetsockettest.patch less more

7	7	1 file changed, 2 insertions(+)
8	8
9	9	diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
10		index a14371a..9e5a164 100644
	10	index 5d91f26..1f283a3 100644
11	11	--- a/tests/virnetsockettest.c
12	12	+++ b/tests/virnetsockettest.c
13		@@ -499,10 +499,12 @@ mymain(void)
	13	@@ -501,10 +501,12 @@ mymain(void)
14	14	if (virtTestRun("Socket UNIX Addrs", testSocketUNIXAddrs, NULL) < 0)
15	15	ret = -1;
16	16

+2

-2

debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch less more

6	6	1 file changed, 1 insertion(+), 2 deletions(-)
7	7
8	8	diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
9		index f70e260..92072f6 100644
	9	index 7e3fc0a..3f13fac 100644
10	10	--- a/src/rpc/virnetserver.c
11	11	+++ b/src/rpc/virnetserver.c
12		@@ -1071,8 +1071,7 @@ void virNetServerRun(virNetServerPtr srv)
	12	@@ -1093,8 +1093,7 @@ void virNetServerRun(virNetServerPtr srv)
13	13
14	14	virObjectLock(srv);
15	15

+2

-2

debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch less more

9	9	1 file changed, 1 insertion(+), 1 deletion(-)
10	10
11	11	diff --git a/src/util/virutil.c b/src/util/virutil.c
12		index 7a2fbb0..6a41d92 100644
	12	index 9be1590..1e6400d 100644
13	13	--- a/src/util/virutil.c
14	14	+++ b/src/util/virutil.c
15		@@ -1444,7 +1444,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
	15	@@ -1450,7 +1450,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
16	16	void virFileWaitForDevices(void)
17	17	{
18	18	# ifdef UDEVADM

+1

-1

debian/patches/Skip-vircgrouptest.patch less more

8	8	1 file changed, 1 insertion(+), 1 deletion(-)
9	9
10	10	diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
11		index 5d5eccc..088b51a 100644
	11	index dd078c1..eadc9b6 100644
12	12	--- a/tests/vircgrouptest.c
13	13	+++ b/tests/vircgrouptest.c
14	14	@@ -22,7 +22,7 @@

+2

-2

debian/patches/debian/Allow-libvirt-group-to-access-the-socket.patch less more

7	7	2 files changed, 5 insertions(+), 8 deletions(-)
8	8
9	9	diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
10		index 073c178..6a98bc1 100644
	10	index aeba11d..3d3718a 100644
11	11	--- a/daemon/libvirtd.conf
12	12	+++ b/daemon/libvirtd.conf
13	13	@@ -78,7 +78,7 @@

48	48	# Change the authentication scheme for TCP sockets.
49	49	#
50	50	diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
51		index a7e8515..acd0667 100644
	51	index 37ff33d..8c4e8a4 100644
52	52	--- a/daemon/test_libvirtd.aug.in
53	53	+++ b/daemon/test_libvirtd.aug.in
54	54	@@ -9,12 +9,8 @@ module Test_libvirtd =

+2

-2

debian/patches/debian/Debianize-systemd-service-files.patch less more

7	7	2 files changed, 4 insertions(+), 4 deletions(-)
8	8
9	9	diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
10		index e1f2a07..f33a08e 100644
	10	index 086da36..9bc433c 100644
11	11	--- a/daemon/libvirtd.service.in
12	12	+++ b/daemon/libvirtd.service.in
13		@@ -14,8 +14,8 @@ Documentation=http://libvirt.org
	13	@@ -15,8 +15,8 @@ Documentation=http://libvirt.org
14	14
15	15	[Service]
16	16	Type=notify

+4

-4

debian/patches/debian/Don-t-enable-default-network-on-boot.patch less more

8	8	2 files changed, 6 deletions(-)
9	9
10	10	diff --git a/src/Makefile.am b/src/Makefile.am
11		index 6ef32ee..ae9b7db 100644
	11	index 55427ed..73f8ecd 100644
12	12	--- a/src/Makefile.am
13	13	+++ b/src/Makefile.am
14		@@ -2607,9 +2607,6 @@ if WITH_NETWORK
	14	@@ -2619,9 +2619,6 @@ if WITH_NETWORK
15	15	cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
16	16	$(DESTDIR)$(confdir)/qemu/networks/default.xml && \
17	17	rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }

22	22
23	23	uninstall-local:: uninstall-init uninstall-systemd
24	24	diff --git a/src/Makefile.in b/src/Makefile.in
25		index d5a6f62..9bf6aeb 100644
	25	index 683d491..b24bafe 100644
26	26	--- a/src/Makefile.in
27	27	+++ b/src/Makefile.in
28		@@ -9868,9 +9868,6 @@ install-data-local: install-init install-systemd
	28	@@ -9899,9 +9899,6 @@ install-data-local: install-init install-systemd
29	29	@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(confdir)/qemu/networks/default.xml.t \
30	30	@WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
31	31	@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }

+2

-2

debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch less more

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 f9c7b40..8a89c32 100644
	14	index 2e35edf..30a14e7 100644
15	15	--- a/src/xen/xen_hypervisor.c
16	16	+++ b/src/xen/xen_hypervisor.c
17		@@ -2143,7 +2143,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
	17	@@ -2146,7 +2146,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
18	18	"/usr/lib64/xen/bin/qemu-dm" :
19	19	"/usr/lib/xen/bin/qemu-dm"),
20	20	(guest_archs[i].hvm ?

+2

-2

debian/patches/debian/remove-RHism.diff.patch less more

6	6	1 file changed, 1 insertion(+), 1 deletion(-)
7	7
8	8	diff --git a/tools/virsh.pod b/tools/virsh.pod
9		index ab9bdd9..9712174 100644
	9	index ba2da20..638016f 100644
10	10	--- a/tools/virsh.pod
11	11	+++ b/tools/virsh.pod
12		@@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
	12	@@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
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

+3

-3

41	41	1 file changed, 9 insertions(+), 1 deletion(-)
42	42
43	43	diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
44		index 7b81079..99f7641 100644
	44	index ad63140..203a0cb 100644
45	45	--- a/src/qemu/qemu_monitor_text.c
46	46	+++ b/src/qemu/qemu_monitor_text.c
47		@@ -1533,7 +1533,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
	47	@@ -1543,7 +1543,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
48	48	}
49	49	status->disk_total *= 1024;
50	50	}

59	59	+ goto cleanup;
60	60	+ }
61	61
62		done:
	62	done:
63	63	ret = 0;