From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Richard Henderson" <rth@twiddle.net>, "Laszlo Ersek" <lersek@redhat.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com> Subject: [Qemu-devel] [PATCH v3 4/7] hw/i386: Implement fw_cfg_arch_key_name() Date: Mon, 22 Apr 2019 21:50:17 +0200 [thread overview] Message-ID: <20190422195020.1494-5-philmd@redhat.com> (raw) In-Reply-To: <20190422195020.1494-1-philmd@redhat.com> Implement fw_cfg_arch_key_name(), which returns the name of a i386-specific key. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- 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 27248a0777c..5d9c9efd5fa 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 00000000000..c5e8b4ead0b --- /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é <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_tables"}, + {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
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Eduardo Habkost" <ehabkost@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, qemu-ppc@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Richard Henderson" <rth@twiddle.net>, "Laszlo Ersek" <lersek@redhat.com>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "David Gibson" <david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH v3 4/7] hw/i386: Implement fw_cfg_arch_key_name() Date: Mon, 22 Apr 2019 21:50:17 +0200 [thread overview] Message-ID: <20190422195020.1494-5-philmd@redhat.com> (raw) Message-ID: <20190422195017.oLVqd17ZWXfhU8EGWbZa7SyFOqU9aPzLKQLfB7QiCio@z> (raw) In-Reply-To: <20190422195020.1494-1-philmd@redhat.com> Implement fw_cfg_arch_key_name(), which returns the name of a i386-specific key. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- 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 27248a0777c..5d9c9efd5fa 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 00000000000..c5e8b4ead0b --- /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é <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_tables"}, + {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
next prev parent reply other threads:[~2019-04-22 19:51 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-22 19:50 [Qemu-devel] [PATCH v3 0/7] fw_cfg: Improve tracing Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 1/7] hw/nvram/fw_cfg: Add trace events Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 2/7] hw/nvram/fw_cfg: Add fw_cfg_arch_key_name() Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-23 18:32 ` Laszlo Ersek 2019-04-23 18:32 ` Laszlo Ersek 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 3/7] hw/i386: Extract fw_cfg definitions to local "fw_cfg.h" Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-23 18:38 ` Laszlo Ersek 2019-04-23 18:38 ` Laszlo Ersek 2019-04-29 15:41 ` Philippe Mathieu-Daudé 2019-04-29 15:41 ` Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé [this message] 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 4/7] hw/i386: Implement fw_cfg_arch_key_name() Philippe Mathieu-Daudé 2019-04-23 18:40 ` Laszlo Ersek 2019-04-23 18:40 ` Laszlo Ersek 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 5/7] hw/ppc: " Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-23 1:20 ` David Gibson 2019-04-23 1:20 ` David Gibson 2019-04-23 7:31 ` Philippe Mathieu-Daudé 2019-04-23 7:31 ` Philippe Mathieu-Daudé 2019-04-23 19:02 ` Laszlo Ersek 2019-04-23 19:02 ` Laszlo Ersek 2019-04-29 16:01 ` Philippe Mathieu-Daudé 2019-04-29 16:01 ` Philippe Mathieu-Daudé 2019-04-30 9:41 ` Laszlo Ersek 2019-04-30 9:41 ` Laszlo Ersek 2019-04-30 9:58 ` Philippe Mathieu-Daudé 2019-04-30 9:58 ` Philippe Mathieu-Daudé 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 6/7] hw/sparc: " Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-23 19:05 ` Laszlo Ersek 2019-04-23 19:05 ` Laszlo Ersek 2019-04-22 19:50 ` [Qemu-devel] [PATCH v3 7/7] hw/sparc64: " Philippe Mathieu-Daudé 2019-04-22 19:50 ` Philippe Mathieu-Daudé 2019-04-23 19:06 ` Laszlo Ersek 2019-04-23 19:06 ` Laszlo Ersek 2019-05-22 14:24 ` [Qemu-devel] [PATCH v3 0/7] fw_cfg: Improve tracing Philippe Mathieu-Daudé
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190422195020.1494-5-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=atar4qemu@gmail.com \ --cc=david@gibson.dropbear.id.au \ --cc=ehabkost@redhat.com \ --cc=kraxel@redhat.com \ --cc=lersek@redhat.com \ --cc=marcel.apfelbaum@gmail.com \ --cc=mark.cave-ayland@ilande.co.uk \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=rth@twiddle.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).