[libvirt] [PATCH 3/3] Wire up virDomainOpenGraphicsFD in QEMU driver

[Peter Krempa]

On 08/25/14 20:22, Ján Tomko wrote:
> Should fix https://bugzilla.redhat.com/show_bug.cgi?id=999926
> ---
>  src/qemu/qemu_driver.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 80 insertions(+)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index ad75bd9..932c638 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -15806,6 +15806,85 @@ qemuDomainOpenGraphics(virDomainPtr dom,
>  }
>  
>  static int
> +qemuDomainOpenGraphicsFD(virDomainPtr dom,
> +                         unsigned int idx,
> +                         int *fd,
> +                         unsigned int flags)
> +{
> +    virQEMUDriverPtr driver = dom->conn->privateData;
> +    virDomainObjPtr vm = NULL;
> +    int ret = -1;
> +    qemuDomainObjPrivatePtr priv;
> +    const char *protocol;
> +    int pair[2] = {-1, -1};
> +
> +    virCheckFlags(VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH, -1);
> +
> +    if (!(vm = qemuDomObjFromDomain(dom)))
> +        return -1;
> +
> +    if (virDomainOpenGraphicsFdEnsureACL(dom->conn, vm->def) < 0)
> +        goto cleanup;
> +
> +    if (!virDomainObjIsActive(vm)) {
> +        virReportError(VIR_ERR_OPERATION_INVALID,
> +                       "%s", _("domain is not running"));
> +        goto cleanup;
> +    }
> +
> +    priv = vm->privateData;
> +
> +    if (idx >= vm->def->ngraphics) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR,
> +                       _("No graphics backend with index %d"), idx);
> +        goto cleanup;
> +    }
> +    switch (vm->def->graphics[idx]->type) {
> +    case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
> +        protocol = "vnc";
> +        break;
> +    case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
> +        protocol = "spice";
> +        break;
> +    default:
> +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                       _("Can only open VNC or SPICE graphics backends, not %s"),
> +                       virDomainGraphicsTypeToString(vm->def->graphics[idx]->type));
> +        goto cleanup;
> +    }
> +
> +    if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0)
> +        goto cleanup;
> +
> +    if (socketpair(PF_UNIX, SOCK_STREAM, 0, pair) < 0)
> +        goto cleanup;
> +
> +    if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0)
> +        goto cleanup;

> +    /* TODO create and label the socket here */

You already do this, don't you?

> +
> +    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
> +        goto cleanup;
> +    qemuDomainObjEnterMonitor(driver, vm);
> +    ret = qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphicsfd",
> +                                  (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0);
> +    qemuDomainObjExitMonitor(driver, vm);
> +    if (!qemuDomainObjEndJob(driver, vm))
> +        vm = NULL;
> +
> +    *fd = pair[0];
> +
> + cleanup:
> +    if (ret < 0) {
> +        VIR_FORCE_CLOSE(pair[0]);
> +        VIR_FORCE_CLOSE(pair[1]);
> +    }
> +    if (vm)
> +        virObjectUnlock(vm);
> +    return ret;
> +}
> +
> +static int
>  qemuDomainSetBlockIoTune(virDomainPtr dom,
>                           const char *disk,
>                           virTypedParameterPtr params,
> @@ -17262,6 +17341,7 @@ static virDriver qemuDriver = {
>      .connectDomainQemuMonitorEventDeregister = qemuConnectDomainQemuMonitorEventDeregister, /* 1.2.3 */
>      .domainOpenConsole = qemuDomainOpenConsole, /* 0.8.6 */
>      .domainOpenGraphics = qemuDomainOpenGraphics, /* 0.9.7 */
> +    .domainOpenGraphicsFD = qemuDomainOpenGraphicsFD, /* 1.2.8 */
>      .domainInjectNMI = qemuDomainInjectNMI, /* 0.9.2 */
>      .domainMigrateBegin3 = qemuDomainMigrateBegin3, /* 0.9.2 */
>      .domainMigratePrepare3 = qemuDomainMigratePrepare3, /* 0.9.2 */
> 


ACK with comment removed.

Peter

-------------- 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/20140826/50a3b0ee/attachment-0001.sig>