mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-26 20:03:54 -06:00

- Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= =cjz8 -----END PGP SIGNATURE----- Merge tag 'exec-20241220' of https://github.com/philmd/qemu into staging Accel & Exec patch queue - Ignore writes to CNTP_CTL_EL0 on HVF ARM (Alexander) - Add '-d invalid_mem' logging option (Zoltan) - Create QOM containers explicitly (Peter) - Rename sysemu/ -> system/ (Philippe) - Re-orderning of include/exec/ headers (Philippe) Move a lot of declarations from these legacy mixed bag headers: . "exec/cpu-all.h" . "exec/cpu-common.h" . "exec/cpu-defs.h" . "exec/exec-all.h" . "exec/translate-all" to these more specific ones: . "exec/page-protection.h" . "exec/translation-block.h" . "user/cpu_loop.h" . "user/guest-host.h" . "user/page-protection.h" # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmdlnyAACgkQ4+MsLN6t # wN6mBw//QFWi7CrU+bb8KMM53kOU9C507tjn99LLGFb5or73/umDsw6eo/b8DHBt # KIwGLgATel42oojKfNKavtAzLK5rOrywpboPDpa3SNeF1onW+99NGJ52LQUqIX6K # A6bS0fPdGG9ZzEuPpbjDXlp++0yhDcdSgZsS42fEsT7Dyj5gzJYlqpqhiXGqpsn8 # 4Y0UMxSL21K3HEexlzw2hsoOBFA3tUm2ujNDhNkt8QASr85yQVLCypABJnuoe/// # 5Ojl5wTBeDwhANET0rhwHK8eIYaNboiM9fHopJYhvyw1bz6yAu9jQwzF/MrL3s/r # xa4OBHBy5mq2hQV9Shcl3UfCQdk/vDaYaWpgzJGX8stgMGYfnfej1SIl8haJIfcl # VMX8/jEFdYbjhO4AeGRYcBzWjEJymkDJZoiSWp2NuEDi6jqIW+7yW1q0Rnlg9lay # ShAqLK5Pv4zUw3t0Jy3qv9KSW8sbs6PQxtzXjk8p97rTf76BJ2pF8sv1tVzmsidP # 9L92Hv5O34IqzBu2oATOUZYJk89YGmTIUSLkpT7asJZpBLwNM2qLp5jO00WVU0Sd # +kAn324guYPkko/TVnjC/AY7CMu55EOtD9NU35k3mUAnxXT9oDUeL4NlYtfgrJx6 # x1Nzr2FkS68+wlPAFKNSSU5lTjsjNaFM0bIJ4LCNtenJVP+SnRo= # =cjz8 # -----END PGP SIGNATURE----- # gpg: Signature made Fri 20 Dec 2024 11:45:20 EST # gpg: using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE # gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: FAAB E75E 1291 7221 DCFD 6BB2 E3E3 2C2C DEAD C0DE * tag 'exec-20241220' of https://github.com/philmd/qemu: (59 commits) util/qemu-timer: fix indentation meson: Do not define CONFIG_DEVICES on user emulation system/accel-ops: Remove unnecessary 'exec/cpu-common.h' header system/numa: Remove unnecessary 'exec/cpu-common.h' header hw/xen: Remove unnecessary 'exec/cpu-common.h' header target/mips: Drop left-over comment about Jazz machine target/mips: Remove tswap() calls in semihosting uhi_fstat_cb() target/xtensa: Remove tswap() calls in semihosting simcall() helper accel/tcg: Un-inline translator_is_same_page() accel/tcg: Include missing 'exec/translation-block.h' header accel/tcg: Move tcg_cflags_has/set() to 'exec/translation-block.h' accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h' qemu/coroutine: Include missing 'qemu/atomic.h' header exec/translation-block: Include missing 'qemu/atomic.h' header accel/tcg: Declare cpu_loop_exit_requested() in 'exec/cpu-common.h' exec/cpu-all: Include 'cpu.h' earlier so MMU_USER_IDX is always defined target/sparc: Move sparc_restore_state_to_opc() to cpu.c target/sparc: Uninline cpu_get_tb_cpu_state() target/loongarch: Declare loongarch_cpu_dump_state() locally user: Move various declarations out of 'exec/exec-all.h' ... Conflicts: hw/char/riscv_htif.c hw/intc/riscv_aplic.c target/s390x/cpu.c Apply sysemu header path changes to not in the pull request. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
143 lines
4.8 KiB
C
143 lines
4.8 KiB
C
/*
|
|
* Guest Loader
|
|
*
|
|
* Copyright (C) 2020 Linaro
|
|
* Written by Alex Bennée <alex.bennee@linaro.org>
|
|
* (based on the generic-loader by Li Guang <lig.fnst@cn.fujitsu.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.
|
|
*/
|
|
|
|
/*
|
|
* Much like the generic-loader this is treated as a special device
|
|
* inside QEMU. However unlike the generic-loader this device is used
|
|
* to load guest images for hypervisors. As part of that process the
|
|
* hypervisor needs to have platform information passed to it by the
|
|
* lower levels of the stack (e.g. firmware/bootloader). If you boot
|
|
* the hypervisor directly you use the guest-loader to load the Dom0
|
|
* or equivalent guest images in the right place in the same way a
|
|
* boot loader would.
|
|
*
|
|
* This is only relevant for full system emulation.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/core/cpu.h"
|
|
#include "system/dma.h"
|
|
#include "hw/loader.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "guest-loader.h"
|
|
#include "system/device_tree.h"
|
|
#include "hw/boards.h"
|
|
|
|
/*
|
|
* Insert some FDT nodes for the loaded blob.
|
|
*/
|
|
static void loader_insert_platform_data(GuestLoaderState *s, int size,
|
|
Error **errp)
|
|
{
|
|
MachineState *machine = MACHINE(qdev_get_machine());
|
|
void *fdt = machine->fdt;
|
|
g_autofree char *node = g_strdup_printf("/chosen/module@0x%08" PRIx64,
|
|
s->addr);
|
|
uint64_t reg_attr[2] = {cpu_to_be64(s->addr), cpu_to_be64(size)};
|
|
|
|
if (!fdt) {
|
|
error_setg(errp, "Cannot modify FDT fields if the machine has none");
|
|
return;
|
|
}
|
|
|
|
qemu_fdt_add_subnode(fdt, node);
|
|
qemu_fdt_setprop(fdt, node, "reg", ®_attr, sizeof(reg_attr));
|
|
|
|
if (s->kernel) {
|
|
const char *compat[2] = { "multiboot,module", "multiboot,kernel" };
|
|
if (qemu_fdt_setprop_string_array(fdt, node, "compatible",
|
|
(char **) &compat,
|
|
ARRAY_SIZE(compat)) < 0) {
|
|
error_setg(errp, "couldn't set %s/compatible", node);
|
|
return;
|
|
}
|
|
if (s->args) {
|
|
if (qemu_fdt_setprop_string(fdt, node, "bootargs", s->args) < 0) {
|
|
error_setg(errp, "couldn't set %s/bootargs", node);
|
|
}
|
|
}
|
|
} else if (s->initrd) {
|
|
const char *compat[2] = { "multiboot,module", "multiboot,ramdisk" };
|
|
if (qemu_fdt_setprop_string_array(fdt, node, "compatible",
|
|
(char **) &compat,
|
|
ARRAY_SIZE(compat)) < 0) {
|
|
error_setg(errp, "couldn't set %s/compatible", node);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void guest_loader_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
GuestLoaderState *s = GUEST_LOADER(dev);
|
|
char *file = s->kernel ? s->kernel : s->initrd;
|
|
int size = 0;
|
|
|
|
/* Perform some error checking on the user's options */
|
|
if (s->kernel && s->initrd) {
|
|
error_setg(errp, "Cannot specify a kernel and initrd in same stanza");
|
|
return;
|
|
} else if (!s->kernel && !s->initrd) {
|
|
error_setg(errp, "Need to specify a kernel or initrd image");
|
|
return;
|
|
} else if (!s->addr) {
|
|
error_setg(errp, "Need to specify the address of guest blob");
|
|
return;
|
|
} else if (s->args && !s->kernel) {
|
|
error_setg(errp, "Boot args only relevant to kernel blobs");
|
|
}
|
|
|
|
/* Default to the maximum size being the machine's ram size */
|
|
size = load_image_targphys_as(file, s->addr, current_machine->ram_size,
|
|
NULL);
|
|
if (size < 0) {
|
|
error_setg(errp, "Cannot load specified image %s", file);
|
|
return;
|
|
}
|
|
|
|
/* Now the image is loaded we need to update the platform data */
|
|
loader_insert_platform_data(s, size, errp);
|
|
}
|
|
|
|
static const Property guest_loader_props[] = {
|
|
DEFINE_PROP_UINT64("addr", GuestLoaderState, addr, 0),
|
|
DEFINE_PROP_STRING("kernel", GuestLoaderState, kernel),
|
|
DEFINE_PROP_STRING("bootargs", GuestLoaderState, args),
|
|
DEFINE_PROP_STRING("initrd", GuestLoaderState, initrd),
|
|
};
|
|
|
|
static void guest_loader_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->realize = guest_loader_realize;
|
|
device_class_set_props(dc, guest_loader_props);
|
|
dc->desc = "Guest Loader";
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
}
|
|
|
|
static const TypeInfo guest_loader_info = {
|
|
.name = TYPE_GUEST_LOADER,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(GuestLoaderState),
|
|
.class_init = guest_loader_class_init,
|
|
};
|
|
|
|
static void guest_loader_register_type(void)
|
|
{
|
|
type_register_static(&guest_loader_info);
|
|
}
|
|
|
|
type_init(guest_loader_register_type)
|