12:29 a.m.
Implement autostart functionality for mediated devices.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/conf/node_device_conf.h | 1 +
src/conf/virnodedeviceobj.c | 16 +++
src/conf/virnodedeviceobj.h | 6 ++
src/libvirt_private.syms | 2 +
src/node_device/node_device_driver.c | 139 ++++++++++++++++++++++++++-
src/node_device/node_device_driver.h | 13 +++
src/node_device/node_device_udev.c | 12 ++-
7 files changed, 185 insertions(+), 4 deletions(-)
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 786de85060..5a4d9c7a55 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -154,6 +154,7 @@ struct _virNodeDevCapMdev {
virMediatedDeviceAttr **attributes;
size_t nattributes;
char *parent_addr;
+ bool autostart;
};
typedef struct _virNodeDevCapPCIDev virNodeDevCapPCIDev;
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 87e180f3ef..9a9841576a 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -41,6 +41,7 @@ struct _virNodeDeviceObj {
used by testdriver */
bool active;
bool persistent;
+ bool autostart;
};
struct _virNodeDeviceObjList {
@@ -1034,6 +1035,21 @@ virNodeDeviceObjSetPersistent(virNodeDeviceObj *obj,
}
+bool
+virNodeDeviceObjIsAutostart(virNodeDeviceObj *obj)
+{
+ return obj->autostart;
+}
+
+
+void
+virNodeDeviceObjSetAutostart(virNodeDeviceObj *obj,
+ bool autostart)
+{
+ obj->autostart = autostart;
+}
+
+
typedef struct _PredicateHelperData PredicateHelperData;
struct _PredicateHelperData {
virNodeDeviceObjListPredicate predicate;
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 068c7c6f34..5f6d22e1f6 100644
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -137,6 +137,12 @@ virNodeDeviceObjIsPersistent(virNodeDeviceObj *obj);
void
virNodeDeviceObjSetPersistent(virNodeDeviceObj *obj,
bool persistent);
+bool
+virNodeDeviceObjIsAutostart(virNodeDeviceObj *obj);
+
+void
+virNodeDeviceObjSetAutostart(virNodeDeviceObj *obj,
+ bool autostart);
typedef bool (*virNodeDeviceObjListPredicate)(virNodeDeviceObj *obj,
const void *opaque);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 090ac80691..e78a8c8631 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1287,6 +1287,7 @@ virNetworkPortDefSaveStatus;
virNodeDeviceObjEndAPI;
virNodeDeviceObjGetDef;
virNodeDeviceObjIsActive;
+virNodeDeviceObjIsAutostart;
virNodeDeviceObjIsPersistent;
virNodeDeviceObjListAssignDef;
virNodeDeviceObjListExport;
@@ -1304,6 +1305,7 @@ virNodeDeviceObjListNumOfDevices;
virNodeDeviceObjListRemove;
virNodeDeviceObjListRemoveLocked;
virNodeDeviceObjSetActive;
+virNodeDeviceObjSetAutostart;
virNodeDeviceObjSetPersistent;
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index db619aa2d8..bb18b24e53 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -621,11 +621,12 @@ nodeDeviceDefToMdevctlConfig(virNodeDeviceDef *def, char **buf)
size_t i;
virNodeDevCapMdev *mdev = &def->caps->data.mdev;
g_autoptr(virJSONValue) json = virJSONValueNewObject();
+ const char *startval = mdev->autostart ? "auto" : "manual";
if (virJSONValueObjectAppendString(json, "mdev_type", mdev->type) <
0)
return -1;
- if (virJSONValueObjectAppendString(json, "start", "manual") <
0)
+ if (virJSONValueObjectAppendString(json, "start", startval) < 0)
return -1;
if (mdev->attributes) {
@@ -1014,6 +1015,46 @@ virMdevctlStart(virNodeDeviceDef *def)
}
+/* gets a virCommand object that executes a mdevctl command to set the
+ * 'autostart' property of the device to the specified value
+ */
+virCommand*
+nodeDeviceGetMdevctlSetAutostartCommand(virNodeDeviceDef *def,
+ bool autostart,
+ char **errmsg)
+{
+ virCommand *cmd = virCommandNewArgList(MDEVCTL,
+ "modify",
+ "--uuid",
+ def->caps->data.mdev.uuid,
+ NULL);
+
+ if (autostart)
+ virCommandAddArg(cmd, "--auto");
+ else
+ virCommandAddArg(cmd, "--manual");
+
+ virCommandSetErrorBuffer(cmd, errmsg);
+
+ return cmd;
+}
+
+
+static int
+virMdevctlSetAutostart(virNodeDeviceDef *def, bool autostart, char **errmsg)
+{
+ int status;
+ g_autoptr(virCommand) cmd = NULL;
+
+ cmd = nodeDeviceGetMdevctlSetAutostartCommand(def, autostart, errmsg);
+
+ if (virCommandRun(cmd, &status) < 0 || status != 0)
+ return -1;
+
+ return 0;
+}
+
+
virCommand*
nodeDeviceGetMdevctlListCommand(bool defined,
char **output,
@@ -1066,6 +1107,7 @@ nodeDeviceParseMdevctlChildDevice(const char *parent,
virJSONValue *attrs;
g_autoptr(virNodeDeviceDef) child = g_new0(virNodeDeviceDef, 1);
virNodeDeviceObj *parent_obj;
+ const char *start = NULL;
/* the child object should have a single key equal to its uuid.
* The value is an object describing the properties of the mdev */
@@ -1094,6 +1136,8 @@ nodeDeviceParseMdevctlChildDevice(const char *parent,
mdev->parent_addr = g_strdup(parent);
mdev->type =
g_strdup(virJSONValueObjectGetString(props, "mdev_type"));
+ start = virJSONValueObjectGetString(props, "start");
+ mdev->autostart = STREQ_NULLABLE(start, "auto");
attrs = virJSONValueObjectGet(props, "attrs");
@@ -1346,6 +1390,7 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def)
/* all devices returned by virMdevctlListDefined() are persistent */
virNodeDeviceObjSetPersistent(obj, true);
+ virNodeDeviceObjSetAutostart(obj, def->caps->data.mdev.autostart);
if (!defined)
event = virNodeDeviceEventLifecycleNew(name,
@@ -1649,10 +1694,12 @@ removeMissingPersistentMdev(virNodeDeviceObj *obj,
/* The device is active, but no longer defined by mdevctl. Keep the device
* in the list, but mark it as non-persistent */
- if (virNodeDeviceObjIsActive(obj))
+ if (virNodeDeviceObjIsActive(obj)) {
+ virNodeDeviceObjSetAutostart(obj, false);
virNodeDeviceObjSetPersistent(obj, false);
- else
+ } else {
remove = true;
+ }
virObjectEventStateQueue(driver->nodeDeviceEventState, event);
@@ -1762,6 +1809,92 @@ nodeDeviceDefCopyFromMdevctl(virNodeDeviceDef *dst,
if (virMediatedDeviceAttrsCopy(dstmdev, srcmdev))
ret = true;
+ if (dstmdev->autostart != srcmdev->autostart) {
+ ret = true;
+ dstmdev->autostart = srcmdev->autostart;
+ }
+
+ return ret;
+}
+
+
+int
+nodeDeviceSetAutostart(virNodeDevice *device,
+ int autostart)
+{
+ int ret = -1;
+ virNodeDeviceObj *obj = NULL;
+ virNodeDeviceDef *def = NULL;
+
+ if (nodeDeviceInitWait() < 0)
+ return -1;
+
+ if (!(obj = nodeDeviceObjFindByName(device->name)))
+ return -1;
+ def = virNodeDeviceObjGetDef(obj);
+
+ if (virNodeDeviceSetAutostartEnsureACL(device->conn, def) < 0)
+ goto cleanup;
+
+ if (nodeDeviceHasCapability(def, VIR_NODE_DEV_CAP_MDEV)) {
+ if (!virNodeDeviceObjIsPersistent(obj)) {
+ virReportError(VIR_ERR_OPERATION_INVALID,
+ "%s", _("cannot set autostart for transient
device"));
+ goto cleanup;
+ }
+
+ if (autostart != virNodeDeviceObjIsAutostart(obj)) {
+ g_autofree char *errmsg = NULL;
+
+ if (virMdevctlSetAutostart(def, autostart, &errmsg) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unable to set autostart on '%s':
%s"),
+ def->name,
+ errmsg && errmsg[0] != '\0' ? errmsg :
_("Unknown Error"));
+ goto cleanup;
+ }
+ /* Due to mdevctl performance issues, it may take several seconds
+ * to re-query mdevctl for the defined devices. Because the mdevctl
+ * command returned without an error status, assume it was
+ * successful and set the object status directly here rather than
+ * waiting for the next query */
+ virNodeDeviceObjSetAutostart(obj, autostart);
+ }
+ ret = 0;
+ } else {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+ _("Unsupported device type"));
+ }
+
+ cleanup:
+ virNodeDeviceObjEndAPI(&obj);
+ return ret;
+}
+
+
+int
+nodeDeviceGetAutostart(virNodeDevice *device,
+ int *autostart)
+{
+ virNodeDeviceObj *obj = NULL;
+ virNodeDeviceDef *def = NULL;
+ int ret = -1;
+
+ if (nodeDeviceInitWait() < 0)
+ return -1;
+
+ if (!(obj = nodeDeviceObjFindByName(device->name)))
+ return -1;
+ def = virNodeDeviceObjGetDef(obj);
+
+ if (virNodeDeviceGetAutostartEnsureACL(device->conn, def) < 0)
+ goto cleanup;
+
+ *autostart = virNodeDeviceObjIsAutostart(obj);
+ ret = 0;
+
+ cleanup:
+ virNodeDeviceObjEndAPI(&obj);
return ret;
}
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index fdc92b8aef..17c7473d85 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -177,3 +177,16 @@ int nodeDeviceDefPostParse(virNodeDeviceDef *def,
int nodeDeviceDefValidate(virNodeDeviceDef *def,
void *opaque);
+
+int
+nodeDeviceSetAutostart(virNodeDevice *dev,
+ int autostart);
+
+int
+nodeDeviceGetAutostart(virNodeDevice *dev,
+ int *autostart);
+
+virCommand*
+nodeDeviceGetMdevctlSetAutostartCommand(virNodeDeviceDef *def,
+ bool autostart,
+ char **errmsg);
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 90a64f16b0..73334c1cc7 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1504,6 +1504,8 @@ udevAddOneDevice(struct udev_device *device)
bool new_device = true;
int ret = -1;
bool was_persistent = false;
+ bool autostart = false;
+ bool is_mdev;
def = g_new0(virNodeDeviceDef, 1);
@@ -1525,12 +1527,16 @@ udevAddOneDevice(struct udev_device *device)
if (udevSetParent(device, def) != 0)
goto cleanup;
+ is_mdev = def->caps->data.type == VIR_NODE_DEV_CAP_MDEV;
+
if ((obj = virNodeDeviceObjListFindByName(driver->devs, def->name))) {
objdef = virNodeDeviceObjGetDef(obj);
- if (def->caps->data.type == VIR_NODE_DEV_CAP_MDEV)
+ if (is_mdev)
nodeDeviceDefCopyFromMdevctl(def, objdef);
was_persistent = virNodeDeviceObjIsPersistent(obj);
+ autostart = virNodeDeviceObjIsAutostart(obj);
+
/* If the device was defined by mdevctl and was never instantiated, it
* won't have a sysfs path. We need to emit a CREATED event... */
new_device = (objdef->sysfs_path == NULL);
@@ -1543,6 +1549,7 @@ udevAddOneDevice(struct udev_device *device)
if (!(obj = virNodeDeviceObjListAssignDef(driver->devs, def)))
goto cleanup;
virNodeDeviceObjSetPersistent(obj, was_persistent);
+ virNodeDeviceObjSetAutostart(obj, autostart);
objdef = virNodeDeviceObjGetDef(obj);
if (new_device)
@@ -1946,6 +1953,7 @@ udevSetupSystemDev(void)
goto cleanup;
virNodeDeviceObjSetActive(obj, true);
+ virNodeDeviceObjSetAutostart(obj, true);
virNodeDeviceObjEndAPI(&obj);
@@ -2350,6 +2358,8 @@ static virNodeDeviceDriver udevNodeDeviceDriver = {
.nodeDeviceDefineXML = nodeDeviceDefineXML, /* 7.3.0 */
.nodeDeviceUndefine = nodeDeviceUndefine, /* 7.3.0 */
.nodeDeviceCreate = nodeDeviceCreate, /* 7.3.0 */
+ .nodeDeviceSetAutostart = nodeDeviceSetAutostart, /* 7.7.0 */
+ .nodeDeviceGetAutostart = nodeDeviceGetAutostart, /* 7.7.0 */
};
--
2.31.1