From patchwork Sat Jan 14 06:51:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9516751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7C80A606B3 for ; Sat, 14 Jan 2017 06:51:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60D4C27569 for ; Sat, 14 Jan 2017 06:51:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4352528673; Sat, 14 Jan 2017 06:51:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 966CD27569 for ; Sat, 14 Jan 2017 06:51:28 +0000 (UTC) Received: from localhost ([::1]:46693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSIBT-000546-NX for patchwork-qemu-devel@patchwork.kernel.org; Sat, 14 Jan 2017 01:51:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSIBD-000541-G0 for qemu-devel@nongnu.org; Sat, 14 Jan 2017 01:51:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSIB9-0004ye-H9 for qemu-devel@nongnu.org; Sat, 14 Jan 2017 01:51:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33384) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cSIB9-0004yL-92 for qemu-devel@nongnu.org; Sat, 14 Jan 2017 01:51:07 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5C533B70D; Sat, 14 Jan 2017 06:51:05 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E405B8F87; Sat, 14 Jan 2017 06:51:03 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Date: Sat, 14 Jan 2017 07:51:02 +0100 Message-Id: <1484376662-32063-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 14 Jan 2017 06:51:05 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] hw/core/null-machine: Add the possibility to instantiate a CPU, RAM and kernel X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Laurent Vivier , Markus Armbruster , Max Filippov , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Sometimes it is useful to have just a machine with CPU and RAM, without any further hardware in it, e.g. if you just want to do some instruction debugging for TCG with a remote GDB attached to QEMU, or run some embedded code with the "-semihosting" QEMU parameter. qemu-system-m68k already features a "dummy" machine, and xtensa a "sim" machine for exactly this purpose. All target architectures have nowadays also a "none" machine, which would be a perfect match for this, too - but it currently does not allow to add CPU, RAM or a kernel yet. Thus let's add these possibilities in a generic way to the "none" machine, too, so that we hopefully do not need additional "dummy" machines in the future anymore (and maybe can also get rid of the already existing "dummy"/"sim" machines one day). Note that the default behaviour of the "none" machine is not changed, i.e. no CPU and no RAM is instantiated by default. You've explicitely got to specify the CPU model with "-cpu" and the amount of RAM with "-m" to get these new features. Signed-off-by: Thomas Huth --- hw/core/Makefile.objs | 2 +- hw/core/null-machine.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index a4c94e5..0b6c0f1 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -12,7 +12,6 @@ common-obj-$(CONFIG_XILINX_AXI) += stream.o common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o common-obj-$(CONFIG_SOFTMMU) += machine.o -common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o common-obj-$(CONFIG_SOFTMMU) += register.o @@ -20,3 +19,4 @@ common-obj-$(CONFIG_SOFTMMU) += or-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o obj-$(CONFIG_SOFTMMU) += generic-loader.o +obj-$(CONFIG_SOFTMMU) += null-machine.o diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index 0351ba7..b2468ed 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -13,18 +13,97 @@ #include "qemu/osdep.h" #include "qemu-common.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/boards.h" +#include "hw/loader.h" +#include "sysemu/sysemu.h" +#include "exec/address-spaces.h" +#include "cpu.h" +#include "elf.h" + +#ifdef TARGET_WORDS_BIGENDIAN +#define LOAD_ELF_ENDIAN_FLAG 1 +#else +#define LOAD_ELF_ENDIAN_FLAG 0 +#endif + +static hwaddr cpu_initial_pc; + +static uint64_t translate_phys_addr(void *opaque, uint64_t addr) +{ + return cpu_get_phys_page_debug(CPU(opaque), addr); +} + +static void machine_none_load_kernel(CPUState *cpu, const char *kernel_fname, + ram_addr_t ram_size) +{ + uint64_t elf_entry; + int kernel_size; + + if (!ram_size) { + error_report("You need RAM for loading a kernel"); + return; + } + + kernel_size = load_elf(kernel_fname, translate_phys_addr, cpu, &elf_entry, + NULL, NULL, LOAD_ELF_ENDIAN_FLAG, EM_NONE, 0, 0); + cpu_initial_pc = elf_entry; + if (kernel_size < 0) { + kernel_size = load_uimage(kernel_fname, &cpu_initial_pc, NULL, NULL, + NULL, NULL); + } + if (kernel_size < 0) { + kernel_size = load_image_targphys(kernel_fname, 0, ram_size); + } + if (kernel_size < 0) { + error_report("Could not load kernel '%s'", kernel_fname); + return; + } +} + +static void machine_none_cpu_reset(void *opaque) +{ + CPUState *cpu = CPU(opaque); + + cpu_reset(cpu); + cpu_set_pc(cpu, cpu_initial_pc); +} static void machine_none_init(MachineState *machine) { + ram_addr_t ram_size = machine->ram_size; + MemoryRegion *ram; + CPUState *cpu = NULL; + + /* Initialize CPU (if a model has been specified) */ + if (machine->cpu_model) { + cpu = cpu_init(machine->cpu_model); + if (!cpu) { + error_report("Unable to initialize CPU"); + exit(1); + } + qemu_register_reset(machine_none_cpu_reset, cpu); + cpu_reset(cpu); + } + + /* RAM at address zero */ + if (ram_size) { + ram = g_new(MemoryRegion, 1); + memory_region_allocate_system_memory(ram, NULL, "ram", ram_size); + memory_region_add_subregion(get_system_memory(), 0, ram); + } + + if (machine->kernel_filename) { + machine_none_load_kernel(cpu, machine->kernel_filename, ram_size); + } } static void machine_none_machine_init(MachineClass *mc) { mc->desc = "empty machine"; mc->init = machine_none_init; - mc->max_cpus = 0; + mc->default_ram_size = 0; } DEFINE_MACHINE("none", machine_none_machine_init)