diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index cc6f297b2a..92fa18c570 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -49,7 +49,8 @@ VIR_ENUM_IMPL(virNodeDevCap, VIR_NODE_DEV_CAP_LAST,
"scsi",
"storage",
"fc_host",
- "vports")
+ "vports",
+ "scsi_generic")
VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST,
"80203",
@@ -472,6 +473,10 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDefPtr def)
virBufferAddLit(&buf,
" \n");
break;
+ case VIR_NODE_DEV_CAP_SCSI_GENERIC:
+ virBufferEscapeString(&buf, " %s\n",
+ data->sg.path);
+ break;
case VIR_NODE_DEV_CAP_FC_HOST:
case VIR_NODE_DEV_CAP_VPORTS:
case VIR_NODE_DEV_CAP_LAST:
@@ -1412,6 +1417,9 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
VIR_FREE(data->storage.serial);
VIR_FREE(data->storage.media_label);
break;
+ case VIR_NODE_DEV_CAP_SCSI_GENERIC:
+ VIR_FREE(data->sg.path);
+ break;
case VIR_NODE_DEV_CAP_FC_HOST:
case VIR_NODE_DEV_CAP_VPORTS:
case VIR_NODE_DEV_CAP_LAST:
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 1c5855c355..e326e8265b 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -48,6 +48,8 @@ enum virNodeDevCapType {
VIR_NODE_DEV_CAP_STORAGE, /* Storage device */
VIR_NODE_DEV_CAP_FC_HOST, /* FC Host Bus Adapter */
VIR_NODE_DEV_CAP_VPORTS, /* HBA which is capable of vports */
+ VIR_NODE_DEV_CAP_SCSI_GENERIC, /* SCSI generic device */
+
VIR_NODE_DEV_CAP_LAST
};
@@ -165,6 +167,9 @@ struct _virNodeDevCapsDef {
char *media_label;
unsigned int flags; /* virNodeDevStorageCapFlags bits */
} storage;
+ struct {
+ char *path;
+ } sg; /* SCSI generic device */
} data;
virNodeDevCapsDefPtr next; /* next capability */
};
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index b8f5e5b063..b94be8057f 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1121,6 +1121,21 @@ out:
return ret;
}
+static int
+udevProcessScsiGeneric(struct udev_device *dev,
+ virNodeDeviceDefPtr def)
+{
+ if (udevGetStringProperty(dev,
+ "DEVNAME",
+ &def->caps->data.sg.path) != PROPERTY_FOUND)
+ return -1;
+
+ if (udevGenerateDeviceName(dev, def, NULL) != 0)
+ return -1;
+
+ return 0;
+}
+
static bool
udevHasDeviceProperty(struct udev_device *dev,
const char *key)
@@ -1136,6 +1151,7 @@ udevGetDeviceType(struct udev_device *device,
enum virNodeDevCapType *type)
{
const char *devtype = NULL;
+ char *subsystem = NULL;
int ret = -1;
devtype = udev_device_get_devtype(device);
@@ -1167,6 +1183,13 @@ udevGetDeviceType(struct udev_device *device,
* property exists, we have a network device. */
if (udevHasDeviceProperty(device, "INTERFACE"))
*type = VIR_NODE_DEV_CAP_NET;
+
+ /* SCSI generic device doesn't set DEVTYPE property */
+ if (udevGetStringProperty(device, "SUBSYSTEM", &subsystem) ==
+ PROPERTY_FOUND &&
+ STREQ(subsystem, "scsi_generic"))
+ *type = VIR_NODE_DEV_CAP_SCSI_GENERIC;
+ VIR_FREE(subsystem);
}
if (!*type)
@@ -1213,6 +1236,9 @@ static int udevGetDeviceDetails(struct udev_device *device,
case VIR_NODE_DEV_CAP_STORAGE:
ret = udevProcessStorage(device, def);
break;
+ case VIR_NODE_DEV_CAP_SCSI_GENERIC:
+ ret = udevProcessScsiGeneric(device, def);
+ break;
default:
VIR_ERROR(_("Unknown device type %d"), def->caps->type);
ret = -1;