Commit 8dc7fd56 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d418238d 3ae9dd1a

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -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

hw/i386/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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

hw/i386/fw_cfg.c

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * 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;

}

hw/i386/fw_cfg.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * 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

hw/i386/pc.c

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