[PATCH libvirt v4 06/12] nodedev: detect AP matrix device

[Erik Skultety]

On Thu, Dec 03, 2020 at 06:59:38PM +0100, Shalini Chellathurai Saroja wrote:
> Add support for AP matrix device in libvirt node device driver.
> 
> Signed-off-by: Shalini Chellathurai Saroja <shalini at linux.ibm.com>
> Reviewed-by: Bjoern Walk <bwalk at linux.ibm.com>
> Reviewed-by: Boris Fiuczynski <fiuczy at linux.ibm.com>
> ---
>  docs/schemas/nodedev.rng           |  7 +++++++
>  src/conf/node_device_conf.c        |  9 +++++++++
>  src/conf/node_device_conf.h        |  8 ++++++++
>  src/conf/virnodedeviceobj.c        |  1 +
>  src/node_device/node_device_udev.c | 13 +++++++++++++
>  tools/virsh-nodedev.c              |  1 +
>  6 files changed, 39 insertions(+)
> 
> diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
> index 60367653..1024ba59 100644
> --- a/docs/schemas/nodedev.rng
> +++ b/docs/schemas/nodedev.rng
> @@ -89,6 +89,7 @@
>          <ref name="capvdpa"/>
>          <ref name="capapcard"/>
>          <ref name="capapqueue"/>
> +        <ref name="capapmatrix"/>
>        </choice>
>      </element>
>    </define>
> @@ -691,6 +692,12 @@
>      </element>
>    </define>
>  
> +  <define name='capapmatrix'>
> +    <attribute name='type'>
> +      <value>ap_matrix</value>
> +    </attribute>
> +  </define>
> +
>    <define name="address">
>      <element name="address">
>        <attribute name="domain"><ref name="hexuint"/></attribute>
> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
> index 01254a8f..d32a6afc 100644
> --- a/src/conf/node_device_conf.c
> +++ b/src/conf/node_device_conf.c
> @@ -69,6 +69,7 @@ VIR_ENUM_IMPL(virNodeDevCap,
>                "vdpa",
>                "ap_card",
>                "ap_queue",
> +              "ap_matrix",
>  );
>  
>  VIR_ENUM_IMPL(virNodeDevNetCap,
> @@ -665,6 +666,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
>          case VIR_NODE_DEV_CAP_MDEV_TYPES:
>          case VIR_NODE_DEV_CAP_FC_HOST:
>          case VIR_NODE_DEV_CAP_VPORTS:
> +        case VIR_NODE_DEV_CAP_AP_MATRIX:
>          case VIR_NODE_DEV_CAP_LAST:
>              break;
>          }
> @@ -2077,6 +2079,9 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
>          ret = virNodeDevCapAPQueueParseXML(ctxt, def, node,
>                                             &caps->data.ap_queue);
>          break;
> +    case VIR_NODE_DEV_CAP_AP_MATRIX:
> +        ret = 0;
> +        break;
>      case VIR_NODE_DEV_CAP_MDEV_TYPES:
>      case VIR_NODE_DEV_CAP_FC_HOST:
>      case VIR_NODE_DEV_CAP_VPORTS:
> @@ -2398,6 +2403,9 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
>              virMediatedDeviceTypeFree(data->ccw_dev.mdev_types[i]);
>          VIR_FREE(data->ccw_dev.mdev_types);
>          break;
> +    case VIR_NODE_DEV_CAP_AP_MATRIX:
> +        VIR_FREE(data->ap_matrix.addr);
> +        break;
>      case VIR_NODE_DEV_CAP_MDEV_TYPES:
>      case VIR_NODE_DEV_CAP_DRM:
>      case VIR_NODE_DEV_CAP_FC_HOST:
> @@ -2467,6 +2475,7 @@ virNodeDeviceUpdateCaps(virNodeDeviceDefPtr def)
>          case VIR_NODE_DEV_CAP_VDPA:
>          case VIR_NODE_DEV_CAP_AP_CARD:
>          case VIR_NODE_DEV_CAP_AP_QUEUE:
> +        case VIR_NODE_DEV_CAP_AP_MATRIX:
>          case VIR_NODE_DEV_CAP_LAST:
>              break;
>          }
> diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
> index b580d6cf..b863653b 100644
> --- a/src/conf/node_device_conf.h
> +++ b/src/conf/node_device_conf.h
> @@ -68,6 +68,7 @@ typedef enum {
>      VIR_NODE_DEV_CAP_VDPA,              /* vDPA device */
>      VIR_NODE_DEV_CAP_AP_CARD,           /* s390 AP Card device */
>      VIR_NODE_DEV_CAP_AP_QUEUE,          /* s390 AP Queue */
> +    VIR_NODE_DEV_CAP_AP_MATRIX,         /* s390 AP Matrix device */
>  
>      VIR_NODE_DEV_CAP_LAST
>  } virNodeDevCapType;
> @@ -304,6 +305,12 @@ struct _virNodeDevCapAPQueue {
>      unsigned int ap_domain;
>  };
>  
> +typedef struct _virNodeDevCapAPMatrix virNodeDevCapAPMatrix;
> +typedef virNodeDevCapAPMatrix *virNodeDevCapAPMatrixPtr;
> +struct _virNodeDevCapAPMatrix {
> +    char *addr;
> +};
> +
>  typedef struct _virNodeDevCapData virNodeDevCapData;
>  typedef virNodeDevCapData *virNodeDevCapDataPtr;
>  struct _virNodeDevCapData {
> @@ -325,6 +332,7 @@ struct _virNodeDevCapData {
>          virNodeDevCapVDPA vdpa;
>          virNodeDevCapAPCard ap_card;
>          virNodeDevCapAPQueue ap_queue;
> +        virNodeDevCapAPMatrix ap_matrix;
>      };
>  };
>  
> diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
> index 691632c6..8fbef5f5 100644
> --- a/src/conf/virnodedeviceobj.c
> +++ b/src/conf/virnodedeviceobj.c
> @@ -719,6 +719,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
>          case VIR_NODE_DEV_CAP_VDPA:
>          case VIR_NODE_DEV_CAP_AP_CARD:
>          case VIR_NODE_DEV_CAP_AP_QUEUE:
> +        case VIR_NODE_DEV_CAP_AP_MATRIX:
>          case VIR_NODE_DEV_CAP_LAST:
>              break;
>          }
> diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
> index 7883f23e..179793d8 100644
> --- a/src/node_device/node_device_udev.c
> +++ b/src/node_device/node_device_udev.c
> @@ -1234,6 +1234,15 @@ udevProcessAPQueue(struct udev_device *device,
>  }
>  
>  
> +static int
> +udevProcessAPMatrix(virNodeDeviceDefPtr def)
> +{

We should put a commentary here why we're hardcoding the name, i.e. that both
udev_device_get_subsystem and udev_device_get_sysname would return "matrix" and
it would be confusing.

Erik