util: refactor ccw address constants into virccw

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

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index 92b908b2e63ed097e70cac1f5b8d6262001ad1d8..bdc9219f84380d106b4f45de4dcffba64c6a0681 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -261,9 +261,9 @@ virPCIDeviceAddressFormat(virBuffer *buf,
 bool
 virDomainDeviceCCWAddressIsValid(virCCWDeviceAddress *addr)
 {
-    return addr->cssid <= VIR_DOMAIN_DEVICE_CCW_MAX_CSSID &&
-           addr->ssid <= VIR_DOMAIN_DEVICE_CCW_MAX_SSID &&
-           addr->devno <= VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO;
+    return addr->cssid <= VIR_CCW_DEVICE_MAX_CSSID &&
+           addr->ssid <= VIR_CCW_DEVICE_MAX_SSID &&
+           addr->devno <= VIR_CCW_DEVICE_MAX_DEVNO;
 }
 
 int

diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index 950d333e2ea68cd8656e39f32da7a7ffa71e5ef8..5c4b7b2f8e13f6289ac8262b69a2698bbb640a12 100644 (file)
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -70,10 +70,6 @@ struct _virDomainDeviceVirtioSerialAddress {
     unsigned int port;
 };
 
-#define VIR_DOMAIN_DEVICE_CCW_MAX_CSSID    254
-#define VIR_DOMAIN_DEVICE_CCW_MAX_SSID       3
-#define VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO  65535
-
 typedef struct _virDomainDeviceCcidAddress virDomainDeviceCcidAddress;
 struct _virDomainDeviceCcidAddress {
     unsigned int controller;

diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c
index 7dd26c3271ece69d0aecaf622455b1b7e285979e..65b438f13ca1af5172535d1356f8c3f84068cc5d 100644 (file)
--- a/src/conf/domain_addr.c
+++ b/src/conf/domain_addr.c
@@ -1309,7 +1309,7 @@ virDomainCCWAddressIncrement(virCCWDeviceAddress *addr)
     virCCWDeviceAddress ccwaddr = *addr;
 
     /* We are not touching subchannel sets and channel subsystems */
-    if (++ccwaddr.devno > VIR_DOMAIN_DEVICE_CCW_MAX_DEVNO)
+    if (++ccwaddr.devno > VIR_CCW_DEVICE_MAX_DEVNO)
         return -1;
 
     *addr = ccwaddr;

diff --git a/src/util/virccw.h b/src/util/virccw.h
index 127359c2995d99a87ffb5f1a6e1b6c905e73848e..c3a47127f1ce76d73881163149a24112e1a95239 100644 (file)
--- a/src/util/virccw.h
+++ b/src/util/virccw.h
@@ -22,6 +22,9 @@
 
 #include "internal.h"
 
+#define VIR_CCW_DEVICE_MAX_CSSID    254
+#define VIR_CCW_DEVICE_MAX_SSID       3
+#define VIR_CCW_DEVICE_MAX_DEVNO  65535
 #define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x"
 
 typedef struct _virCCWDeviceAddress virCCWDeviceAddress;