nodedev: add ccw device state and remove fencing

Instead of fencing offline ccw devices add the state to the ccw
capability.

Resolves: https://issues.redhat.com/browse/RHEL-39497
Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.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 416238bec1541594edb5801966f8a6c5f50faae9..08a89942bac27714eab06eed41096c481609f13b 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -86,6 +86,12 @@ VIR_ENUM_IMPL(virNodeDevDRM,
               "render",
 );
 
+VIR_ENUM_IMPL(virNodeDevCCWState,
+              VIR_NODE_DEV_CCW_STATE_LAST,
+              "offline",
+              "online",
+);
+
 static int
 virNodeDevCapsDefParseString(const char *xpath,
                              xmlXPathContextPtr ctxt,
@@ -743,6 +749,10 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def, unsigned int flags)
             virNodeDeviceCapMdevDefFormat(&buf, data, inactive_state);
             break;
         case VIR_NODE_DEV_CAP_CCW_DEV:
+            if (data->ccw_dev.state != VIR_NODE_DEV_CCW_STATE_LAST) {
+                const char *state = virNodeDevCCWStateTypeToString(data->ccw_dev.state);
+                virBufferEscapeString(&buf, "<state>%s</state>\n", state);
+            }
             virNodeDeviceCapCCWDefFormat(&buf, data);
             break;
         case VIR_NODE_DEV_CAP_CSS_DEV:
@@ -1189,9 +1199,23 @@ virNodeDevCapCCWParseXML(xmlXPathContextPtr ctxt,
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     g_autofree virCCWDeviceAddress *ccw_addr = NULL;
+    g_autofree char *state = NULL;
+    int val;
 
     ctxt->node = node;
 
+    /* state is optional */
+    ccw_dev->state = VIR_NODE_DEV_CCW_STATE_LAST;
+
+    if ((state = virXPathString("string(./state[1])", ctxt))) {
+        if ((val = virNodeDevCCWStateTypeFromString(state)) < 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("unknown state '%1$s' for '%2$s'"), state, def->name);
+            return -1;
+        }
+        ccw_dev->state = val;
+    }
+
     ccw_addr = g_new0(virCCWDeviceAddress, 1);
 
     if (virNodeDevCCWDeviceAddressParseXML(ctxt, node, def->name, ccw_addr) < 0)

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 4b82636af77f6bb735e658fca034ea6cfe1e535e..25666a333ee9fb935643c59060f2dd9dd001ca13 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -112,6 +112,15 @@ typedef enum {
     VIR_NODE_DEV_CAP_FLAG_CSS_MDEV                  = (1 << 0),
 } virNodeDevCCWCapFlags;
 
+typedef enum {
+    VIR_NODE_DEV_CCW_STATE_OFFLINE = 0,
+    VIR_NODE_DEV_CCW_STATE_ONLINE,
+
+    VIR_NODE_DEV_CCW_STATE_LAST
+} virNodeDevCCWStateType;
+
+VIR_ENUM_DECL(virNodeDevCCWState);
+
 typedef enum {
     VIR_NODE_DEV_CAP_FLAG_AP_MATRIX_MDEV            = (1 << 0),
 } virNodeDevAPMatrixCapFlags;
@@ -279,6 +288,7 @@ struct _virNodeDevCapCCW {
     virMediatedDeviceType **mdev_types;
     size_t nmdev_types;
     virCCWDeviceAddress *channel_dev_addr;
+    virNodeDevCCWStateType state;
 };
 
 typedef struct _virNodeDevCapVDPA virNodeDevCapVDPA;

diff --git a/src/conf/schemas/nodedev.rng b/src/conf/schemas/nodedev.rng
index ff073139681a5c787fd60ba2c4fec6cd7261ddb7..42a0cdcfd9f0398c5c90af074b2512ba7d2d8f9d 100644 (file)
--- a/src/conf/schemas/nodedev.rng
+++ b/src/conf/schemas/nodedev.rng
@@ -673,6 +673,14 @@
     <attribute name="type">
       <value>ccw</value>
     </attribute>
+    <optional>
+      <element name="state">
+        <choice>
+          <value>online</value>
+          <value>offline</value>
+        </choice>
+      </element>
+    </optional>
     <ref name="capccwaddress"/>
   </define>
 

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 226bea402535fb56ddf1312c2adf4109bac38c48..1d8486f6235bc9ee46ad4f854fa303427ac2e9c5 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1201,13 +1201,34 @@ udevGetCCWAddress(const char *sysfs_path,
 
 
 static int
-udevProcessCCW(struct udev_device *device,
-               virNodeDeviceDef *def)
+udevCCWGetState(struct udev_device *device,
+                virNodeDevCapData *data)
 {
     int online = 0;
 
+    if (udevGetIntSysfsAttr(device, "online", &online, 0) < 0 || online < 0)
+        return -1;
+
+    switch (online) {
+    case VIR_NODE_DEV_CCW_STATE_OFFLINE:
+    case VIR_NODE_DEV_CCW_STATE_ONLINE:
+        data->ccw_dev.state = online;
+        break;
+    default:
+        data->ccw_dev.state = VIR_NODE_DEV_CCW_STATE_LAST;
+        break;
+    }
+
+    return 0;
+}
+
+
+static int
+udevProcessCCW(struct udev_device *device,
+               virNodeDeviceDef *def)
+{
     /* process only online devices to keep the list sane */
-    if (udevGetIntSysfsAttr(device, "online", &online, 0) < 0 || online != 1)
+    if (udevCCWGetState(device, &def->caps->data) < 0)
         return -1;
 
     if (udevGetCCWAddress(def->sysfs_path, &def->caps->data) < 0)