From 08a6ae86a2ddafe51fa64e8f40a4c89cd613ecfb Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 15 Oct 2012 03:08:41 +0100 Subject: [PATCH] [nvo] Expose non-volatile options block name Signed-off-by: Michael Brown --- src/core/nvo.c | 3 ++- src/include/ipxe/nvo.h | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/nvo.c b/src/core/nvo.c index ffa30b89..11074e67 100644 --- a/src/core/nvo.c +++ b/src/core/nvo.c @@ -296,7 +296,8 @@ int register_nvo ( struct nvo_block *nvo, struct settings *parent ) { goto err_load; /* Register settings */ - if ( ( rc = register_settings ( &nvo->settings, parent, "nvo" ) ) != 0 ) + if ( ( rc = register_settings ( &nvo->settings, parent, + NVO_SETTINGS_NAME ) ) != 0 ) goto err_register; DBGC ( nvo, "NVO %p registered\n", nvo ); diff --git a/src/include/ipxe/nvo.h b/src/include/ipxe/nvo.h index 995afd74..36f41505 100644 --- a/src/include/ipxe/nvo.h +++ b/src/include/ipxe/nvo.h @@ -42,6 +42,9 @@ struct nvo_block { struct dhcp_options dhcpopts; }; +/** Name of non-volatile options settings block */ +#define NVO_SETTINGS_NAME "nvo" + extern void nvo_init ( struct nvo_block *nvo, struct nvs_device *nvs, size_t address, size_t len, int ( * resize ) ( struct nvo_block *nvo, size_t len ),