[RFCv2 34/46] conf: Generate virDomainGraphicsDesktopDefFormatAttr

Shi Lei shi_lei at massclouds.com
Fri Sep 4 03:35:26 UTC 2020


Signed-off-by: Shi Lei <shi_lei at massclouds.com>
---
 src/conf/domain_conf.c | 8 ++------
 src/conf/domain_conf.h | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ad129e9..bc42068 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -28177,12 +28177,8 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
         break;
 
     case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
-        if (def->data.desktop.display)
-            virBufferEscapeString(buf, " display='%s'",
-                                  def->data.desktop.display);
-
-        if (def->data.desktop.fullscreen)
-            virBufferAddLit(buf, " fullscreen='yes'");
+        if (virDomainGraphicsDesktopDefFormatAttr(buf, &def->data.desktop, def, NULL) < 0)
+            return -1;
 
         break;
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ec08bdd..08af9e1 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1703,7 +1703,7 @@ struct _virDomainGraphicsRDPDef {   /* genparse:withhook, genformat:separate */
     char *_listen;                  /* xmlattr:listen, formathook */
 };
 
-struct _virDomainGraphicsDesktopDef {   /* genparse */
+struct _virDomainGraphicsDesktopDef {   /* genparse, genformat:separate */
     char *display;                      /* xmlattr */
     bool fullscreen;                    /* xmlattr */
 };
-- 
2.25.1





More information about the libvir-list mailing list