]> xenbits.xensource.com Git - libvirt.git/commitdiff
conf: Separate SEV formatting into a function
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 11 Jun 2024 11:00:58 +0000 (13:00 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 21 Jun 2024 07:30:24 +0000 (09:30 +0200)
To avoid convolution of switch() inside of virDomainSecDefFormat() even
more (as new sectypes are added), move formatting into a separate
function.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
src/conf/domain_conf.c

index 9179cc18bb3169985efa04720dc895682609d5aa..264f182d059bd07638e0d6d6c878cb3fa0a8c55d 100644 (file)
@@ -26670,6 +26670,19 @@ virDomainSEVCommonDefFormat(virBuffer *attrBuf,
 }
 
 
+static void
+virDomainSEVDefFormat(virBuffer *attrBuf,
+                      virBuffer *childBuf,
+                      virDomainSEVDef *def)
+{
+    virDomainSEVCommonDefFormat(attrBuf, childBuf, &def->common);
+
+    virBufferAsprintf(childBuf, "<policy>0x%04x</policy>\n", def->policy);
+    virBufferEscapeString(childBuf, "<dhCert>%s</dhCert>\n", def->dh_cert);
+    virBufferEscapeString(childBuf, "<session>%s</session>\n", def->session);
+}
+
+
 static void
 virDomainSecDefFormat(virBuffer *buf, virDomainSecDef *sec)
 {
@@ -26683,18 +26696,9 @@ virDomainSecDefFormat(virBuffer *buf, virDomainSecDef *sec)
                       virDomainLaunchSecurityTypeToString(sec->sectype));
 
     switch ((virDomainLaunchSecurity) sec->sectype) {
-    case VIR_DOMAIN_LAUNCH_SECURITY_SEV: {
-        virDomainSEVDef *sev = &sec->data.sev;
-
-        virDomainSEVCommonDefFormat(&attrBuf, &childBuf, &sev->common);
-
-        virBufferAsprintf(&childBuf, "<policy>0x%04x</policy>\n", sev->policy);
-        virBufferEscapeString(&childBuf, "<dhCert>%s</dhCert>\n", sev->dh_cert);
-
-        virBufferEscapeString(&childBuf, "<session>%s</session>\n", sev->session);
-
+    case VIR_DOMAIN_LAUNCH_SECURITY_SEV:
+        virDomainSEVDefFormat(&attrBuf, &childBuf, &sec->data.sev);
         break;
-    }
 
     case VIR_DOMAIN_LAUNCH_SECURITY_PV:
         break;