diff options
| author | Michael Brown | 2013-12-03 17:48:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2013-12-05 01:37:02 +0100 |
| commit | 22001cb206c1320aee27f679a63d2171d35e99c5 (patch) | |
| tree | a972bb914371a68d4925dcc007238dcb836546ba /src/arch | |
| parent | [fbcon] Add support for displaying a cursor (diff) | |
| download | ipxe-22001cb206c1320aee27f679a63d2171d35e99c5.tar.gz ipxe-22001cb206c1320aee27f679a63d2171d35e99c5.tar.xz ipxe-22001cb206c1320aee27f679a63d2171d35e99c5.zip | |
[settings] Explicitly separate the concept of a completed fetched setting
The fetch_setting() family of functions may currently modify the
definition of the specified setting (e.g. to add missing type
information). Clean up this interface by requiring callers to provide
an explicit buffer to contain the completed definition of the fetched
setting, if required.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/interface/vmware/guestinfo.c | 2 | ||||
| -rw-r--r-- | src/arch/x86/core/cpuid_settings.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/arch/i386/interface/vmware/guestinfo.c b/src/arch/i386/interface/vmware/guestinfo.c index aa10fc015..a0530c8d1 100644 --- a/src/arch/i386/interface/vmware/guestinfo.c +++ b/src/arch/i386/interface/vmware/guestinfo.c @@ -51,7 +51,7 @@ static int guestinfo_channel; */ static int guestinfo_fetch_type ( struct settings *settings, struct setting *setting, - struct setting_type *type, + const struct setting_type *type, void *data, size_t len, int *found ) { const char *parent_name = settings->parent->name; char command[ 24 /* "info-get guestinfo.ipxe." */ + diff --git a/src/arch/x86/core/cpuid_settings.c b/src/arch/x86/core/cpuid_settings.c index e2ec9bde6..2da859ee9 100644 --- a/src/arch/x86/core/cpuid_settings.c +++ b/src/arch/x86/core/cpuid_settings.c @@ -117,7 +117,7 @@ enum cpuid_registers { #define CPUID_NUM_REGISTERS( tag ) ( ( ( (tag) >> 16 ) & 0x3 ) + 1 ) /** CPUID settings scope */ -static struct settings_scope cpuid_settings_scope; +static const struct settings_scope cpuid_settings_scope; /** * Check applicability of CPUID setting @@ -127,7 +127,7 @@ static struct settings_scope cpuid_settings_scope; * @ret applies Setting applies within this settings block */ static int cpuid_settings_applies ( struct settings *settings __unused, - struct setting *setting ) { + const struct setting *setting ) { return ( setting->scope == &cpuid_settings_scope ); } @@ -252,7 +252,7 @@ struct init_fn cpuid_settings_init_fn __init_fn ( INIT_NORMAL ) = { }; /** CPUID predefined settings */ -struct setting cpuid_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = { +const struct setting cpuid_predefined_settings[] __setting ( SETTING_HOST_EXTRA ) = { { .name = "cpuvendor", .description = "CPU vendor", |