Commit e6667f71 authored by Gabriel L. Somlo's avatar Gabriel L. Somlo Committed by Gerd Hoffmann
Browse files

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: default avatarGabriel Somlo <somlo@cmu.edu>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 7bf8ef19

hw/i386/pc.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static FWCfgState *bochs_bios_init(void) 
                     acpi_tables, acpi_tables_len);

    fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override());



    smbios_table = smbios_get_table(&smbios_len);

    smbios_table = smbios_get_table_legacy(&smbios_len);

    if (smbios_table)

        fw_cfg_add_bytes(fw_cfg, FW_CFG_SMBIOS_ENTRIES,

                         smbios_table, smbios_len);

hw/i386/pc_piix.c

+7 −7
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; 


static bool has_pci_info;

static bool has_acpi_build = true;

static bool smbios_type1_defaults = true;

static bool smbios_defaults = true;

/* Make sure that guest addresses aligned at 1Gbyte boundaries get mapped to

 * host addresses aligned at 1Gbyte boundaries.  This way we can use 1GByte

 * pages in the host.
@@ -143,9 +143,9 @@ static void pc_init1(QEMUMachineInitArgs *args, 
    guest_info->has_pci_info = has_pci_info;

    guest_info->isapc_ram_fw = !pci_enabled;



    if (smbios_type1_defaults) {

    if (smbios_defaults) {

        /* These values are guest ABI, do not change */

        smbios_set_type1_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",

        smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",

                            args->machine->name);

    }
@@ -269,7 +269,7 @@ static void pc_compat_2_0(QEMUMachineInitArgs *args) 
static void pc_compat_1_7(QEMUMachineInitArgs *args)

{

    pc_compat_2_0(args);

    smbios_type1_defaults = false;

    smbios_defaults = false;

    gigabyte_align = false;

    option_rom_has_mr = true;

    x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);
@@ -356,7 +356,7 @@ static void pc_init_pci_no_kvmclock(QEMUMachineInitArgs *args) 
{

    has_pci_info = false;

    has_acpi_build = false;

    smbios_type1_defaults = false;

    smbios_defaults = false;

    x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI);

    enable_compat_apic_id_mode();

    pc_init1(args, 1, 0);
@@ -366,7 +366,7 @@ static void pc_init_isa(QEMUMachineInitArgs *args) 
{

    has_pci_info = false;

    has_acpi_build = false;

    smbios_type1_defaults = false;

    smbios_defaults = false;

    if (!args->cpu_model) {

        args->cpu_model = "486";

    }

hw/i386/pc_q35.c

+5 −5
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 


static bool has_pci_info;

static bool has_acpi_build = true;

static bool smbios_type1_defaults = true;

static bool smbios_defaults = true;

/* Make sure that guest addresses aligned at 1Gbyte boundaries get mapped to

 * host addresses aligned at 1Gbyte boundaries.  This way we can use 1GByte

 * pages in the host.
@@ -130,9 +130,9 @@ static void pc_q35_init(QEMUMachineInitArgs *args) 
    guest_info->isapc_ram_fw = false;

    guest_info->has_acpi_build = has_acpi_build;



    if (smbios_type1_defaults) {

    if (smbios_defaults) {

        /* These values are guest ABI, do not change */

        smbios_set_type1_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",

        smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",

                            args->machine->name);

    }
@@ -247,7 +247,7 @@ static void pc_compat_2_0(QEMUMachineInitArgs *args) 
static void pc_compat_1_7(QEMUMachineInitArgs *args)

{

    pc_compat_2_0(args);

    smbios_type1_defaults = false;

    smbios_defaults = false;

    gigabyte_align = false;

    option_rom_has_mr = true;

    x86_cpu_compat_disable_kvm_features(FEAT_1_ECX, CPUID_EXT_X2APIC);

hw/i386/smbios.c

+12 −6
Original line number Diff line number Diff line
@@ -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)

{

include/hw/i386/smbios.h

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
#include "qemu/option.h"



void smbios_entry_add(QemuOpts *opts);

void smbios_set_type1_defaults(const char *manufacturer,

                               const char *product, const char *version);

uint8_t *smbios_get_table(size_t *length);

void smbios_set_defaults(const char *manufacturer, const char *product,

                         const char *version);

uint8_t *smbios_get_table_legacy(size_t *length);



/*

 * SMBIOS spec defined tables