[libvirt] [PATCH] qemu: fix up NBD Server can not be stopped properly

[Ján Tomko]

On 11/04/2014 06:03 AM, weiwei li wrote:
> In qemuMigrationFinish mig->nbd can not be initialized by
> qemuMigrationEatCookie without a flag QEMU_MIGRATION_COOKIE_NBD.
> That cause qemuMigrationStopNBDServer return and the NBD server
> can not be stopped properly.
> 
> Signed-off-by: Weiwei Li <nuonuoli at tencent.com <mailto:nuonuoli at tencent.com>>

> Signed-off-by: Ján Tomko <jtomko at redhat.com <mailto:jtomko at redhat.com>>

You should only add Signed-off-by lines with your own name :)

> ---
>  src/qemu/qemu_migration.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 13239eb..9cb2a06 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -4822,7 +4822,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
>      VIR_FREE(priv->job.completed);
>  
>      cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK |
> -                   QEMU_MIGRATION_COOKIE_STATS;
> +                   QEMU_MIGRATION_COOKIE_STATS |
> +   QEMU_MIGRATION_COOKIE_NBD;

This should be aligned with the other flags.

ACK and pushed now.

Jan

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20141104/1918761d/attachment-0001.sig>