kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zdev: Introduce read-only attributes

Browse Source 
Add support for defining read-only attributes in the chzdev/lszdev
tools. These attributes can be used to provide online documentation
for specific attributes via the --help-attribute and --list-attributes
tool functions.

Signed-off-by: Peter Oberparleiter <oberpar@linux.ibm.com>
Reviewed-by: Jens Remus <jremus@linux.ibm.com>
Reviewed-by: Fedor Loshakov <loshakov@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Peter Oberparleiter
2019-02-05 15:51:26 +01:00
committed by Jan Höppner
parent d2f8f972cf
commit c063273b14
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zdev/include/attrib.h
View File

@@ -1,7 +1,7 @@
/*
* zdev - Modify and display the persistent configuration of devices
*
* Copyright IBM Corp. 2016, 2017
* Copyright IBM Corp. 2016, 2019
*
* s390-tools is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@ -181,6 +181,7 @@ struct value_map {
* @activeonly: This attribute should only be changed in the active config
* @unstable: The value read is not the last value written
* @writeonly: This attribute cannot be read from
* @readonly: This attribute cannot be written to
* @rewrite: Writing the same value multiple times has side-effects
* @mandatory: This attribute cannot be removed from a configured device
* @newline: There must be a newline when writing to this attribute
@@ -211,6 +212,7 @@ struct attrib {
unsigned int activeonly :1;
unsigned int unstable :1;
unsigned int writeonly :1;
unsigned int readonly :1;
unsigned int rewrite :1;
unsigned int mandatory :1;
unsigned int newline :1;

9
zdev/src/device.c
View File

@@ -215,6 +215,9 @@ static exit_code_t apply_setting(struct device *dev, config_t config,
/* Check for known attribute. */
a = subtype_find_dev_attrib(st, key);
if (a) {
/* Check for read-only attribute. */
if (a->readonly)
goto err_readonly;
/* Check for acceptable value of known attribute. */
if (!force && !attrib_check_value(a, value))
goto err_invalid_forceable;
@@ -307,6 +310,10 @@ err_int_noactive:
delayed_err("Internal attribute '%s' cannot be set in the active config\n",
key);
return EXIT_INVALID_SETTING;
err_readonly:
delayed_err("Cannot modify read-only attribute: %s\n", key);
return EXIT_INVALID_SETTING;
}
/* Apply device settings from strlist to device. */
@@ -521,7 +528,7 @@ void device_read_active_settings(struct device *dev, read_scope_t scope)
a = attrib_find(st->dev_attribs, name);
s = setting_list_apply_actual(dev->active.settings, a, name,
value);
if (link || (scope == scope_all &&
if ((a && a->readonly) || link || (scope == scope_all &&
util_path_is_readonly_file("%s", path)))
s->readonly = 1;
if (link)

4
zdev/src/export.c
View File

@@ -1,7 +1,7 @@
/*
* zdev - Modify and display the persistent configuration of devices
*
* Copyright IBM Corp. 2016, 2017
* Copyright IBM Corp. 2016, 2019
*
* s390-tools is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@ -71,6 +71,8 @@ static bool is_exportable(struct setting *s, config_t config)
if (!a)
return true;
if (a->readonly)
return false;
if (a->mandatory)
return true;
if (SCOPE_ACTIVE(config)) {

14
zdev/src/table_attribs.c
View File

@@ -1,7 +1,7 @@
/*
* zdev - Modify and display the persistent configuration of devices
*
* Copyright IBM Corp. 2016, 2017
* Copyright IBM Corp. 2016, 2019
*
* s390-tools is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@ -186,13 +186,15 @@ static void table_attribs_show_details_one(struct table_attrib *t,
indent(j, "The default value is '%s'.\n", a->defval);
}
printf("\n");
indent(i, "ACCEPTED VALUES\n");
attrib_print_acceptable(a, j);
if (!a->readonly) {
printf("\n");
indent(i, "ACCEPTED VALUES\n");
attrib_print_acceptable(a, j);
}
if (!(a->multi || a->activeonly || a->unstable || a->writeonly ||
a->rewrite || a->mandatory || a->newline || a->activerem ||
a->nounload || a->check))
a->nounload || a->check || a->readonly))
return;
printf("\n");
@@ -211,6 +213,8 @@ static void table_attribs_show_details_one(struct table_attrib *t,
}
if (a->writeonly)
indent(j, "- You cannot read this attribute\n");
if (a->readonly)
indent(j, "- You cannot write to this attribute\n");
if (a->rewrite) {
indent(j, "- Setting the same value multiple times may have "
"additional effects\n");