Having four CPUs and 1 GiB of RAM matches real hardware. Fix the machine defaults to make its use more ergonomic and less error-prone. Also reflect this in the board documentation.
To reproduce the old default behavior for e.g. migration purposes, `-smp 1 -m 128M` needs to be passed on the command line. Signed-off-by: Bernhard Beschow <[email protected]> --- docs/system/arm/sabrelite.rst | 4 ++-- hw/arm/sabrelite.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/system/arm/sabrelite.rst b/docs/system/arm/sabrelite.rst index d3a3c01dd6..b8ac9548f5 100644 --- a/docs/system/arm/sabrelite.rst +++ b/docs/system/arm/sabrelite.rst @@ -55,7 +55,7 @@ To boot the newly built Linux kernel in QEMU with the SABRE Lite machine, use: .. code-block:: bash - $ qemu-system-arm -M sabrelite -smp 4 -m 1G \ + $ qemu-system-arm -M sabrelite \ -display none -serial null -serial stdio \ -kernel arch/arm/boot/zImage \ -dtb arch/arm/boot/dts/imx6q-sabrelite.dtb \ @@ -89,7 +89,7 @@ the -kernel argument, along with an SD card image with rootfs: .. code-block:: bash - $ qemu-system-arm -M sabrelite -smp 4 -m 1G \ + $ qemu-system-arm -M sabrelite \ -display none -serial null -serial stdio \ -kernel u-boot diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 05dfabd937..34f302f83c 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -17,6 +17,7 @@ #include "hw/core/boards.h" #include "hw/core/qdev-properties.h" #include "qemu/error-report.h" +#include "qemu/units.h" #include "system/qtest.h" struct SabreliteMachineState { @@ -139,7 +140,9 @@ static void sabrelite_machine_class_init(ObjectClass *oc, const void *data) mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex-A9)"; mc->init = sabrelite_init; mc->max_cpus = FSL_IMX6_NUM_CPUS; + mc->default_cpus = FSL_IMX6_NUM_CPUS; mc->ignore_memory_transaction_failures = true; + mc->default_ram_size = 1 * GiB; mc->default_ram_id = "sabrelite.ram"; mc->auto_create_sdcard = true; } -- 2.55.0
