On 05/20/2010 01:57 PM, Chris Lalancette wrote:
Basic live migration was broken by the commit that added non-shared block support. It also added a couple of built-in memory leaks. This patch fixes these problems and allows normal live migration to work again.
Signed-off-by: Chris Lalancette <clalance@redhat.com> --- src/qemu/qemu_driver.c | 3 --- src/qemu/qemu_monitor_text.c | 10 +++++++--- 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cfa5964..bbab893 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10205,9 +10205,6 @@ static int doNativeMigrate(struct qemud_driver *driver, qemuDomainObjPrivatePtr priv = vm->privateData; unsigned int background_flags = 0;
- virCheckFlags(VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC, - -1); -
Why are you removing the valid flag check altogether? Is it a matter of adding more valid flags, or is this just a forwarding routine to other methods that also do a valid flag check?
/* Issue the migrate command. */ if (STRPREFIX(uri, "tcp:") && !STRPREFIX(uri, "tcp://")) { /* HACK: source host generates bogus URIs, so fix them up */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 3df078a..41a1fab 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c
The changes to qemu_monitor_text.c make sense, but I'd like to understand the qemu_driver.c change before giving an ack. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org