Merge lp://qastaging/~qrilka/ubuntu/precise/libvirt/libvirt-fix-1092826 into lp://qastaging/ubuntu/precise/libvirt
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~qrilka/ubuntu/precise/libvirt/libvirt-fix-1092826 |
| Merge into: | lp://qastaging/ubuntu/precise/libvirt |
| Diff against target: |
20791 lines (+20549/-6) 28 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/applied-patches (+2/-0) .pc/ubuntu/qemu-warn-on-pc-0.12.patch/src/qemu/qemu_command.c (+7527/-0) .pc/ubuntu/qemu-warn-on-pc-0.12.patch/src/qemu/qemu_driver.c (+11642/-0) .pc/ubuntu/storage-fix-a-potential-crash-when-creating-vol-object/src/storage/storage_backend_logical.c (+827/-0) debian/README.Debian (+20/-0) debian/apparmor/libvirt-qemu (+3/-0) debian/apparmor/usr.sbin.libvirtd (+1/-0) debian/changelog (+48/-0) debian/control (+1/-1) debian/libvirt-bin.apport (+1/-1) debian/libvirt-bin.dirs (+1/-0) debian/libvirt-bin.dnsmasq (+4/-0) debian/libvirt-bin.install (+2/-1) debian/libvirt-bin.manpages (+1/-0) debian/libvirt-bin.postinst (+3/-0) debian/libvirt-bin.postrm (+4/-0) debian/libvirt-migrate-qemu-machinetype (+196/-0) debian/libvirt-migrate-qemu-machinetype.1 (+78/-0) debian/patches/fix-poll.patch (+77/-0) debian/patches/series (+3/-0) debian/patches/ubuntu/qemu-warn-on-pc-0.12.patch (+44/-0) debian/patches/ubuntu/storage-fix-a-potential-crash-when-creating-vol-object (+38/-0) debian/rules (+6/-1) src/qemu/qemu_command.c (+7/-1) src/qemu/qemu_driver.c (+8/-0) src/storage/storage_backend_logical.c (+3/-1) |
| To merge this branch: | bzr merge lp://qastaging/~qrilka/ubuntu/precise/libvirt/libvirt-fix-1092826 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamie Strandboge | Needs Fixing | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix for LP: #1092826
| Jamie Strandboge (jdstrand) wrote | # |
Unmerged revisions
- 211. By Kirill Zaborsky
-
adds proper handling for EINTR signal (LP: #1092826)
- 210. By Serge Hallyn
-
* storage-
fix-a-potential -crash- when-creating- vol-object: avoid a crash
on bad free() on error lvm storage. (LP: #1035320)
* add pm-utils as suggests to avoid log spamming with messages about
pm-is-supported not being found. (LP: #994476) - 209. By Serge Hallyn
-
debian/
apparmor/ libvirt- qemu: add ceph.conf (LP: #1026404) - 208. By Serge Hallyn
-
* debian/
libvirt- bin.install, debian/rules: name the apport file
source_libvirt. py, not source_ libvirt- bin.py. (LP: #1007405)
* install /etc/dnsmasq.d/libvirt to configure system wide dnsmasq to not
listen on the libvirt bridge. (Following Stéphane's lxc example)
(LP: #928524) (LP: #231060)
- postinst: restart dnsmasq; postrm: remove dnsmasq.d/libvirt file and
restart dnsmasq; rules, libvirt-bin.dirs and libvirt-bin.install:
install new debian/libvirt- bin.dnsmasq file.
* Warn user about bad pc-0.12 machine type, and help user transition.
(LP: #1001625)
- qemu-warn-on-pc-0. 12.patch: When defining or starting a VM which uses the
pc-0.12 machine type, warn in libvirtd.log.
- debian/libvirt- migrate- qemu-machinetyp e: automatically migrate QEMU VMs
to newest machine type. This is not done automatically as there will
be some users who have good reason to stay with pc-0.12. - 207. By Serge Hallyn
-
debian/
apparmor/ usr.sbin. libvirtd: allow execution of /lib/udev/scsi_id
(LP: #992378)
Thanks for your patch! Unfortunately it cannot be incorporated into Ubuntu in its current state:
* debian/
* debian/changelog should reference precise-proposed, not precise
* the patch does not apply cleanly to 0.9.8-2ubuntu17.5, the version that is currently in precise
Please feel free to make these changes and resubmit. Thanks!