From: Boris Fiuczynski <fiuczy@linux.ibm.com>
Date: Tue, 4 Feb 2025 17:11:38 +0000 (+0100)
Subject: nodedev: remove virNodeDeviceCapCCWDefFormat
X-Git-Tag: v11.1.0-rc1~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1260f3bd4f5ccb536338d8d8fd16d0a160fe4a19;p=thirdparty%2Flibvirt.git

nodedev: remove virNodeDeviceCapCCWDefFormat

Directly use virCCWDeviceAddressFormat.

Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 85effb7d78..433334511f 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -636,21 +636,13 @@ virCCWDeviceAddressFormat(virBuffer *buf,
 }
 
 
-static void
-virNodeDeviceCapCCWDefFormat(virBuffer *buf,
-                             const virNodeDevCapData *data)
-{
-    virCCWDeviceAddressFormat(buf, data->ccw_dev.dev_addr);
-}
-
-
 static void
 virNodeDeviceCapCSSDefFormat(virBuffer *buf,
                              const virNodeDevCapData *data)
 {
     virNodeDevCapCCW ccw_dev = data->ccw_dev;
 
-    virNodeDeviceCapCCWDefFormat(buf, data);
+    virCCWDeviceAddressFormat(buf, ccw_dev.dev_addr);
 
     if (ccw_dev.channel_dev_addr) {
         virBufferAddLit(buf, "<channel_dev_addr>\n");
@@ -758,7 +750,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def, unsigned int flags)
                 const char *state = virNodeDevCCWStateTypeToString(data->ccw_dev.state);
                 virBufferEscapeString(&buf, "<state>%s</state>\n", state);
             }
-            virNodeDeviceCapCCWDefFormat(&buf, data);
+            virCCWDeviceAddressFormat(&buf, data->ccw_dev.dev_addr);
             break;
         case VIR_NODE_DEV_CAP_CSS_DEV:
             virNodeDeviceCapCSSDefFormat(&buf, data);