A comment describing the source of writing the contents of the ifcfg and
network manager keyfiles (hyperv kvp daemon) is useful. It is valuable both
for debugging as well as for preventing users from modifying them.
CC: [email protected]
CC: [email protected]
CC: [email protected]
Signed-off-by: Ani Sinha <[email protected]>
---
tools/hv/hv_kvp_daemon.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
changelog:
v2: simplify and fix issues with error handling.
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index ae57bf69ad4a..014e45be6981 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -94,6 +94,8 @@ static char *lic_version = "Unknown version";
static char full_domain_name[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
static struct utsname uts_buf;
+#define CFG_HEADER "# Generated by hyperv key-value pair daemon. Please do not modify.\n"
+
/*
* The location of the interface configuration file.
*/
@@ -1435,6 +1437,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
return HV_E_FAIL;
}
+ /* Write the config file headers */
+ error = fprintf(ifcfg_file, CFG_HEADER);
+ if (error < 0) {
+ error = HV_E_FAIL;
+ goto setval_error;
+ }
+ error = fprintf(nmfile, CFG_HEADER);
+ if (error < 0) {
+ error = HV_E_FAIL;
+ goto setval_error;
+ }
+
/*
* First write out the MAC address.
*/
--
2.42.0
On 4/18/2024 5:05 AM, Ani Sinha wrote:
> A comment describing the source of writing the contents of the ifcfg and
> network manager keyfiles (hyperv kvp daemon) is useful. It is valuable both
> for debugging as well as for preventing users from modifying them.
>
> CC: [email protected]
> CC: [email protected]
> CC: [email protected]
> Signed-off-by: Ani Sinha <[email protected]>
> ---
> tools/hv/hv_kvp_daemon.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> changelog:
> v2: simplify and fix issues with error handling.
>
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index ae57bf69ad4a..014e45be6981 100644
> --- a/tools/hv/hv_kvp_daemon.c
> +++ b/tools/hv/hv_kvp_daemon.c
> @@ -94,6 +94,8 @@ static char *lic_version = "Unknown version";
> static char full_domain_name[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
> static struct utsname uts_buf;
>
> +#define CFG_HEADER "# Generated by hyperv key-value pair daemon. Please do not modify.\n"
> +
> /*
> * The location of the interface configuration file.
> */
> @@ -1435,6 +1437,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> return HV_E_FAIL;
> }
>
> + /* Write the config file headers */
> + error = fprintf(ifcfg_file, CFG_HEADER);
> + if (error < 0) {
> + error = HV_E_FAIL;
> + goto setval_error;
> + }
> + error = fprintf(nmfile, CFG_HEADER);
> + if (error < 0) {
> + error = HV_E_FAIL;
> + goto setval_error;
> + }
> +
> /*
> * First write out the MAC address.
> */
Looks good to me, I'll defer to other folks on the recipient list on whether "hyperv" should be capitalized
as HyperV or other such feedback.
Reviewed-by: Easwar Hariharan <[email protected]>
Thanks,
Easwar
> From: Easwar Hariharan <[email protected]>
> Sent: Thursday, April 18, 2024 9:16 AM
>
> On 4/18/2024 5:05 AM, Ani Sinha wrote:
> > A comment describing the source of writing the contents of the ifcfg and
> > network manager keyfiles (hyperv kvp daemon) is useful. It is valuable
s/hyperv/Hyper-V/
> > +#define CFG_HEADER "# Generated by hyperv key-value pair daemon.
> Please do not modify.\n"
s/hyperv/Hyper-V/
> Looks good to me, I'll defer to other folks on the recipient list on whether
> "hyperv" should be capitalized as HyperV or other such feedback.
It's recommended to use "Hyper-V". Wei can help fix this so I guess
there is no need to resend the patch :-)
On Thu, Apr 18, 2024 at 07:01:20PM +0000, Dexuan Cui wrote:
> > From: Easwar Hariharan <[email protected]>
> > Sent: Thursday, April 18, 2024 9:16 AM
> >
> > On 4/18/2024 5:05 AM, Ani Sinha wrote:
> > > A comment describing the source of writing the contents of the ifcfg and
> > > network manager keyfiles (hyperv kvp daemon) is useful. It is valuable
>
> s/hyperv/Hyper-V/
>
> > > +#define CFG_HEADER "# Generated by hyperv key-value pair daemon.
> > Please do not modify.\n"
>
> s/hyperv/Hyper-V/
>
> > Looks good to me, I'll defer to other folks on the recipient list on whether
> > "hyperv" should be capitalized as HyperV or other such feedback.
>
> It's recommended to use "Hyper-V". Wei can help fix this so I guess
> there is no need to resend the patch :-)
Sounds good!
On Thu, Apr 18, 2024 at 05:35:49PM +0530, Ani Sinha wrote:
> A comment describing the source of writing the contents of the ifcfg and
> network manager keyfiles (hyperv kvp daemon) is useful. It is valuable both
> for debugging as well as for preventing users from modifying them.
>
> CC: [email protected]
> CC: [email protected]
> CC: [email protected]
> Signed-off-by: Ani Sinha <[email protected]>
> ---
> tools/hv/hv_kvp_daemon.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> changelog:
> v2: simplify and fix issues with error handling.
>
> diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
> index ae57bf69ad4a..014e45be6981 100644
> --- a/tools/hv/hv_kvp_daemon.c
> +++ b/tools/hv/hv_kvp_daemon.c
> @@ -94,6 +94,8 @@ static char *lic_version = "Unknown version";
> static char full_domain_name[HV_KVP_EXCHANGE_MAX_VALUE_SIZE];
> static struct utsname uts_buf;
>
> +#define CFG_HEADER "# Generated by hyperv key-value pair daemon. Please do not modify.\n"
> +
> /*
> * The location of the interface configuration file.
> */
> @@ -1435,6 +1437,18 @@ static int kvp_set_ip_info(char *if_name, struct hv_kvp_ipaddr_value *new_val)
> return HV_E_FAIL;
> }
>
> + /* Write the config file headers */
> + error = fprintf(ifcfg_file, CFG_HEADER);
> + if (error < 0) {
> + error = HV_E_FAIL;
> + goto setval_error;
> + }
> + error = fprintf(nmfile, CFG_HEADER);
> + if (error < 0) {
> + error = HV_E_FAIL;
> + goto setval_error;
> + }
> +
> /*
> * First write out the MAC address.
> */
> --
> 2.42.0
Reviewed-by: Shradha Gupta <[email protected]>
On Thu, Apr 18, 2024 at 05:35:49PM +0530, Ani Sinha wrote:
> A comment describing the source of writing the contents of the ifcfg and
> network manager keyfiles (hyperv kvp daemon) is useful. It is valuable both
> for debugging as well as for preventing users from modifying them.
>
> CC: [email protected]
> CC: [email protected]
> CC: [email protected]
> Signed-off-by: Ani Sinha <[email protected]>
Applied to hyperv-fixes.
I changed hyperv to Hyper-V and changed the subject to
hv/hv_kvp_daemon: indicate the configuration files are generated
Thanks,
Wei.