[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 04/15] hw/i386: Implement fw_cfg_arch_key_name()
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-ppc] [PULL 04/15] hw/i386: Implement fw_cfg_arch_key_name() |
Date: |
Thu, 23 May 2019 14:43:09 +0200 |
Implement fw_cfg_arch_key_name(), which returns the name of a
i386-specific key.
Reviewed-by: Laszlo Ersek <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/Makefile.objs | 2 +-
hw/i386/fw_cfg.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 hw/i386/fw_cfg.c
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 27248a0777..5d9c9efd5f 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -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
diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c
new file mode 100644
index 0000000000..380a819230
--- /dev/null
+++ b/hw/i386/fw_cfg.c
@@ -0,0 +1,38 @@
+/*
+ * QEMU fw_cfg helpers (X86 specific)
+ *
+ * Copyright (c) 2019 Red Hat, Inc.
+ *
+ * Author:
+ * Philippe Mathieu-Daudé <address@hidden>
+ *
+ * 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;
+}
--
2.20.1
- [Qemu-ppc] [PULL 14/15] tests: fw_cfg: add 'reboot-timeout' test case, (continued)
- [Qemu-ppc] [PULL 14/15] tests: fw_cfg: add 'reboot-timeout' test case, Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 13/15] hw/nvram/fw_cfg: Store 'reboot-timeout' as little endian, Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 12/15] tests: fw_cfg: add a function to get the fw_cfg file, Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 11/15] tests: refactor fw_cfg_test, Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 07/15] hw/sparc64: Implement fw_cfg_arch_key_name(), Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 09/15] tests/libqos: Add pc_fw_cfg_uninit() and use it, Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 08/15] tests/libqos: Add io_fw_cfg_uninit() and mm_fw_cfg_uninit(), Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 01/15] hw/nvram/fw_cfg: Add trace events, Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 02/15] hw/nvram/fw_cfg: Add fw_cfg_arch_key_name(), Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 06/15] hw/sparc: Implement fw_cfg_arch_key_name(), Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 04/15] hw/i386: Implement fw_cfg_arch_key_name(),
Philippe Mathieu-Daudé <=
- [Qemu-ppc] [PULL 05/15] hw/ppc: Implement fw_cfg_arch_key_name(), Philippe Mathieu-Daudé, 2019/05/23
- [Qemu-ppc] [PULL 03/15] hw/i386: Extract fw_cfg definitions to local "fw_cfg.h", Philippe Mathieu-Daudé, 2019/05/23
- Re: [Qemu-ppc] [Qemu-devel] [PULL 00/15] Fw cfg 20190523 patches, Peter Maydell, 2019/05/23