On Thu, Jun 23, 2011 at 03:43:21PM -0600, Eric Blake wrote:
This reverts commit 12cd77a0c58a80179182f7d09e8e73f9f66b4677.
Conflicts:
python/libvirt-override-virConnect.py python/libvirt-override.c src/remote/remote_protocol.x ---
We've added some new APIs in the meantime, so there are some minor conflicts in reverting the BlockPull stuff. But consensus seemed to be that since qemu might change the block pull monitor command before it goes upstream, that we are safer deferring this patch series until after 0.9.3.
daemon/remote.c | 32 -------------------- include/libvirt/libvirt.h.in | 27 ----------------- python/libvirt-override-virConnect.py | 9 ------ python/libvirt-override.c | 51 --------------------------------- src/conf/domain_event.c | 51 --------------------------------- src/conf/domain_event.h | 7 +---- src/libvirt_private.syms | 2 - src/qemu/qemu_monitor.c | 12 -------- src/qemu/qemu_monitor.h | 8 ----- src/qemu/qemu_monitor_json.c | 30 ------------------- src/qemu/qemu_process.c | 30 ------------------- src/remote/remote_driver.c | 30 ------------------- src/remote/remote_protocol.x | 9 +----- src/remote_protocol-structs | 5 --- 14 files changed, 2 insertions(+), 301 deletions(-)
Sadly, ACK to this patch and the 6 following ones. This is just too risky to have included in our next release. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|