From 73c82441e7819df347743d8805c54b664c7b8faa Mon Sep 17 00:00:00 2001 From: Vineeth Vijayan Date: Thu, 24 Aug 2023 15:02:09 +0200 Subject: [PATCH] zdev: move all site-related definitions to one file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously SITE_FALLBACK and other site-specific configuration support macros were defined in device.h. Instead, move them to a relatively smaller header file which is exclusive for site-related definitions. This way, light-weight zdev_id also can use the same header file. Reported-by: Steffen Maier Signed-off-by: Vineeth Vijayan Reviewed-by: Peter Oberparleiter Signed-off-by: Jan Höppner --- zdev/include/device.h | 15 +-------------- zdev/include/site.h | 28 ++++++++++++++++++++++++++++ zdev/src/zdev_id.c | 2 +- 3 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 zdev/include/site.h diff --git a/zdev/include/device.h b/zdev/include/device.h index 3817e36c..ac6b032b 100644 --- a/zdev/include/device.h +++ b/zdev/include/device.h @@ -15,24 +15,11 @@ #include "exit_code.h" #include "hash.h" #include "misc.h" +#include "site.h" struct subtype; struct setting_list; -/** - * Currently zdev supports 10 sites. Which means, zdev support 10 different - * set of attributes which are specific to each site. When the user does - * not provide any site information, the common set will be used which is - * not specific to any site. So, total we have 11 persistent attribute sets - * Where, - * 0- 9: Site specific attributes - * 10: Common attributes which do not belong to any sites - */ - -#define NUM_SITES 11 -#define NUM_USER_SITES (NUM_SITES - 1) -#define SITE_FALLBACK NUM_USER_SITES - /** * struct device_state - Represent the state of a device in a configuration * @settings: List of attribute settings diff --git a/zdev/include/site.h b/zdev/include/site.h new file mode 100644 index 00000000..b4f88be2 --- /dev/null +++ b/zdev/include/site.h @@ -0,0 +1,28 @@ +/* + * zdev - Information regarding site-specific configurations used for + * zdev tools. + * + * Copyright IBM Corp. 2023 + * + * s390-tools is free software; you can redistribute it and/or modify + * it under the terms of the MIT license. See LICENSE for details. + */ + +#ifndef SITE_H +#define SITE_H + +/** + * Currently zdev supports 10 sites. Which means, zdev support 10 different + * set of attributes which are specific to each site. When the user does + * not provide any site information, the common set will be used which is + * not specific to any site. So, total we have 11 persistent attribute sets + * Where, + * 0- 9: Site specific attributes + * 10: Common attributes which do not belong to any sites + */ + +#define NUM_SITES 11 +#define NUM_USER_SITES (NUM_SITES - 1) +#define SITE_FALLBACK NUM_USER_SITES + +#endif /* SITE_H */ diff --git a/zdev/src/zdev_id.c b/zdev/src/zdev_id.c index 2464b166..3795a4bb 100644 --- a/zdev/src/zdev_id.c +++ b/zdev/src/zdev_id.c @@ -13,6 +13,7 @@ #include #include +#include "site.h" #include "zdev_id.h" #define SYSINFO "/proc/sysinfo" @@ -20,7 +21,6 @@ #define LOADPARM "/sys/firmware/ipl/loadparm" #define IPL_DEV_ID "/sys/firmware/ipl/device" #define IPL_DEV_TYPE "/sys/firmware/ipl/ipl_type" -#define SITE_FALLBACK 10 #define WHITESPACE " \t\n"