Commit 0c2afdbb3b884745d34dad9df9976187f3134753 - libvirt

+0

-1

debian/patches/Disable-daemon-start-test.patch less more

29	29	test_final $i $fail
30	30
31	31	# "cat log" would print this for non-root:
32		--

+2

-3

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

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 a76e5cc..b271ec4 100644
	10	index 44d6f65..bcfcbd3 100644
11	11	--- a/tests/virnetsockettest.c
12	12	+++ b/tests/virnetsockettest.c
13		@@ -496,10 +496,12 @@ mymain(void)
	13	@@ -491,10 +491,12 @@ mymain(void)
14	14	if (virtTestRun("Socket UNIX Addrs", 1, testSocketUNIXAddrs, NULL) < 0)
15	15	ret = -1;
16	16

23	23
24	24	struct testSSHData sshData1 = {
25	25	.nodename = "somehost",
26		--

+0

-1

debian/patches/Disable-gnulib-s-test-nonplocking-pipe.sh.patch less more

22	22	# Note: This test fails on Cygwin 1.5.x, because the non-blocking flag has
23	23	# apparently no effect on STDOUT_FILENO. It is fixed in Cygwin 1.7.
24	24
25		--

+1

-2

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

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 da3983e..7cfb324 100644
	10	index f218454..bb3efd1 100644
11	11	--- a/daemon/libvirtd.conf
12	12	+++ b/daemon/libvirtd.conf
13	13	@@ -78,7 +78,7 @@

64	64	&& { echo "$0: found unexpected lines (above) in $conf" 1>&2; exit 1; }
65	65
66	66	# Start with the sample libvirtd.conf file, uncommenting all real directives.
67		--

+1

-1

debian/patches/debian/Debianize-libvirt-guests.patch less more

2	2	Subject: Debianize libvirt-guests
3	3
4	4	Origin: vendor
	5
5	6
6	7
7	8	---

114	115
115	116	# If non-zero, try to bypass the file system cache when saving and
116	117	# restoring guests, even though this may give slower operation for
117		--

+5

-5

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

2	2	Subject: Don't enable default network on boot
3	3
4	4	to not interfere with existing network configurations
	5
5	6
6	7
7	8	---

10	11	2 files changed, 0 insertions(+), 6 deletions(-)
11	12
12	13	diff --git a/src/Makefile.am b/src/Makefile.am
13		index bf26b19..10c9eab 100644
	14	index 4c98397..f79b739 100644
14	15	--- a/src/Makefile.am
15	16	+++ b/src/Makefile.am
16		@@ -1564,9 +1564,6 @@ if WITH_NETWORK
	17	@@ -1586,9 +1586,6 @@ if WITH_NETWORK
17	18	cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
18	19	$(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
19	20	rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }

24	25
25	26	uninstall-local::
26	27	diff --git a/src/Makefile.in b/src/Makefile.in
27		index cdd5e4b..ee88275 100644
	28	index e74ebec..4cee374 100644
28	29	--- a/src/Makefile.in
29	30	+++ b/src/Makefile.in
30		@@ -6719,9 +6719,6 @@ install-data-local:
	31	@@ -7013,9 +7013,6 @@ install-data-local:
31	32	@WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
32	33	@WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
33	34	@WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }

37	38
38	39	uninstall-local::
39	40	rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" \|\|:
40		--

+3

-3

debian/patches/debian/Don-t-require-gawk-for-a-simple-print-expression.patch less more

5	5	Thanks: Luca Capello
6	6
7	7
	8
8	9	---
9	10	src/nwfilter/nwfilter_ebiptables_driver.c \| 2 +-
10	11	1 files changed, 1 insertions(+), 1 deletions(-)
11	12
12	13	diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
13		index f87cfa1..a057799 100644
	14	index a62833e..3ec4f6c 100644
14	15	--- a/src/nwfilter/nwfilter_ebiptables_driver.c
15	16	+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
16		@@ -3719,7 +3719,7 @@ ebiptablesDriverInit(bool privileged)
	17	@@ -4025,7 +4025,7 @@ ebiptablesDriverInit(bool privileged)
17	18	if (virMutexInit(&execCLIMutex))
18	19	return EINVAL;
19	20

22	23	grep_cmd_path = virFindFileInPath("grep");
23	24
24	25	ebtables_cmd_path = virFindFileInPath("ebtables");
25		--

+12

-12

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

2	2	Subject: fix Debian specific path to hvm loader
3	3
4	4	Closes: #517059
	5
5	6
6	7
7	8	---

13	14	5 files changed, 6 insertions(+), 6 deletions(-)
14	15
15	16	diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
16		index 634b23b..0d4adcd 100644
	17	index 6c71b65..9c924c2 100644
17	18	--- a/src/xen/xen_hypervisor.c
18	19	+++ b/src/xen/xen_hypervisor.c
19		@@ -2329,7 +2329,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
	20	@@ -2338,7 +2338,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn,
20	21	"/usr/lib64/xen/bin/qemu-dm" :
21	22	"/usr/lib/xen/bin/qemu-dm"),
22	23	(guest_archs[i].hvm ?

26	27	1,
27	28	machines)) == NULL) {
28	29	diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml
29		index 42b099c..2886c09 100644
	30	index 872e5f6..7cde6df 100644
30	31	--- a/tests/xencapsdata/xen-i686-pae-hvm.xml
31	32	+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml
32		@@ -34,7 +34,7 @@
	33	@@ -35,7 +35,7 @@
33	34	<arch name='i686'>
34	35	<wordsize>32</wordsize>
35	36	<emulator>/usr/lib/xen/bin/qemu-dm</emulator>

39	40	<domain type='xen'>
40	41	</domain>
41	42	diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml
42		index 732b693..cf3dfc1 100644
	43	index 222de1d..e56e306 100644
43	44	--- a/tests/xencapsdata/xen-ia64-be-hvm.xml
44	45	+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml
45		@@ -31,7 +31,7 @@
	46	@@ -32,7 +32,7 @@
46	47	<arch name='ia64'>
47	48	<wordsize>64</wordsize>
48	49	<emulator>/usr/lib/xen/bin/qemu-dm</emulator>

52	53	<domain type='xen'>
53	54	</domain>
54	55	diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml
55		index ef48a95..871cd65 100644
	56	index 33c4946..25617fc 100644
56	57	--- a/tests/xencapsdata/xen-ia64-hvm.xml
57	58	+++ b/tests/xencapsdata/xen-ia64-hvm.xml
58		@@ -28,7 +28,7 @@
	59	@@ -29,7 +29,7 @@
59	60	<arch name='ia64'>
60	61	<wordsize>64</wordsize>
61	62	<emulator>/usr/lib/xen/bin/qemu-dm</emulator>

65	66	<domain type='xen'>
66	67	</domain>
67	68	diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml
68		index 52c12c6..83dac3e 100644
	69	index 8de8cf4..493d1ea 100644
69	70	--- a/tests/xencapsdata/xen-x86_64-hvm.xml
70	71	+++ b/tests/xencapsdata/xen-x86_64-hvm.xml
71		@@ -31,7 +31,7 @@
	72	@@ -32,7 +32,7 @@
72	73	<arch name='i686'>
73	74	<wordsize>32</wordsize>
74	75	<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>

77	78	<machine>xenfv</machine>
78	79	<domain type='xen'>
79	80	</domain>
80		@@ -49,7 +49,7 @@
	81	@@ -50,7 +50,7 @@
81	82	<arch name='x86_64'>
82	83	<wordsize>64</wordsize>
83	84	<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>

86	87	<machine>xenfv</machine>
87	88	<domain type='xen'>
88	89	</domain>
89		--

+1

-2

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

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 775d302..d6fbf26 100644
	9	index 5131ade..35f6a82 100644
10	10	--- a/tools/virsh.pod
11	11	+++ b/tools/virsh.pod
12	12	@@ -98,7 +98,7 @@ Output elapsed time information for each command.

18	18
19	19	Most B<virsh> commands require root privileges to run due to the
20	20	communications channels used to talk to the hypervisor. Running as
21		--

+2

-3

debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch less more

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 5de4d24..fdfb32f 100644
	44	index 2c68be8..9bcd066 100644
45	45	--- a/src/qemu/qemu_monitor_text.c
46	46	+++ b/src/qemu/qemu_monitor_text.c
47		@@ -1599,7 +1599,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
	47	@@ -1632,7 +1632,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,
48	48	}
49	49	total += disk_total 1024;
50	50	}

61	61
62	62	done:
63	63	ret = 0;
64		--

+2

-3

debian/patches/virsh-Initialize-library-before-calling-virResetLast.patch less more

25	25	1 files changed, 3 insertions(+), 0 deletions(-)
26	26
27	27	diff --git a/tools/virsh.c b/tools/virsh.c
28		index 5544a41..8784a6f 100644
	28	index 76deaa9..a8263d6 100644
29	29	--- a/tools/virsh.c
30	30	+++ b/tools/virsh.c
31		@@ -15996,6 +15996,9 @@ vshInit(vshControl *ctl)
	31	@@ -17098,6 +17098,9 @@ vshInit(vshControl *ctl)
32	32	/* set up the signals handlers to catch disconnections */
33	33	vshSetupSignals();
34	34

38	38	if (virEventRegisterDefaultImpl() < 0)
39	39	return false;
40	40
41		--