[libvirt] [PATCH] qemu: Correctly label migration TCP socket passed to qemu

[Daniel P. Berrange]

On Thu, Aug 25, 2011 at 12:35:57PM +0200, Jiri Denemark wrote:
> ---
>  src/qemu/qemu_migration.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index a84faf6..d787a09 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1484,9 +1484,12 @@ qemuMigrationRun(struct qemud_driver *driver,
>      case MIGRATION_DEST_FD:
>          if (spec->fwdType != MIGRATION_FWD_DIRECT)
>              fd = spec->dest.fd.local;
> -        ret = qemuMonitorMigrateToFd(priv->mon, migrate_flags,
> -                                     spec->dest.fd.qemu);
> -        VIR_FORCE_CLOSE(spec->dest.fd.qemu);
> +        if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm,
> +                                              spec->dest.fd.qemu) == 0) {
> +            ret = qemuMonitorMigrateToFd(priv->mon, migrate_flags,
> +                                         spec->dest.fd.qemu);
> +            VIR_FORCE_CLOSE(spec->dest.fd.qemu);
> +        }
>          break;
>      }
>      qemuDomainObjExitMonitorWithDriver(driver, vm);

Based on more discussions with Dan Walsh this needs to be instead
calling   virSecurityManagerSetProcessFDLabel


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 :|