util: make reuse of ccw device address format constant

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

diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 60d90bbf1903fcc04f7be10f53ac426f3a5ac452..950d333e2ea68cd8656e39f32da7a7ffa71e5ef8 100644 (file)
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -202,7 +202,6 @@ int virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
                                       virCCWDeviceAddress *addr);
 bool virDomainDeviceCCWAddressEqual(virCCWDeviceAddress *addr1,
                                     virCCWDeviceAddress *addr2);
-#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x"
 
 int virDomainDeviceDriveAddressParseXML(xmlNodePtr node,
                                         virDomainDeviceDriveAddress *addr);

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 34dffb06156c061d1b0901ad0d1cdd438733a351..56ab663529a22bf80071373909cb16d8718fa5c6 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -601,7 +601,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props,
         return 0;
 
     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: {
-        g_autofree char *devno = g_strdup_printf("%x.%x.%04x",
+        g_autofree char *devno = g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT,
                                                  info->addr.ccw.cssid,
                                                  info->addr.ccw.ssid,
                                                  info->addr.ccw.devno);

diff --git a/src/util/virccw.c b/src/util/virccw.c
index 409287b380da000814acb6843eeafc074bf06952..5a19d3a112e3cb88c44c4ca0271dbf9af246bdce 100644 (file)
--- a/src/util/virccw.c
+++ b/src/util/virccw.c
@@ -25,5 +25,5 @@
 char*
 virCCWDeviceAddressAsString(virCCWDeviceAddress *addr)
 {
-    return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->devno);
+    return g_strdup_printf(VIR_CCW_DEVICE_ADDRESS_FMT, addr->cssid, addr->ssid, addr->devno);
 }

diff --git a/src/util/virccw.h b/src/util/virccw.h
index 21a03406fa50c663a337e3e1d590b1cf4007a7d3..127359c2995d99a87ffb5f1a6e1b6c905e73848e 100644 (file)
--- a/src/util/virccw.h
+++ b/src/util/virccw.h
@@ -22,6 +22,8 @@
 
 #include "internal.h"
 
+#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x"
+
 typedef struct _virCCWDeviceAddress virCCWDeviceAddress;
 struct _virCCWDeviceAddress {
     unsigned int cssid;