Codebase list libvirt / 6133289
Merge branch 'debian/experimental' into debian/sid Guido Günther 7 years ago
7 changed file(s) with 10 addition(s) and 65 deletion(s). Raw diff Collapse all Expand all
+3
-2
debian/libvirt0.symbols less more
9494 *@LIBVIRT_1.3.5 1.3.5~rc1
9595 *@LIBVIRT_2.0.0 2.0.0~rc1
9696 *@LIBVIRT_2.1.0 2.1.0~rc1
97 *@LIBVIRT_PRIVATE_2.1.0 2.1.0~rc1
97 *@LIBVIRT_2.2.0 2.2.0~rc1
98 *@LIBVIRT_PRIVATE_2.2.0 2.2.0~rc1
9899 libvirt-qemu.so.0 libvirt0 #MINVER#
99100 *@LIBVIRT_QEMU_0.8.3 0.8.3
100101 #MISSING: 0.8.8-1# (symver|optional)LIBVIRT_QEMU_0.8.4 0.8.4
114115 libvirt-admin.so.0 libvirt0 #MINVER#
115116 *@LIBVIRT_ADMIN_1.3.0 1.2.18
116117 *@LIBVIRT_ADMIN_2.0.0 2.0.0~rc1
117 *@LIBVIRT_ADMIN_PRIVATE_2.1.0 2.1.0~rc1
118 *@LIBVIRT_ADMIN_PRIVATE_2.2.0 2.2.0~rc1
+1
-1
debian/patches/Set-defaults-for-zfs-tools.patch less more
77 1 file changed, 2 insertions(+), 2 deletions(-)
88
99 diff --git a/configure.ac b/configure.ac
10 index 2c81c95..6eaf41b 100644
10 index 8d7d63e..f137245 100644
1111 --- a/configure.ac
1212 +++ b/configure.ac
1313 @@ -1927,8 +1927,8 @@ AM_CONDITIONAL([WITH_STORAGE_GLUSTER], [test "$with_storage_gluster" = "yes"])
+4
-4
debian/patches/debian/Don-t-enable-default-network-on-boot.patch less more
88 2 files changed, 2 insertions(+), 4 deletions(-)
99
1010 diff --git a/src/Makefile.am b/src/Makefile.am
11 index 78c493c..2a5a725 100644
11 index 8ee5567..71a15e8 100644
1212 --- a/src/Makefile.am
1313 +++ b/src/Makefile.am
14 @@ -3109,8 +3109,7 @@ if WITH_NETWORK
14 @@ -3105,8 +3105,7 @@ if WITH_NETWORK
1515 $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
1616 rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
1717 ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
2222
2323 uninstall-local:: uninstall-init uninstall-systemd
2424 diff --git a/src/Makefile.in b/src/Makefile.in
25 index c052fd1..1548b1d 100644
25 index df17a41..4cd596e 100644
2626 --- a/src/Makefile.in
2727 +++ b/src/Makefile.in
28 @@ -11484,8 +11484,7 @@ install-data-local: install-init install-systemd
28 @@ -11514,8 +11514,7 @@ install-data-local: install-init install-systemd
2929 @WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \
3030 @WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; }
3131 @WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \
+1
-1
debian/patches/debian/remove-RHism.diff.patch less more
66 1 file changed, 1 insertion(+), 1 deletion(-)
77
88 diff --git a/tools/virsh.pod b/tools/virsh.pod
9 index fc6a680..7081648 100644
9 index 1e36ee1..5979b52 100644
1010 --- a/tools/virsh.pod
1111 +++ b/tools/virsh.pod
1212 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
+1
-1
debian/patches/patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch less more
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 9295219..68efc5a 100644
44 index ff7cc79..89c4e7e 100644
4545 --- a/src/qemu/qemu_monitor_text.c
4646 +++ b/src/qemu/qemu_monitor_text.c
4747 @@ -1465,7 +1465,15 @@ int qemuMonitorTextGetMigrationStats(qemuMonitorPtr mon,
+0
-55
debian/patches/qemu-Fix-the-command-line-generation-for-rbd-auth-using-a.patch less more
0 From: John Ferlan <jferlan@redhat.com>
1 Date: Tue, 16 Aug 2016 16:50:15 -0400
2 Subject: qemu: Fix the command line generation for rbd auth using aes secrets
3
4 https://bugzilla.redhat.com/show_bug.cgi?id=1182074
5
6 Since libvirt still uses a legacy qemu arg format to add a disk, the
7 manner in which the 'password-secret' argument is passed to qemu needs
8 to change to prepend a 'file.' If in the future, usage of the more
9 modern disk format, then the prepended 'file.' can be removed.
10
11 Fix based on Jim Fehlig <jfehlig@suse.com> posting and subsequent
12 upstream list followups, see:
13
14 http://www.redhat.com/archives/libvir-list/2016-August/msg00777.html
15
16 for details. Introduced by commit id 'a1344f70'.
17
18 Closes: #827164
19 ---
20 src/qemu/qemu_command.c | 7 ++++++-
21 .../qemuxml2argv-disk-drive-network-rbd-auth-AES.args | 2 +-
22 2 files changed, 7 insertions(+), 2 deletions(-)
23
24 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
25 index 5325f48..2b619a5 100644
26 --- a/src/qemu/qemu_command.c
27 +++ b/src/qemu/qemu_command.c
28 @@ -1296,7 +1296,12 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
29 virBufferAddLit(buf, ",");
30
31 if (secinfo && secinfo->type == VIR_DOMAIN_SECRET_INFO_TYPE_AES) {
32 - virBufferAsprintf(buf, "password-secret=%s,",
33 + /* NB: If libvirt starts using the more modern option based
34 + * syntax to build the command line (e.g., "-drive driver=rbd,
35 + * filename=%s,...") instead of the legacy model (e.g."-drive
36 + * file=%s,..."), then the "file." prefix can be removed
37 + */
38 + virBufferAsprintf(buf, "file.password-secret=%s,",
39 secinfo->s.aes.alias);
40 }
41
42 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
43 index 5034bb7..07d01b6 100644
44 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
45 +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args
46 @@ -26,7 +26,7 @@ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
47 keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
48 -drive 'file=rbd:pool/image:id=myname:auth_supported=cephx\;none:\
49 mon_host=mon1.example.org\:6321\;mon2.example.org\:6322\;mon3.example.org\:\
50 -6322,password-secret=virtio-disk0-secret0,format=raw,if=none,\
51 +6322,file.password-secret=virtio-disk0-secret0,format=raw,if=none,\
52 id=drive-virtio-disk0' \
53 -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,\
54 id=virtio-disk0
+0
-1
debian/patches/series less more
1313 debian/apparmor_profiles_local_include.patch
1414 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
1515 Set-defaults-for-zfs-tools.patch
16 qemu-Fix-the-command-line-generation-for-rbd-auth-using-a.patch