From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [PULL 2/5] hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc
Date: Mon, 27 Sep 2021 11:52:49 +0200 [thread overview]
Message-ID: <20210927095252.2374148-3-laurent@vivier.eu> (raw)
In-Reply-To: <20210927095252.2374148-1-laurent@vivier.eu>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The PC_ROM_* definitions are only used by the PC machine,
and are irrelevant to the other architectures / machines.
Reduce their scope by moving them to hw/i386/pc.c.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210917185949.2244956-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/i386/pc.c | 6 ++++++
include/hw/loader.h | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 7e523b913caa..557d49c9f8f1 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -843,6 +843,12 @@ void xen_load_linux(PCMachineState *pcms)
x86ms->fw_cfg = fw_cfg;
}
+#define PC_ROM_MIN_VGA 0xc0000
+#define PC_ROM_MIN_OPTION 0xc8000
+#define PC_ROM_MAX 0xe0000
+#define PC_ROM_ALIGN 0x800
+#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA)
+
void pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory,
MemoryRegion *rom_memory,
diff --git a/include/hw/loader.h b/include/hw/loader.h
index cbfc1848737c..81104cb02fed 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -336,12 +336,6 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict);
#define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \
rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true)
-#define PC_ROM_MIN_VGA 0xc0000
-#define PC_ROM_MIN_OPTION 0xc8000
-#define PC_ROM_MAX 0xe0000
-#define PC_ROM_ALIGN 0x800
-#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA)
-
int rom_add_vga(const char *file);
int rom_add_option(const char *file, int32_t bootindex);
--
2.31.1
next prev parent reply other threads:[~2021-09-27 9:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-27 9:52 [PULL 0/5] Trivial branch for 6.2 patches Laurent Vivier
2021-09-27 9:52 ` [PULL 1/5] docs/nvdimm: Update nvdimm option value in machine example Laurent Vivier
2021-09-27 9:52 ` Laurent Vivier [this message]
2021-09-27 9:52 ` [PULL 3/5] hmp: Unbreak "change vnc" Laurent Vivier
2021-09-27 9:52 ` [PULL 4/5] hmp: Drop a bogus sentence from set_password's documentation Laurent Vivier
2021-09-27 9:52 ` [PULL 5/5] multi-process: fix usage information Laurent Vivier
2021-09-27 14:02 ` [PULL 0/5] Trivial branch for 6.2 patches Peter Maydell
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=20210927095252.2374148-3-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=mjt@tls.msk.ru \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.