SMBIOS: Rename symbols to better reflect future use

Rename the following symbols:

  - smbios_set_type1_defaults() to the more general smbios_set_defaults();
  - bool smbios_type1_defaults to the more general smbios_defaults;
  - smbios_get_table() to smbios_get_table_legacy();

This patch contains no functional changes.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gabriel L. Somlo 2014-04-23 09:42:38 -04:00 committed by Gerd Hoffmann
parent 7bf8ef196e
commit e6667f719c
5 changed files with 28 additions and 22 deletions

View file

@ -21,9 +21,8 @@
#include "hw/i386/smbios.h"
#include "hw/loader.h"
/*
* Structures shared with the BIOS
*/
/* legacy structures and constants for <= 2.0 machines */
struct smbios_header {
uint16_t length;
uint8_t type;
@ -46,6 +45,9 @@ struct smbios_table {
static uint8_t *smbios_entries;
static size_t smbios_entries_len;
/* end: legacy structures & constants for <= 2.0 machines */
static int smbios_type4_count = 0;
static bool smbios_immutable;
@ -187,6 +189,8 @@ static void smbios_check_collision(int type, int entry)
}
}
/* legacy setup functions for <= 2.0 machines */
static void smbios_add_field(int type, int offset, const void *data, size_t len)
{
struct smbios_field *field;
@ -256,8 +260,8 @@ static void smbios_build_type_1_fields(void)
}
}
void smbios_set_type1_defaults(const char *manufacturer,
const char *product, const char *version)
void smbios_set_defaults(const char *manufacturer, const char *product,
const char *version)
{
if (!type1.manufacturer) {
type1.manufacturer = manufacturer;
@ -270,7 +274,7 @@ void smbios_set_type1_defaults(const char *manufacturer,
}
}
uint8_t *smbios_get_table(size_t *length)
uint8_t *smbios_get_table_legacy(size_t *length)
{
if (!smbios_immutable) {
smbios_build_type_0_fields();
@ -281,6 +285,8 @@ uint8_t *smbios_get_table(size_t *length)
*length = smbios_entries_len;
return smbios_entries;
}
/* end: legacy setup functions for <= 2.0 machines */
static void save_opt(const char **dest, QemuOpts *opts, const char *name)
{