mirror of https://github.com/proxmox/mirror_qemu
fw_cfg patches for 2019-05-23
- Add trace events - Get rid of globals in fw_cfg-test - Explicit 'reboot-timeout' is little endian - Add tests for 'reboot-timeout' and 'splash-time' -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJc5pTAAAoJEOPjLCzercDedJoQANff68Low2mqNWYJ1HTH+l3G kJjWqxyMDkCUwKJ22rDc/kcNyOve2ISOeMDvNPoZk3sjAhsPTeOZfwyJUz0T9yqm 3epEN3IGtg7nop98On33GG7D+ThTuEn9XcVebDz41L1KtL7M7i2jMQCl7LKO58JF dhcqn+bbA/QLlwYX897cnqf0beofpFfqL6uGqJKA1pxTEiExmKCPcJYHu9qzH7m7 idbhbCQBoF/CRws4NphWWLH+GiLzjj/rQJfQmLa7U/fsY0JPbs+Q1DmbAWVdtZc4 YrBbCn4tnagOyhhhHY5zPkmYAVVAzf/3ujBkQLo8eyB9/iPfinzM2vBu+sZmTZ0Q 3I7F9m8Gu5BN9LIozLSw48qSRyUKPb1CFhkQcrIntCUOdTuLQDqW4M9+vm3u8ZFv To7FPelyYFp1eb0LAbzT909zzpkg1azWuJ3JynBIq21K8/U7KokZVLo6kOJ+d27b 85+GQCHpfAsUbEDNmO5fY80a3yOatJS1NEVpRTHeZdVlZJW59RyLTwt5++bG3kyz K9A2kIlEKPgXy7iJlKC9lGHcWlVTYSuG49gLrxoo80q2VNWlRiQOaT6I2tIWICW/ URctyLaWcvBL6+UZKZ1XzNBW5e7brvTQ+fM30DVXqYKCPPwa9kj4R8D/jwEi9A6M t47LkbPTMdTOgtDbhIER =fFZr -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-20190523-pull-request' into staging fw_cfg patches for 2019-05-23 - Add trace events - Get rid of globals in fw_cfg-test - Explicit 'reboot-timeout' is little endian - Add tests for 'reboot-timeout' and 'splash-time' # gpg: Signature made Thu 23 May 2019 13:40:32 BST # gpg: using RSA key E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full] # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * remotes/philmd-gitlab/tags/fw_cfg-20190523-pull-request: tests: fw_cfg: add 'splash-time' test case tests: fw_cfg: add 'reboot-timeout' test case hw/nvram/fw_cfg: Store 'reboot-timeout' as little endian tests: fw_cfg: add a function to get the fw_cfg file tests: refactor fw_cfg_test tests/fw_cfg: Free QFWCFG object after qtest has run tests/libqos: Add pc_fw_cfg_uninit() and use it tests/libqos: Add io_fw_cfg_uninit() and mm_fw_cfg_uninit() hw/sparc64: Implement fw_cfg_arch_key_name() hw/sparc: Implement fw_cfg_arch_key_name() hw/ppc: Implement fw_cfg_arch_key_name() hw/i386: Implement fw_cfg_arch_key_name() hw/i386: Extract fw_cfg definitions to local "fw_cfg.h" hw/nvram/fw_cfg: Add fw_cfg_arch_key_name() hw/nvram/fw_cfg: Add trace events Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
Peter Maydell
commit
8dc7fd56dd
|
|
@ -1696,6 +1696,7 @@ R: Gerd Hoffmann <kraxel@redhat.com>
|
|||
S: Supported
|
||||
F: docs/specs/fw_cfg.txt
|
||||
F: hw/nvram/fw_cfg.c
|
||||
F: stubs/fw_cfg.c
|
||||
F: include/hw/nvram/fw_cfg.h
|
||||
F: include/standard-headers/linux/qemu_fw_cfg.h
|
||||
F: tests/libqos/fw_cfg.c
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ obj-y += multiboot.o
|
|||
obj-y += pc.o
|
||||
obj-$(CONFIG_I440FX) += pc_piix.o
|
||||
obj-$(CONFIG_Q35) += pc_q35.o
|
||||
obj-y += pc_sysfw.o
|
||||
obj-y += fw_cfg.o pc_sysfw.o
|
||||
obj-y += x86-iommu.o
|
||||
obj-$(CONFIG_VTD) += intel_iommu.o
|
||||
obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
* QEMU fw_cfg helpers (X86 specific)
|
||||
*
|
||||
* Copyright (c) 2019 Red Hat, Inc.
|
||||
*
|
||||
* Author:
|
||||
* Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/i386/fw_cfg.h"
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
|
||||
const char *fw_cfg_arch_key_name(uint16_t key)
|
||||
{
|
||||
static const struct {
|
||||
uint16_t key;
|
||||
const char *name;
|
||||
} fw_cfg_arch_wellknown_keys[] = {
|
||||
{FW_CFG_ACPI_TABLES, "acpi_tables"},
|
||||
{FW_CFG_SMBIOS_ENTRIES, "smbios_entries"},
|
||||
{FW_CFG_IRQ0_OVERRIDE, "irq0_override"},
|
||||
{FW_CFG_E820_TABLE, "e820_table"},
|
||||
{FW_CFG_HPET, "hpet"},
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) {
|
||||
if (fw_cfg_arch_wellknown_keys[i].key == key) {
|
||||
return fw_cfg_arch_wellknown_keys[i].name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
/*
|
||||
* QEMU fw_cfg helpers (X86 specific)
|
||||
*
|
||||
* Copyright (c) 2003-2004 Fabrice Bellard
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*/
|
||||
|
||||
#ifndef HW_I386_FW_CFG_H
|
||||
#define HW_I386_FW_CFG_H
|
||||
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
|
||||
#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)
|
||||
#define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)
|
||||
#define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2)
|
||||
#define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3)
|
||||
#define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4)
|
||||
|
||||
#endif
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
#include "hw/char/parallel.h"
|
||||
#include "hw/i386/apic.h"
|
||||
#include "hw/i386/topology.h"
|
||||
#include "hw/i386/fw_cfg.h"
|
||||
#include "sysemu/cpus.h"
|
||||
#include "hw/block/fdc.h"
|
||||
#include "hw/ide.h"
|
||||
|
|
@ -88,12 +89,6 @@
|
|||
#define DPRINTF(fmt, ...)
|
||||
#endif
|
||||
|
||||
#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)
|
||||
#define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)
|
||||
#define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2)
|
||||
#define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3)
|
||||
#define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4)
|
||||
|
||||
#define E820_NR_ENTRIES 16
|
||||
|
||||
struct e820_entry {
|
||||
|
|
|
|||
|
|
@ -60,6 +60,62 @@ struct FWCfgEntry {
|
|||
FWCfgWriteCallback write_cb;
|
||||
};
|
||||
|
||||
/**
|
||||
* key_name:
|
||||
*
|
||||
* @key: The uint16 selector key.
|
||||
*
|
||||
* Returns: The stringified name if the selector refers to a well-known
|
||||
* numerically defined item, or NULL on key lookup failure.
|
||||
*/
|
||||
static const char *key_name(uint16_t key)
|
||||
{
|
||||
static const char *fw_cfg_wellknown_keys[FW_CFG_FILE_FIRST] = {
|
||||
[FW_CFG_SIGNATURE] = "signature",
|
||||
[FW_CFG_ID] = "id",
|
||||
[FW_CFG_UUID] = "uuid",
|
||||
[FW_CFG_RAM_SIZE] = "ram_size",
|
||||
[FW_CFG_NOGRAPHIC] = "nographic",
|
||||
[FW_CFG_NB_CPUS] = "nb_cpus",
|
||||
[FW_CFG_MACHINE_ID] = "machine_id",
|
||||
[FW_CFG_KERNEL_ADDR] = "kernel_addr",
|
||||
[FW_CFG_KERNEL_SIZE] = "kernel_size",
|
||||
[FW_CFG_KERNEL_CMDLINE] = "kernel_cmdline",
|
||||
[FW_CFG_INITRD_ADDR] = "initrd_addr",
|
||||
[FW_CFG_INITRD_SIZE] = "initdr_size",
|
||||
[FW_CFG_BOOT_DEVICE] = "boot_device",
|
||||
[FW_CFG_NUMA] = "numa",
|
||||
[FW_CFG_BOOT_MENU] = "boot_menu",
|
||||
[FW_CFG_MAX_CPUS] = "max_cpus",
|
||||
[FW_CFG_KERNEL_ENTRY] = "kernel_entry",
|
||||
[FW_CFG_KERNEL_DATA] = "kernel_data",
|
||||
[FW_CFG_INITRD_DATA] = "initrd_data",
|
||||
[FW_CFG_CMDLINE_ADDR] = "cmdline_addr",
|
||||
[FW_CFG_CMDLINE_SIZE] = "cmdline_size",
|
||||
[FW_CFG_CMDLINE_DATA] = "cmdline_data",
|
||||
[FW_CFG_SETUP_ADDR] = "setup_addr",
|
||||
[FW_CFG_SETUP_SIZE] = "setup_size",
|
||||
[FW_CFG_SETUP_DATA] = "setup_data",
|
||||
[FW_CFG_FILE_DIR] = "file_dir",
|
||||
};
|
||||
|
||||
if (key & FW_CFG_ARCH_LOCAL) {
|
||||
return fw_cfg_arch_key_name(key);
|
||||
}
|
||||
if (key < FW_CFG_FILE_FIRST) {
|
||||
return fw_cfg_wellknown_keys[key];
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline const char *trace_key_name(uint16_t key)
|
||||
{
|
||||
const char *name = key_name(key);
|
||||
|
||||
return name ? name : "unknown";
|
||||
}
|
||||
|
||||
#define JPG_FILE 0
|
||||
#define BMP_FILE 1
|
||||
|
||||
|
|
@ -178,6 +234,7 @@ static void fw_cfg_reboot(FWCfgState *s)
|
|||
{
|
||||
const char *reboot_timeout = NULL;
|
||||
int64_t rt_val = -1;
|
||||
uint32_t rt_le32;
|
||||
|
||||
/* get user configuration */
|
||||
QemuOptsList *plist = qemu_find_opts("boot-opts");
|
||||
|
|
@ -194,7 +251,8 @@ static void fw_cfg_reboot(FWCfgState *s)
|
|||
}
|
||||
}
|
||||
|
||||
fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_val, 4), 4);
|
||||
rt_le32 = cpu_to_le32(rt_val);
|
||||
fw_cfg_add_file(s, "etc/boot-fail-wait", g_memdup(&rt_le32, 4), 4);
|
||||
}
|
||||
|
||||
static void fw_cfg_write(FWCfgState *s, uint8_t value)
|
||||
|
|
@ -233,7 +291,7 @@ static int fw_cfg_select(FWCfgState *s, uint16_t key)
|
|||
}
|
||||
}
|
||||
|
||||
trace_fw_cfg_select(s, key, ret);
|
||||
trace_fw_cfg_select(s, key, trace_key_name(key), ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -616,6 +674,7 @@ static void *fw_cfg_modify_bytes_read(FWCfgState *s, uint16_t key,
|
|||
|
||||
void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len)
|
||||
{
|
||||
trace_fw_cfg_add_bytes(key, trace_key_name(key), len);
|
||||
fw_cfg_add_bytes_callback(s, key, NULL, NULL, NULL, data, len, true);
|
||||
}
|
||||
|
||||
|
|
@ -623,6 +682,7 @@ void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value)
|
|||
{
|
||||
size_t sz = strlen(value) + 1;
|
||||
|
||||
trace_fw_cfg_add_string(key, trace_key_name(key), value);
|
||||
fw_cfg_add_bytes(s, key, g_memdup(value, sz), sz);
|
||||
}
|
||||
|
||||
|
|
@ -632,6 +692,7 @@ void fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value)
|
|||
|
||||
copy = g_malloc(sizeof(value));
|
||||
*copy = cpu_to_le16(value);
|
||||
trace_fw_cfg_add_i16(key, trace_key_name(key), value);
|
||||
fw_cfg_add_bytes(s, key, copy, sizeof(value));
|
||||
}
|
||||
|
||||
|
|
@ -651,6 +712,7 @@ void fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value)
|
|||
|
||||
copy = g_malloc(sizeof(value));
|
||||
*copy = cpu_to_le32(value);
|
||||
trace_fw_cfg_add_i32(key, trace_key_name(key), value);
|
||||
fw_cfg_add_bytes(s, key, copy, sizeof(value));
|
||||
}
|
||||
|
||||
|
|
@ -660,6 +722,7 @@ void fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value)
|
|||
|
||||
copy = g_malloc(sizeof(value));
|
||||
*copy = cpu_to_le64(value);
|
||||
trace_fw_cfg_add_i64(key, trace_key_name(key), value);
|
||||
fw_cfg_add_bytes(s, key, copy, sizeof(value));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@ nvram_read(uint32_t addr, uint32_t ret) "read addr %d: 0x%02x"
|
|||
nvram_write(uint32_t addr, uint32_t old, uint32_t val) "write addr %d: 0x%02x -> 0x%02x"
|
||||
|
||||
# fw_cfg.c
|
||||
fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d"
|
||||
fw_cfg_select(void *s, uint16_t key_value, const char *key_name, int ret) "%p key 0x%04" PRIx16 " '%s', ret: %d"
|
||||
fw_cfg_read(void *s, uint64_t ret) "%p = 0x%"PRIx64
|
||||
fw_cfg_add_bytes(uint16_t key_value, const char *key_name, size_t len) "key 0x%04" PRIx16 " '%s', %zu bytes"
|
||||
fw_cfg_add_file(void *s, int index, char *name, size_t len) "%p #%d: %s (%zd bytes)"
|
||||
fw_cfg_add_string(uint16_t key_value, const char *key_name, const char *value) "key 0x%04" PRIx16 " '%s', value '%s'"
|
||||
fw_cfg_add_i16(uint16_t key_value, const char *key_name, uint16_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx16
|
||||
fw_cfg_add_i32(uint16_t key_value, const char *key_name, uint32_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx32
|
||||
fw_cfg_add_i64(uint16_t key_value, const char *key_name, uint64_t value) "key 0x%04" PRIx16 " '%s', value 0x%" PRIx64
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# shared objects
|
||||
obj-y += ppc.o ppc_booke.o fdt.o
|
||||
obj-y += ppc.o ppc_booke.o fdt.o fw_cfg.o
|
||||
# IBM pSeries (sPAPR)
|
||||
obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o
|
||||
obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
/*
|
||||
* fw_cfg helpers (PPC specific)
|
||||
*
|
||||
* Copyright (c) 2019 Red Hat, Inc.
|
||||
*
|
||||
* Author:
|
||||
* Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/ppc/ppc.h"
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
|
||||
const char *fw_cfg_arch_key_name(uint16_t key)
|
||||
{
|
||||
static const struct {
|
||||
uint16_t key;
|
||||
const char *name;
|
||||
} fw_cfg_arch_wellknown_keys[] = {
|
||||
{FW_CFG_PPC_WIDTH, "width"},
|
||||
{FW_CFG_PPC_HEIGHT, "height"},
|
||||
{FW_CFG_PPC_DEPTH, "depth"},
|
||||
{FW_CFG_PPC_TBFREQ, "tbfreq"},
|
||||
{FW_CFG_PPC_CLOCKFREQ, "clockfreq"},
|
||||
{FW_CFG_PPC_IS_KVM, "is_kvm"},
|
||||
{FW_CFG_PPC_KVM_HC, "kvm_hc"},
|
||||
{FW_CFG_PPC_KVM_PID, "pid"},
|
||||
{FW_CFG_PPC_NVRAM_ADDR, "nvram_addr"},
|
||||
{FW_CFG_PPC_BUSFREQ, "busfreq"},
|
||||
{FW_CFG_PPC_NVRAM_FLAT, "nvram_flat"},
|
||||
{FW_CFG_PPC_VIACONFIG, "viaconfig"},
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) {
|
||||
if (fw_cfg_arch_wellknown_keys[i].key == key) {
|
||||
return fw_cfg_arch_wellknown_keys[i].name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -97,6 +97,25 @@ struct sun4m_hwdef {
|
|||
uint8_t nvram_machine_id;
|
||||
};
|
||||
|
||||
const char *fw_cfg_arch_key_name(uint16_t key)
|
||||
{
|
||||
static const struct {
|
||||
uint16_t key;
|
||||
const char *name;
|
||||
} fw_cfg_arch_wellknown_keys[] = {
|
||||
{FW_CFG_SUN4M_DEPTH, "depth"},
|
||||
{FW_CFG_SUN4M_WIDTH, "width"},
|
||||
{FW_CFG_SUN4M_HEIGHT, "height"},
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) {
|
||||
if (fw_cfg_arch_wellknown_keys[i].key == key) {
|
||||
return fw_cfg_arch_wellknown_keys[i].name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
|
||||
Error **errp)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -91,6 +91,25 @@ typedef struct EbusState {
|
|||
#define TYPE_EBUS "ebus"
|
||||
#define EBUS(obj) OBJECT_CHECK(EbusState, (obj), TYPE_EBUS)
|
||||
|
||||
const char *fw_cfg_arch_key_name(uint16_t key)
|
||||
{
|
||||
static const struct {
|
||||
uint16_t key;
|
||||
const char *name;
|
||||
} fw_cfg_arch_wellknown_keys[] = {
|
||||
{FW_CFG_SPARC64_WIDTH, "width"},
|
||||
{FW_CFG_SPARC64_HEIGHT, "height"},
|
||||
{FW_CFG_SPARC64_DEPTH, "depth"},
|
||||
};
|
||||
|
||||
for (size_t i = 0; i < ARRAY_SIZE(fw_cfg_arch_wellknown_keys); i++) {
|
||||
if (fw_cfg_arch_wellknown_keys[i].key == key) {
|
||||
return fw_cfg_arch_wellknown_keys[i].name;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void fw_cfg_boot_set(void *opaque, const char *boot_device,
|
||||
Error **errp)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -226,4 +226,18 @@ FWCfgState *fw_cfg_init_mem_wide(hwaddr ctl_addr,
|
|||
FWCfgState *fw_cfg_find(void);
|
||||
bool fw_cfg_dma_enabled(void *opaque);
|
||||
|
||||
/**
|
||||
* fw_cfg_arch_key_name:
|
||||
*
|
||||
* @key: The uint16 selector key.
|
||||
*
|
||||
* The key is architecture-specific (the FW_CFG_ARCH_LOCAL mask is expected
|
||||
* to be set in the key).
|
||||
*
|
||||
* Returns: The stringified architecture-specific name if the selector
|
||||
* refers to a well-known numerically defined item, or NULL on
|
||||
* key lookup failure.
|
||||
*/
|
||||
const char *fw_cfg_arch_key_name(uint16_t key);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -39,3 +39,4 @@ stub-obj-y += xen-hvm.o
|
|||
stub-obj-y += pci-host-piix.o
|
||||
stub-obj-y += ram-block.o
|
||||
stub-obj-y += ramfb.o
|
||||
stub-obj-y += fw_cfg.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* fw_cfg stubs
|
||||
*
|
||||
* Copyright (c) 2019 Red Hat, Inc.
|
||||
*
|
||||
* Author:
|
||||
* Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||
* See the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
|
||||
const char *fw_cfg_arch_key_name(uint16_t key)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -15,68 +15,134 @@
|
|||
#include "libqtest.h"
|
||||
#include "standard-headers/linux/qemu_fw_cfg.h"
|
||||
#include "libqos/fw_cfg.h"
|
||||
#include "qemu/bswap.h"
|
||||
|
||||
static uint64_t ram_size = 128 << 20;
|
||||
static uint16_t nb_cpus = 1;
|
||||
static uint16_t max_cpus = 1;
|
||||
static uint64_t nb_nodes = 0;
|
||||
static uint16_t boot_menu = 0;
|
||||
static QFWCFG *fw_cfg = NULL;
|
||||
|
||||
static void test_fw_cfg_signature(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
char buf[5];
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
qfw_cfg_get(fw_cfg, FW_CFG_SIGNATURE, buf, 4);
|
||||
buf[4] = 0;
|
||||
|
||||
g_assert_cmpstr(buf, ==, "QEMU");
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_id(void)
|
||||
{
|
||||
uint32_t id = qfw_cfg_get_u32(fw_cfg, FW_CFG_ID);
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
uint32_t id;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
id = qfw_cfg_get_u32(fw_cfg, FW_CFG_ID);
|
||||
g_assert((id == 1) ||
|
||||
(id == 3));
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_uuid(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
|
||||
uint8_t buf[16];
|
||||
static const uint8_t uuid[16] = {
|
||||
0x46, 0x00, 0xcb, 0x32, 0x38, 0xec, 0x4b, 0x2f,
|
||||
0x8a, 0xcb, 0x81, 0xc6, 0xea, 0x54, 0xf2, 0xd8,
|
||||
};
|
||||
|
||||
s = qtest_init("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
qfw_cfg_get(fw_cfg, FW_CFG_UUID, buf, 16);
|
||||
g_assert(memcmp(buf, uuid, sizeof(buf)) == 0);
|
||||
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
|
||||
}
|
||||
|
||||
static void test_fw_cfg_ram_size(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
g_assert_cmpint(qfw_cfg_get_u64(fw_cfg, FW_CFG_RAM_SIZE), ==, ram_size);
|
||||
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_nographic(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_NOGRAPHIC), ==, 0);
|
||||
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_nb_cpus(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_NB_CPUS), ==, nb_cpus);
|
||||
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_max_cpus(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_MAX_CPUS), ==, max_cpus);
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_numa(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
uint64_t *cpu_mask;
|
||||
uint64_t *node_mask;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
g_assert_cmpint(qfw_cfg_get_u64(fw_cfg, FW_CFG_NUMA), ==, nb_nodes);
|
||||
|
||||
cpu_mask = g_new0(uint64_t, max_cpus);
|
||||
|
|
@ -92,24 +158,65 @@ static void test_fw_cfg_numa(void)
|
|||
|
||||
g_free(node_mask);
|
||||
g_free(cpu_mask);
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_boot_menu(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
|
||||
s = qtest_init("");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==, boot_menu);
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_reboot_timeout(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
uint32_t reboot_timeout = 0;
|
||||
size_t filesize;
|
||||
|
||||
s = qtest_init("-boot reboot-timeout=15");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
filesize = qfw_cfg_get_file(fw_cfg, "etc/boot-fail-wait",
|
||||
&reboot_timeout, sizeof(reboot_timeout));
|
||||
g_assert_cmpint(filesize, ==, sizeof(reboot_timeout));
|
||||
reboot_timeout = le32_to_cpu(reboot_timeout);
|
||||
g_assert_cmpint(reboot_timeout, ==, 15);
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
static void test_fw_cfg_splash_time(void)
|
||||
{
|
||||
QFWCFG *fw_cfg;
|
||||
QTestState *s;
|
||||
uint16_t splash_time = 0;
|
||||
size_t filesize;
|
||||
|
||||
s = qtest_init("-boot splash-time=12");
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
filesize = qfw_cfg_get_file(fw_cfg, "etc/boot-menu-wait",
|
||||
&splash_time, sizeof(splash_time));
|
||||
g_assert_cmpint(filesize, ==, sizeof(splash_time));
|
||||
splash_time = le16_to_cpu(splash_time);
|
||||
g_assert_cmpint(splash_time, ==, 12);
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
qtest_quit(s);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
QTestState *s;
|
||||
int ret;
|
||||
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
s = qtest_init("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8");
|
||||
|
||||
fw_cfg = pc_fw_cfg_init(s);
|
||||
|
||||
qtest_add_func("fw_cfg/signature", test_fw_cfg_signature);
|
||||
qtest_add_func("fw_cfg/id", test_fw_cfg_id);
|
||||
qtest_add_func("fw_cfg/uuid", test_fw_cfg_uuid);
|
||||
|
|
@ -125,10 +232,8 @@ int main(int argc, char **argv)
|
|||
qtest_add_func("fw_cfg/max_cpus", test_fw_cfg_max_cpus);
|
||||
qtest_add_func("fw_cfg/numa", test_fw_cfg_numa);
|
||||
qtest_add_func("fw_cfg/boot_menu", test_fw_cfg_boot_menu);
|
||||
qtest_add_func("fw_cfg/reboot_timeout", test_fw_cfg_reboot_timeout);
|
||||
qtest_add_func("fw_cfg/splash_time", test_fw_cfg_splash_time);
|
||||
|
||||
ret = g_test_run();
|
||||
|
||||
qtest_quit(s);
|
||||
|
||||
return ret;
|
||||
return g_test_run();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "libqos/fw_cfg.h"
|
||||
#include "libqtest.h"
|
||||
#include "qemu/bswap.h"
|
||||
#include "hw/nvram/fw_cfg.h"
|
||||
|
||||
void qfw_cfg_select(QFWCFG *fw_cfg, uint16_t key)
|
||||
{
|
||||
|
|
@ -59,6 +60,50 @@ static void mm_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key)
|
|||
qtest_writew(fw_cfg->qts, fw_cfg->base, key);
|
||||
}
|
||||
|
||||
/*
|
||||
* The caller need check the return value. When the return value is
|
||||
* nonzero, it means that some bytes have been transferred.
|
||||
*
|
||||
* If the fw_cfg file in question is smaller than the allocated & passed-in
|
||||
* buffer, then the buffer has been populated only in part.
|
||||
*
|
||||
* If the fw_cfg file in question is larger than the passed-in
|
||||
* buffer, then the return value explains how much room would have been
|
||||
* necessary in total. And, while the caller's buffer has been fully
|
||||
* populated, it has received only a starting slice of the fw_cfg file.
|
||||
*/
|
||||
size_t qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename,
|
||||
void *data, size_t buflen)
|
||||
{
|
||||
uint32_t count;
|
||||
uint32_t i;
|
||||
unsigned char *filesbuf = NULL;
|
||||
size_t dsize;
|
||||
FWCfgFile *pdir_entry;
|
||||
size_t filesize = 0;
|
||||
|
||||
qfw_cfg_get(fw_cfg, FW_CFG_FILE_DIR, &count, sizeof(count));
|
||||
count = be32_to_cpu(count);
|
||||
dsize = sizeof(uint32_t) + count * sizeof(struct fw_cfg_file);
|
||||
filesbuf = g_malloc(dsize);
|
||||
qfw_cfg_get(fw_cfg, FW_CFG_FILE_DIR, filesbuf, dsize);
|
||||
pdir_entry = (FWCfgFile *)(filesbuf + sizeof(uint32_t));
|
||||
for (i = 0; i < count; ++i, ++pdir_entry) {
|
||||
if (!strcmp(pdir_entry->name, filename)) {
|
||||
uint32_t len = be32_to_cpu(pdir_entry->size);
|
||||
uint16_t sel = be16_to_cpu(pdir_entry->select);
|
||||
filesize = len;
|
||||
if (len > buflen) {
|
||||
len = buflen;
|
||||
}
|
||||
qfw_cfg_get(fw_cfg, sel, data, len);
|
||||
break;
|
||||
}
|
||||
}
|
||||
g_free(filesbuf);
|
||||
return filesize;
|
||||
}
|
||||
|
||||
static void mm_fw_cfg_read(QFWCFG *fw_cfg, void *data, size_t len)
|
||||
{
|
||||
uint8_t *ptr = data;
|
||||
|
|
@ -81,6 +126,11 @@ QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base)
|
|||
return fw_cfg;
|
||||
}
|
||||
|
||||
void mm_fw_cfg_uninit(QFWCFG *fw_cfg)
|
||||
{
|
||||
g_free(fw_cfg);
|
||||
}
|
||||
|
||||
static void io_fw_cfg_select(QFWCFG *fw_cfg, uint16_t key)
|
||||
{
|
||||
qtest_outw(fw_cfg->qts, fw_cfg->base, key);
|
||||
|
|
@ -107,3 +157,8 @@ QFWCFG *io_fw_cfg_init(QTestState *qts, uint16_t base)
|
|||
|
||||
return fw_cfg;
|
||||
}
|
||||
|
||||
void io_fw_cfg_uninit(QFWCFG *fw_cfg)
|
||||
{
|
||||
g_free(fw_cfg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,13 +31,22 @@ void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len);
|
|||
uint16_t qfw_cfg_get_u16(QFWCFG *fw_cfg, uint16_t key);
|
||||
uint32_t qfw_cfg_get_u32(QFWCFG *fw_cfg, uint16_t key);
|
||||
uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key);
|
||||
size_t qfw_cfg_get_file(QFWCFG *fw_cfg, const char *filename,
|
||||
void *data, size_t buflen);
|
||||
|
||||
QFWCFG *mm_fw_cfg_init(QTestState *qts, uint64_t base);
|
||||
void mm_fw_cfg_uninit(QFWCFG *fw_cfg);
|
||||
QFWCFG *io_fw_cfg_init(QTestState *qts, uint16_t base);
|
||||
void io_fw_cfg_uninit(QFWCFG *fw_cfg);
|
||||
|
||||
static inline QFWCFG *pc_fw_cfg_init(QTestState *qts)
|
||||
{
|
||||
return io_fw_cfg_init(qts, 0x510);
|
||||
}
|
||||
|
||||
static inline void pc_fw_cfg_uninit(QFWCFG *fw_cfg)
|
||||
{
|
||||
io_fw_cfg_uninit(fw_cfg);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -29,5 +29,5 @@ void pc_alloc_init(QGuestAllocator *s, QTestState *qts, QAllocOpts flags)
|
|||
alloc_init(s, flags, 1 << 20, MIN(ram_size, 0xE0000000), PAGE_SIZE);
|
||||
|
||||
/* clean-up */
|
||||
g_free(fw_cfg);
|
||||
pc_fw_cfg_uninit(fw_cfg);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue