Codebase list libvirt / 9854fa9
Rebase patches Guido Günther 10 years ago
12 changed file(s) with 45 addition(s) and 45 deletion(s). Raw diff Collapse all Expand all
33
44 Closes: #685749
55 ---
6 docs/schemas/capability.rng | 4 ++--
7 src/xen/xen_hypervisor.c | 6 ++----
8 tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
9 tests/xencapsdata/xen-i686-pae.xml | 2 +-
10 tests/xencapsdata/xen-i686.xml | 2 +-
11 tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++---
12 tests/xencapsdata/xen-ia64-be.xml | 2 +-
13 tests/xencapsdata/xen-ia64-hvm.xml | 6 +++---
14 tests/xencapsdata/xen-ia64.xml | 2 +-
15 tests/xencapsdata/xen-ppc64.xml | 2 +-
16 tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
17 tests/xencapsdata/xen-x86_64.xml | 2 +-
6 docs/schemas/capability.rng | 4 ++--
7 src/xen/xen_hypervisor.c | 6 ++----
8 tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++---
9 tests/xencapsdata/xen-i686-pae.xml | 2 +-
10 tests/xencapsdata/xen-i686.xml | 2 +-
11 tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++---
12 tests/xencapsdata/xen-ia64-be.xml | 2 +-
13 tests/xencapsdata/xen-ia64-hvm.xml | 6 +++---
14 tests/xencapsdata/xen-ia64.xml | 2 +-
15 tests/xencapsdata/xen-ppc64.xml | 2 +-
16 tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++-----
17 tests/xencapsdata/xen-x86_64.xml | 2 +-
1818 12 files changed, 24 insertions(+), 26 deletions(-)
1919
2020 diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
3838 </define>
3939
4040 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
41 index 4043d6d..dabdbaa 100644
41 index a318ea5..e9da6a3 100644
4242 --- a/src/xen/xen_hypervisor.c
4343 +++ b/src/xen/xen_hypervisor.c
4444 @@ -2081,11 +2081,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
33
44 until we debugged the interaction with pbuilder
55 ---
6 tests/virnetsockettest.c | 2 ++
6 tests/virnetsockettest.c | 2 ++
77 1 file changed, 2 insertions(+)
88
99 diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
55
66 Issue reported upstresm.
77 ---
8 gnulib/tests/test-nonblocking-pipe.sh | 4 ++++
8 gnulib/tests/test-nonblocking-pipe.sh | 4 ++++
99 1 file changed, 4 insertions(+)
1010
1111 diff --git a/gnulib/tests/test-nonblocking-pipe.sh b/gnulib/tests/test-nonblocking-pipe.sh
22 Subject: Don't fail if we can't setup avahi
33
44 ---
5 src/rpc/virnetserver.c | 3 +--
5 src/rpc/virnetserver.c | 3 +--
66 1 file changed, 1 insertion(+), 2 deletions(-)
77
88 diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
9 index a54f395..1bf6f94 100644
9 index 9f56b03..8684b35 100644
1010 --- a/src/rpc/virnetserver.c
1111 +++ b/src/rpc/virnetserver.c
1212 @@ -1064,8 +1064,7 @@ void virNetServerRun(virNetServerPtr srv)
55
66 Closes: #663931
77 ---
8 src/util/virutil.c | 2 +-
8 src/util/virutil.c | 2 +-
99 1 file changed, 1 insertion(+), 1 deletion(-)
1010
1111 diff --git a/src/util/virutil.c b/src/util/virutil.c
12 index a29da14..c41d674 100644
12 index 569d035..ab55e95 100644
1313 --- a/src/util/virutil.c
1414 +++ b/src/util/virutil.c
15 @@ -1418,7 +1418,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid,
15 @@ -1419,7 +1419,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid,
1616 void virFileWaitForDevices(void)
1717 {
1818 # ifdef UDEVADM
22 Subject: Allow libvirt group to access the socket
33
44 ---
5 daemon/libvirtd.conf | 8 ++++----
6 daemon/test_libvirtd.aug.in | 4 ----
5 daemon/libvirtd.conf | 8 ++++----
6 daemon/test_libvirtd.aug.in | 4 ----
77 2 files changed, 4 insertions(+), 8 deletions(-)
88
99 diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
10 index 47da520..bf0b92a 100644
10 index af4493e..61d08e3 100644
1111 --- a/daemon/libvirtd.conf
1212 +++ b/daemon/libvirtd.conf
1313 @@ -78,7 +78,7 @@
4747 # Change the authentication scheme for TCP sockets.
4848 #
4949 diff --git a/daemon/test_libvirtd.aug.in b/daemon/test_libvirtd.aug.in
50 index 455b74a..3c4a0b7 100644
50 index 4e3b878..e213f63 100644
5151 --- a/daemon/test_libvirtd.aug.in
5252 +++ b/daemon/test_libvirtd.aug.in
5353 @@ -9,12 +9,8 @@ module Test_libvirtd =
6262 - { "auth_unix_rw" = "none" }
6363 { "auth_tcp" = "sasl" }
6464 { "auth_tls" = "none" }
65 { "key_file" = "/etc/pki/libvirt/private/serverkey.pem" }
65 { "access_drivers"
44 Origin: vendor
55
66 ---
7 tools/libvirt-guests.sh.in | 41 ++++++++++++++++++++++++-----------------
8 tools/libvirt-guests.sysconf | 4 ++--
7 tools/libvirt-guests.sh.in | 41 ++++++++++++++++++++++++-----------------
8 tools/libvirt-guests.sysconf | 4 ++--
99 2 files changed, 26 insertions(+), 19 deletions(-)
1010
1111 diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
22 Subject: Debianize systemd service files
33
44 ---
5 daemon/libvirtd.service.in | 4 ++--
6 tools/libvirt-guests.service.in | 2 +-
5 daemon/libvirtd.service.in | 4 ++--
6 tools/libvirt-guests.service.in | 2 +-
77 2 files changed, 3 insertions(+), 3 deletions(-)
88
99 diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
44 to not interfere with existing network configurations
55
66 ---
7 src/Makefile.am | 3 ---
8 src/Makefile.in | 3 ---
7 src/Makefile.am | 3 ---
8 src/Makefile.in | 3 ---
99 2 files changed, 6 deletions(-)
1010
1111 diff --git a/src/Makefile.am b/src/Makefile.am
12 index 680101f..b1e3d01 100644
12 index 4cf999d..e82ed3e 100644
1313 --- a/src/Makefile.am
1414 +++ b/src/Makefile.am
15 @@ -2196,9 +2196,6 @@ if WITH_NETWORK
15 @@ -2340,9 +2340,6 @@ if WITH_NETWORK
1616 cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
1717 $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
1818 rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
2323
2424 uninstall-local:: uninstall-init uninstall-systemd
2525 diff --git a/src/Makefile.in b/src/Makefile.in
26 index b616b9e..299ad53 100644
26 index 1ef1a46..2b7e632 100644
2727 --- a/src/Makefile.in
2828 +++ b/src/Makefile.in
29 @@ -7656,9 +7656,6 @@ install-data-local: install-init install-systemd
29 @@ -7919,9 +7919,6 @@ install-data-local: install-init install-systemd
3030 @WITH_NETWORK_TRUE@ cp $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t \
3131 @WITH_NETWORK_TRUE@ $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml && \
3232 @WITH_NETWORK_TRUE@ rm $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/default.xml.t; }
44 Closes: #517059
55
66 ---
7 src/xen/xen_hypervisor.c | 2 +-
8 tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
9 tests/xencapsdata/xen-ia64-be-hvm.xml | 2 +-
10 tests/xencapsdata/xen-ia64-hvm.xml | 2 +-
11 tests/xencapsdata/xen-x86_64-hvm.xml | 4 ++--
7 src/xen/xen_hypervisor.c | 2 +-
8 tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +-
9 tests/xencapsdata/xen-ia64-be-hvm.xml | 2 +-
10 tests/xencapsdata/xen-ia64-hvm.xml | 2 +-
11 tests/xencapsdata/xen-x86_64-hvm.xml | 4 ++--
1212 5 files changed, 6 insertions(+), 6 deletions(-)
1313
1414 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
15 index cfc8139..4043d6d 100644
15 index 9d9c3ee..a318ea5 100644
1616 --- a/src/xen/xen_hypervisor.c
1717 +++ b/src/xen/xen_hypervisor.c
1818 @@ -2085,7 +2085,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
22 Subject: remove-RHism.diff
33
44 ---
5 tools/virsh.pod | 2 +-
5 tools/virsh.pod | 2 +-
66 1 file changed, 1 insertion(+), 1 deletion(-)
77
88 diff --git a/tools/virsh.pod b/tools/virsh.pod
9 index 7c8ce18..66ff2b4 100644
9 index 94fe897..583be37 100644
1010 --- a/tools/virsh.pod
1111 +++ b/tools/virsh.pod
1212 @@ -107,7 +107,7 @@ alphabetic character, @, [, ], \, ^, _.
3737 This patch triggers for 'info migration' in reply to 'info migrate' command
3838 to savely detect that the command 'info migrate' is not implemented.
3939 ---
40 src/qemu/qemu_monitor_text.c | 10 +++++++++-
40 src/qemu/qemu_monitor_text.c | 10 +++++++++-
4141 1 file changed, 9 insertions(+), 1 deletion(-)
4242
4343 diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
44 index d4ee93d..20b9a99 100644
44 index 15fbcb7..1a02a61 100644
4545 --- a/src/qemu/qemu_monitor_text.c
4646 +++ b/src/qemu/qemu_monitor_text.c
4747 @@ -1568,7 +1568,15 @@ int qemuMonitorTextGetMigrationStatus(qemuMonitorPtr mon,