From 04de9ad28523e9652fa757472ffc1a519f87d48c Mon Sep 17 00:00:00 2001
From: Boris Fiuczynski <fiuczy@linux.ibm.com>
Date: Tue, 4 Feb 2025 18:11:36 +0100
Subject: [PATCH] nodedev: refactor CCW device address format

Refactor for reuse in the following patch.

Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/node_device_conf.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 08a89942ba..9711594994 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -623,6 +623,19 @@ virNodeDeviceCapVDPADefFormat(virBuffer *buf,
 }
 
 
+static void
+virCCWDeviceAddressFormat(virBuffer *buf,
+                          const virCCWDeviceAddress *ccw_address)
+{
+    virBufferAsprintf(buf, "<cssid>0x%x</cssid>\n",
+                      ccw_address->cssid);
+    virBufferAsprintf(buf, "<ssid>0x%x</ssid>\n",
+                      ccw_address->ssid);
+    virBufferAsprintf(buf, "<devno>0x%04x</devno>\n",
+                      ccw_address->devno);
+}
+
+
 static void
 virNodeDeviceCapCCWDefFormat(virBuffer *buf,
                              const virNodeDevCapData *data)
@@ -645,12 +658,9 @@ virNodeDeviceCapCSSDefFormat(virBuffer *buf,
     virNodeDeviceCapCCWDefFormat(buf, data);
 
     if (ccw_dev.channel_dev_addr) {
-        virCCWDeviceAddress *ccw = ccw_dev.channel_dev_addr;
         virBufferAddLit(buf, "<channel_dev_addr>\n");
         virBufferAdjustIndent(buf, 2);
-        virBufferAsprintf(buf, "<cssid>0x%x</cssid>\n", ccw->cssid);
-        virBufferAsprintf(buf, "<ssid>0x%x</ssid>\n", ccw->ssid);
-        virBufferAsprintf(buf, "<devno>0x%04x</devno>\n", ccw->devno);
+        virCCWDeviceAddressFormat(buf, ccw_dev.channel_dev_addr);
         virBufferAdjustIndent(buf, -2);
         virBufferAddLit(buf, "</channel_dev_addr>\n");
     }
-- 
2.47.3