Rebased to version 1.2.9.3
Fix getVersion() after installing qemu (bz #1000116) Fix autosocket setup with qemu:///session (bz #1044561, bz #1105274) Ignore storage volumes with non-ascii in names (bz #1066564) Don't generate invalid system nodedev XML (bz #1184131) Fix vhost-user XML (bz #1190842) Fix crash via race when unrefing rpc identity object (bz #1203030) Fix domcapabilities failure with ppc64le (bz #1209948) Fix snapshot-revert with cpu host-passthrough (bz #1030793) Fix starting VM with emulator pinning (bz #1214434) Fix virDomainBlockCopyRebase selinux failure (bz #1214846) Add {Haswell,Broadwell}-noTSX CPU models (bz #1182650) Report original error when QMP probing fails (bz #1178054) Don't lose VMs on libvirtd restart if qemu is uninstalled (bz #1099847) Ignore storage volumes that libvirt can't open (bz #1103308)remotes/origin/f21
parent
7415198273
commit
d617f580c5
|
@ -19,10 +19,10 @@ Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||||
6 files changed, 20 insertions(+), 16 deletions(-)
|
6 files changed, 20 insertions(+), 16 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
||||||
index 6b64f51..699ffb9 100644
|
index cfdf66c..8aca289 100644
|
||||||
--- a/src/conf/domain_conf.c
|
--- a/src/conf/domain_conf.c
|
||||||
+++ b/src/conf/domain_conf.c
|
+++ b/src/conf/domain_conf.c
|
||||||
@@ -9865,7 +9865,7 @@ virDomainVideoDefaultType(const virDomainDef *def)
|
@@ -9867,7 +9867,7 @@ virDomainVideoDefaultType(const virDomainDef *def)
|
||||||
(STREQ(def->os.type, "xen") ||
|
(STREQ(def->os.type, "xen") ||
|
||||||
STREQ(def->os.type, "linux")))
|
STREQ(def->os.type, "linux")))
|
||||||
return VIR_DOMAIN_VIDEO_TYPE_XEN;
|
return VIR_DOMAIN_VIDEO_TYPE_XEN;
|
||||||
|
@ -45,7 +45,7 @@ index 67cb9ff..d591c18 100644
|
||||||
struct ppc_vendor {
|
struct ppc_vendor {
|
||||||
char *name;
|
char *name;
|
||||||
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
||||||
index e5ed50a..363e4e2 100644
|
index be4d01f..34d753c 100644
|
||||||
--- a/src/qemu/qemu_capabilities.c
|
--- a/src/qemu/qemu_capabilities.c
|
||||||
+++ b/src/qemu/qemu_capabilities.c
|
+++ b/src/qemu/qemu_capabilities.c
|
||||||
@@ -632,7 +632,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid)
|
@@ -632,7 +632,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid)
|
||||||
|
@ -57,7 +57,7 @@ index e5ed50a..363e4e2 100644
|
||||||
parse = virQEMUCapsParsePPCModels;
|
parse = virQEMUCapsParsePPCModels;
|
||||||
} else {
|
} else {
|
||||||
VIR_DEBUG("don't know how to parse %s CPU models",
|
VIR_DEBUG("don't know how to parse %s CPU models",
|
||||||
@@ -2011,7 +2011,7 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
|
@@ -2018,7 +2018,7 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
if (def->os.arch == VIR_ARCH_PPC ||
|
if (def->os.arch == VIR_ARCH_PPC ||
|
||||||
|
@ -66,7 +66,7 @@ index e5ed50a..363e4e2 100644
|
||||||
/*
|
/*
|
||||||
* Usage of pci.0 naming:
|
* Usage of pci.0 naming:
|
||||||
*
|
*
|
||||||
@@ -3583,7 +3583,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def,
|
@@ -3600,7 +3600,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def,
|
||||||
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
|
!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ index aeb4eec..c5c48bf 100644
|
||||||
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
|
||||||
}
|
}
|
||||||
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
||||||
index 76fccce..e4edf34 100644
|
index bec7cf2..48e8acf 100644
|
||||||
--- a/src/qemu/qemu_domain.c
|
--- a/src/qemu/qemu_domain.c
|
||||||
+++ b/src/qemu/qemu_domain.c
|
+++ b/src/qemu/qemu_domain.c
|
||||||
@@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
|
@@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
|
||||||
|
|
|
@ -29,10 +29,10 @@ Acked-by: Michal Privoznik <mprivozn@redhat.com>
|
||||||
3 files changed, 12 insertions(+), 10 deletions(-)
|
3 files changed, 12 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
|
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
|
||||||
index 9b7fbb0..0e7a979 100644
|
index c09c352..74f0b16 100644
|
||||||
--- a/src/conf/cpu_conf.c
|
--- a/src/conf/cpu_conf.c
|
||||||
+++ b/src/conf/cpu_conf.c
|
+++ b/src/conf/cpu_conf.c
|
||||||
@@ -619,6 +619,7 @@ virCPUDefFormatBuf(virBufferPtr buf,
|
@@ -624,6 +624,7 @@ virCPUDefFormatBuf(virBufferPtr buf,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
formatModel = (def->mode == VIR_CPU_MODE_CUSTOM ||
|
formatModel = (def->mode == VIR_CPU_MODE_CUSTOM ||
|
||||||
|
|
|
@ -32,10 +32,10 @@ Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||||
2 files changed, 38 insertions(+)
|
2 files changed, 38 insertions(+)
|
||||||
|
|
||||||
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
|
diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
|
||||||
index 18c7b0d..bd9b056 100644
|
index d181cd5..4ec49ca 100644
|
||||||
--- a/src/cpu/cpu_map.xml
|
--- a/src/cpu/cpu_map.xml
|
||||||
+++ b/src/cpu/cpu_map.xml
|
+++ b/src/cpu/cpu_map.xml
|
||||||
@@ -627,5 +627,35 @@
|
@@ -637,5 +637,35 @@
|
||||||
<pvr value='0x004b0100'/>
|
<pvr value='0x004b0100'/>
|
||||||
</model>
|
</model>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
|
||||||
index e7b585c..a08af8c 100644
|
index 12172a4..6c64230 100644
|
||||||
--- a/docs/formatdomain.html.in
|
--- a/docs/formatdomain.html.in
|
||||||
+++ b/docs/formatdomain.html.in
|
+++ b/docs/formatdomain.html.in
|
||||||
@@ -1047,7 +1047,20 @@
|
@@ -1047,7 +1047,20 @@
|
||||||
|
|
|
@ -57,10 +57,10 @@ index 0000000..e34a8ad
|
||||||
+ </devices>
|
+ </devices>
|
||||||
+</domain>
|
+</domain>
|
||||||
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
||||||
index cdafa1e..67c6359 100644
|
index 5539a84..e24d17f 100644
|
||||||
--- a/tests/qemuxml2argvtest.c
|
--- a/tests/qemuxml2argvtest.c
|
||||||
+++ b/tests/qemuxml2argvtest.c
|
+++ b/tests/qemuxml2argvtest.c
|
||||||
@@ -1306,6 +1306,8 @@ mymain(void)
|
@@ -1314,6 +1314,8 @@ mymain(void)
|
||||||
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
|
||||||
DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
|
||||||
QEMU_CAPS_NODEFCONFIG);
|
QEMU_CAPS_NODEFCONFIG);
|
||||||
|
|
25
libvirt.spec
25
libvirt.spec
|
@ -362,7 +362,7 @@
|
||||||
|
|
||||||
Summary: Library providing a simple virtualization API
|
Summary: Library providing a simple virtualization API
|
||||||
Name: libvirt
|
Name: libvirt
|
||||||
Version: 1.2.9.2
|
Version: 1.2.9.3
|
||||||
Release: 1%{?dist}%{?extra_release}
|
Release: 1%{?dist}%{?extra_release}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
|
@ -1979,9 +1979,6 @@ exit 0
|
||||||
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
|
||||||
%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
|
%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
|
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
|
|
||||||
%dir %attr(0711, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/
|
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
||||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||||
|
@ -2082,9 +2079,6 @@ exit 0
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
|
||||||
%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
|
%ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/
|
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/
|
|
||||||
%dir %attr(0711, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/
|
|
||||||
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
|
||||||
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/libvirtd_qemu.aug
|
||||||
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||||
|
@ -2288,6 +2282,23 @@ exit 0
|
||||||
%doc examples/systemtap
|
%doc examples/systemtap
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 28 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.3-1
|
||||||
|
- Rebased to version 1.2.9.3
|
||||||
|
- Fix getVersion() after installing qemu (bz #1000116)
|
||||||
|
- Fix autosocket setup with qemu:///session (bz #1044561, bz #1105274)
|
||||||
|
- Ignore storage volumes with non-ascii in names (bz #1066564)
|
||||||
|
- Don't generate invalid system nodedev XML (bz #1184131)
|
||||||
|
- Fix vhost-user XML (bz #1190842)
|
||||||
|
- Fix crash via race when unrefing rpc identity object (bz #1203030)
|
||||||
|
- Fix domcapabilities failure with ppc64le (bz #1209948)
|
||||||
|
- Fix snapshot-revert with cpu host-passthrough (bz #1030793)
|
||||||
|
- Fix starting VM with emulator pinning (bz #1214434)
|
||||||
|
- Fix virDomainBlockCopyRebase selinux failure (bz #1214846)
|
||||||
|
- Add {Haswell,Broadwell}-noTSX CPU models (bz #1182650)
|
||||||
|
- Report original error when QMP probing fails (bz #1178054)
|
||||||
|
- Don't lose VMs on libvirtd restart if qemu is uninstalled (bz #1099847)
|
||||||
|
- Ignore storage volumes that libvirt can't open (bz #1103308)
|
||||||
|
|
||||||
* Sat Feb 07 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.2-1
|
* Sat Feb 07 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.2-1
|
||||||
- Rebased to version 1.2.9.2
|
- Rebased to version 1.2.9.2
|
||||||
- CVE-2014-8131: deadlock and segfault in qemuConnectGetAllDomainStats (bz
|
- CVE-2014-8131: deadlock and segfault in qemuConnectGetAllDomainStats (bz
|
||||||
|
|
Loading…
Reference in New Issue