[libvirt] [PATCH v1 06/11] conf: Make graphics's GL a standalone structure

[Erik Skultety]

...

> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index f8a662f747..948b9b7fd0 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -11290,11 +11290,12 @@ qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
>                          virDomainGraphicsDefPtr gfx,
>                          const struct qemuDomainCreateDeviceData *data)
>  {
> -    const char *rendernode = gfx->data.spice.rendernode;
> +    const char *rendernode = NULL;
>
>      if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE ||
> -        gfx->data.spice.gl != VIR_TRISTATE_BOOL_YES ||
> -        !rendernode)
> +        !gfx->gl ||
> +        gfx->gl->enable != VIR_TRISTATE_BOOL_YES ||
> +        !gfx->gl->rendernode)
>          return 0;
>
>      return qemuDomainCreateDevice(rendernode, data, false);

Consider the following hunk squashed in:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 39920da442..98fc9a128b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11360,15 +11360,13 @@ qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
                         virDomainGraphicsDefPtr gfx,
                         const struct qemuDomainCreateDeviceData *data)
 {
-    const char *rendernode = NULL;
-
     if (gfx->type != VIR_DOMAIN_GRAPHICS_TYPE_SPICE ||
         !gfx->gl ||
         gfx->gl->enable != VIR_TRISTATE_BOOL_YES ||
         !gfx->gl->rendernode)
         return 0;

-    return qemuDomainCreateDevice(rendernode, data, false);
+    return qemuDomainCreateDevice(gfx->gl->rendernode, data, false);
 }

Erik