Misc HW patches for 2025-02-10
Subsystems (8)
The following changes since commit 54e91d1523b412b4cff7cb36c898fa9dc133e886:
Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to 1078a376932cc1d1c501ee3643fef329da6a189a:
hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches
- Use qemu_hexdump_line() in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- Introduce TYPE_DYNAMIC_SYS_BUS_DEVICE (Philippe)
- Invert logic of machine no_sdcard flag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)
- Prevent out-of-bound access in SMC91C111 RX path (Peter)
----------------------------------------------------------------
Bernhard Beschow (1):
hw/xen: Prefer QOM cast for XenLegacyDevice
Peter Maydell (1):
hw/net/smc91c111: Ignore attempt to pop from empty RX fifo
Phil Dennis-Jordan (1):
hw/intc/apic: Fixes magic number use, removes outdated comment
Philippe Mathieu-Daudé (28):
backends/tpm: Use qemu_hexdump_line() to avoid sprintf() hw/intc/xilinx_intc: Make device endianness configurable hw/net/xilinx_ethlite: Make device endianness configurable hw/timer/xilinx_timer: Make device endianness configurable hw/char/xilinx_uartlite: Make device endianness configurable hw/ssi/xilinx_spi: Make device endianness configurable hw/arm/xlnx-zynqmp: Use &error_abort for programming errors hw/sysbus: Use sizeof(BusState) in main_system_bus_create() hw/sysbus: Declare QOM types using DEFINE_TYPES() macro hw/sysbus: Introduce TYPE_DYNAMIC_SYS_BUS_DEVICE
hw/vfio: Have VFIO_PLATFORM devices inherit from
DYNAMIC_SYS_BUS_DEVICE
hw/display: Have RAMFB device inherit from DYNAMIC_SYS_BUS_DEVICE hw/i386: Have X86_IOMMU devices inherit from DYNAMIC_SYS_BUS_DEVICE hw/net: Have eTSEC device inherit from DYNAMIC_SYS_BUS_DEVICE hw/tpm: Have TPM TIS sysbus device inherit from DYNAMIC_SYS_BUS_DEVICE hw/xen: Have legacy Xen backend inherit from DYNAMIC_SYS_BUS_DEVICE hw/boards: Convert no_sdcard flag to OnOffAuto tri-state hw/boards: Explicit no_sdcard=false as ON_OFF_AUTO_OFF hw/boards: Rename no_sdcard -> auto_create_sdcard hw/boards: Do not create unusable default if=sd drives hw/arm: Remove all invalid uses of auto_create_sdcard=true hw/riscv: Remove all invalid uses of auto_create_sdcard=true hw/boards: Ensure machine setting auto_create_sdcard expose a SD Bus tests/functional: Explicit endianness of microblaze assets tests/functional: Allow microblaze tests to take a machine name
argument
tests/functional: Remove sleep() kludges from microblaze tests tests/functional: Have microblaze tests inherit common parent class hw/riscv/opentitan: Include missing 'exec/address-spaces.h' header
Zhao Liu (1):
hw/core/machine: Reject thread level cache
include/hw/boards.h | 2 +- include/hw/sysbus.h | 2 + include/hw/xen/xen_pvdev.h | 5 +- backends/tpm/tpm_util.c | 24 ++++---- hw/arm/aspeed.c | 20 +++++++ hw/arm/bananapi_m2u.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/exynos4_boards.c | 2 + hw/arm/fby35.c | 1 + hw/arm/imx25_pdk.c | 1 + hw/arm/integratorcp.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/npcm7xx_boards.c | 5 ++ hw/arm/omap_sx1.c | 2 + hw/arm/orangepi.c | 1 + hw/arm/raspi.c | 5 ++ hw/arm/raspi4b.c | 1 + hw/arm/realview.c | 4 ++ hw/arm/sabrelite.c | 1 + hw/arm/stellaris.c | 1 + hw/arm/versatilepb.c | 2 + hw/arm/vexpress.c | 2 + hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-zcu102.c | 1 + hw/arm/xlnx-zynqmp.c | 38 ++++-------- hw/char/xilinx_uartlite.c | 27 +++++---- hw/core/machine-smp.c | 7 +++ hw/core/null-machine.c | 1 - hw/core/sysbus.c | 54 ++++++++++------- hw/display/ramfb-standalone.c | 3 +- hw/i386/amd_iommu.c | 2 - hw/i386/intel_iommu.c | 2 - hw/i386/x86-iommu.c | 2 +- hw/intc/apic.c | 3 +- hw/intc/xilinx_intc.c | 52 +++++++++++----- hw/microblaze/petalogix_ml605_mmu.c | 3 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 ++ hw/net/fsl_etsec/etsec.c | 4 +- hw/net/smc91c111.c | 9 +++ hw/net/xilinx_ethlite.c | 20 +++++-- hw/ppc/virtex_ml507.c | 1 + hw/riscv/microchip_pfsoc.c | 1 + hw/riscv/opentitan.c | 1 + hw/riscv/sifive_u.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 - hw/ssi/xilinx_spi.c | 24 +++++--- hw/timer/xilinx_timer.c | 35 +++++++---- hw/tpm/tpm_tis_sysbus.c | 3 +- hw/usb/xen-usb.c | 6 +- hw/vfio/amd-xgbe.c | 2 - hw/vfio/calxeda-xgmac.c | 2 - hw/vfio/platform.c | 4 +- hw/xen/xen-legacy-backend.c | 9 +-- hw/xen/xen_pvdev.c | 2 +- system/vl.c | 24 ++++++-- .../functional/test_microblaze_s3adsp1800.py | 34 +++++++++-- .../test_microblazeel_s3adsp1800.py | 32 ++-------- tests/qemu-iotests/172.out | 60 ------------------- 60 files changed, 314 insertions(+), 248 deletions(-)
Signature · 1 line
2.47.1
[PULL 01/32] backends/tpm: Use qemu_hexdump_line() to avoid sprintf()
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1. Using qemu_hexdump_line() both fixes the deprecation warning and simplifies the code base.
Message-ID: <[email protected]> [PMD: Rebased]
--- backends/tpm/tpm_util.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-)
backends/tpm/tpm_util.c +10 -14
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "tpm_int.h"
@@ -336,8 +337,8 @@ void tpm_sized_buffer_reset(TPMSizedBuffer *tsb)void tpm_util_show_buffer (const unsigned char *buffer,size_t buffer_size,const char *string) { -size_t len, i; -char *line_buffer, *p; +g_autoptr (GString) str =NULL ; +size_t len, i, l;if (!trace_event_get_state_backends (TRACE_TPM_UTIL_SHOW_BUFFER_CONTENT )) {return ;
@@ -345,19 +346,14 @@ void tpm_util_show_buffer(const unsigned char *buffer, len =MIN (tpm_cmd_get_size (buffer), buffer_size);trace_tpm_util_show_buffer_header (string, len); -/* -* allocate enough room for 3 chars per buffer entry plus a -* newline after every 16 chars and a final null terminator. -*/ - line_buffer =g_malloc (len *3 + (len /16 ) +1 ); - -for (i =0 , p = line_buffer; i < len; i++) { -if (i && !(i %16 )) { - p +=sprintf (p,"\n" ); +for (i =0 ; i < len; i += l) { +if (str) { +g_string_append_c (str,'\n' ); } - p +=sprintf (p,"%.2X " , buffer[i]); + l =MIN (len,16 ); + str =qemu_hexdump_line (str, buffer, l,1 ,0 ); } -trace_tpm_util_show_buffer_content (line_buffer); -g_free (line_buffer); +g_string_ascii_up (str); +trace_tpm_util_show_buffer_content (str->str); }
Signature · 1 line
2.47.1
[PULL 12/32] hw/sysbus: Introduce TYPE_DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéSome TYPE_SYS_BUS_DEVICEs can be optionally dynamically plugged on the TYPE_PLATFORM_BUS_DEVICE.
Rather than sometimes noting that with comment around the 'user_creatable = true' line in each DeviceRealize handler, introduce an abstract TYPE_DYNAMIC_SYS_BUS_DEVICE class.
Message-Id: <[email protected]>
--- include/hw/sysbus.h | 2 ++ hw/core/sysbus.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
include/hw/sysbus.h +2 -0
@@ -19,6 +19,8 @@ DECLARE_INSTANCE_CHECKER(BusState, SYSTEM_BUS,OBJECT_DECLARE_TYPE (SysBusDevice, SysBusDeviceClass, SYS_BUS_DEVICE) +#define TYPE_DYNAMIC_SYS_BUS_DEVICE "dynamic-sysbus-device" +/** * SysBusDeviceClass: *
hw/core/sysbus.c +14 -0
@@ -320,6 +320,14 @@ BusState *sysbus_get_default(void)return main_system_bus; } +static void dynamic_sysbus_device_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *k =DEVICE_CLASS (klass); + + k->user_creatable = true; + k->hotpluggable = false; +} +static const TypeInfo sysbus_types[] = { { .name =TYPE_SYSTEM_BUS ,
@@ -335,6 +343,12 @@ static const TypeInfo sysbus_types[] = { .class_size = sizeof(SysBusDeviceClass), .class_init = sysbus_device_class_init, }, + { + .name = TYPE_DYNAMIC_SYS_BUS_DEVICE, + .parent = TYPE_SYS_BUS_DEVICE, + .class_init = dynamic_sysbus_device_class_init, + .abstract = true, + } };DEFINE_TYPES (sysbus_types)
Signature · 1 line
2.47.1
[PULL 02/32] hw/intc/xilinx_intc: Make device endianness configurable
In reply to Philippe Mathieu-DaudéReplace the DEVICE_NATIVE_ENDIAN MemoryRegionOps by a pair of DEVICE_LITTLE_ENDIAN / DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.
Message-Id: <[email protected]>
--- hw/intc/xilinx_intc.c | 52 +++++++++++++++++------- hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + 3 files changed, 40 insertions(+), 14 deletions(-)
hw/intc/xilinx_intc.c +38 -14
@@ -3,6 +3,9 @@* * Copyright (c) 2009 Edgar E. Iglesias. * +* https://docs.amd.com/v/u/en-US/xps_intc +* DS572: LogiCORE IP XPS Interrupt Controller (v2.01a) +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights
@@ -49,6 +52,7 @@ struct XpsIntc {SysBusDevice parent_obj; +bool little_endian_model;MemoryRegion mmio;qemu_irq parent_irq;
@@ -140,18 +144,29 @@ static void pic_write(void *opaque, hwaddr addr,update_irq (p); } -static const MemoryRegionOps pic_ops = { - .read = pic_read, - .write = pic_write, - .endianness =DEVICE_NATIVE_ENDIAN , - .impl = { - .min_access_size =4 , - .max_access_size =4 , +static const MemoryRegionOps pic_ops[2 ] = { + [0 ...1 ] = { + .read = pic_read, + .write = pic_write, + .endianness =DEVICE_BIG_ENDIAN , + .impl = { + .min_access_size =4 , + .max_access_size =4 , + }, + .valid = { +/* +* All XPS INTC registers are accessed through the PLB interface. +* The base address for these registers is provided by the +* configuration parameter, C_BASEADDR. Each register is 32 bits +* although some bits may be unused and is accessed on a 4-byte +* boundary offset from the base address. +*/ + .min_access_size =4 , + .max_access_size =4 , + }, }, - .valid = { - .min_access_size =4 , - .max_access_size =4 - } + [0 ].endianness =DEVICE_BIG_ENDIAN , + [1 ].endianness =DEVICE_LITTLE_ENDIAN , };static void irq_handler (void *opaque,int irq,int level)
@@ -174,13 +189,21 @@ static void xilinx_intc_init(Object *obj)qdev_init_gpio_in (DEVICE (obj), irq_handler,32 );sysbus_init_irq (SYS_BUS_DEVICE (obj), &p->parent_irq); - -memory_region_init_io (&p->mmio, obj, &pic_ops, p,"xlnx.xps-intc" , -R_MAX *4 );sysbus_init_mmio (SYS_BUS_DEVICE (obj), &p->mmio); } +static void xilinx_intc_realize (DeviceState *dev,Error **errp) +{ +XpsIntc *p =XILINX_INTC (dev); + +memory_region_init_io (&p->mmio,OBJECT (dev), + &pic_ops[p->little_endian_model], + p,"xlnx.xps-intc" , +R_MAX *4 ); +} +static const Property xilinx_intc_properties[] = { +DEFINE_PROP_BOOL ("little-endian" , XpsIntc, little_endian_model, true),DEFINE_PROP_UINT32 ("kind-of-intr" , XpsIntc, c_kind_of_intr,0 ), };
@@ -188,6 +211,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data) {DeviceClass *dc =DEVICE_CLASS (klass); + dc->realize = xilinx_intc_realize;device_class_set_props (dc, xilinx_intc_properties); }
hw/microblaze/petalogix_ml605_mmu.c +1 -0
@@ -111,6 +111,7 @@ petalogix_ml605_init(MachineState *machine) dev =qdev_new ("xlnx.xps-intc" ); +qdev_prop_set_bit (dev,"little-endian" , true);qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<TIMER_IRQ );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,INTC_BASEADDR );
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -0
@@ -95,6 +95,7 @@ petalogix_s3adsp1800_init(MachineState *machine) 64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1); dev =qdev_new ("xlnx.xps-intc" ); +qdev_prop_set_bit (dev,"little-endian" , !TARGET_BIG_ENDIAN );qdev_prop_set_uint32 (dev,"kind-of-intr" ,1 <<ETHLITE_IRQ |1 <<UARTLITE_IRQ );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
Signature · 1 line
2.47.1
[PULL 06/32] hw/ssi/xilinx_spi: Make device endianness configurable
In reply to Philippe Mathieu-DaudéReplace the DEVICE_NATIVE_ENDIAN MemoryRegionOps by a pair of DEVICE_LITTLE_ENDIAN / DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness on the single machine using the device.
Message-Id: <[email protected]>
--- hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/ssi/xilinx_spi.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-)
hw/microblaze/petalogix_ml605_mmu.c +1 -0
@@ -175,6 +175,7 @@ petalogix_ml605_init(MachineState *machine)SSIBus *spi; dev =qdev_new ("xlnx.xps-spi" ); +qdev_prop_set_bit (dev,"little-endian" , true);qdev_prop_set_uint8 (dev,"num-ss-bits" ,NUM_SPI_FLASHES ); busdev =SYS_BUS_DEVICE (dev);sysbus_realize_and_unref (busdev, &error_fatal);
hw/ssi/xilinx_spi.c +15 -9
@@ -83,6 +83,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(XilinxSPI, XILINX_SPI)struct XilinxSPI {SysBusDevice parent_obj; +bool little_endian_model;MemoryRegion mmio;qemu_irq irq;
@@ -313,14 +314,17 @@ done:xlx_spi_update_irq (s); } -static const MemoryRegionOps spi_ops = { - .read = spi_read, - .write = spi_write, - .endianness =DEVICE_NATIVE_ENDIAN , - .valid = { - .min_access_size =4 , - .max_access_size =4 - } +static const MemoryRegionOps spi_ops[2 ] = { + [0 ...1 ] = { + .read = spi_read, + .write = spi_write, + .valid = { + .min_access_size =4 , + .max_access_size =4 , + }, + }, + [0 ].endianness =DEVICE_BIG_ENDIAN , + [1 ].endianness =DEVICE_LITTLE_ENDIAN , };static void xilinx_spi_realize (DeviceState *dev,Error **errp)
@@ -339,7 +343,8 @@ static void xilinx_spi_realize(DeviceState *dev, Error **errp)sysbus_init_irq (sbd, &s->cs_lines[i]); } -memory_region_init_io (&s->mmio,OBJECT (s), &spi_ops, s, +memory_region_init_io (&s->mmio,OBJECT (s), + &spi_ops[s->little_endian_model], s,"xilinx-spi" ,R_MAX *4 );sysbus_init_mmio (sbd, &s->mmio);
@@ -362,6 +367,7 @@ static const VMStateDescription vmstate_xilinx_spi = { };static const Property xilinx_spi_properties[] = { +DEFINE_PROP_BOOL ("little-endian" , XilinxSPI, little_endian_model, true),DEFINE_PROP_UINT8 ("num-ss-bits" , XilinxSPI, num_cs,1 ), };
Signature · 1 line
2.47.1
[PULL 09/32] hw/core/machine: Reject thread level cache
In reply to Philippe Mathieu-DaudéFrom: Zhao Liu <[email protected]>
Currently, neither i386 nor ARM have real hardware support for per- thread cache, and there is no clear demand for this specific cache topology.
Additionally, since ARM even can't support this special cache topology in device tree, it is unnecessary to support it at this moment, even though per-thread cache might have potential scheduling benefits for VMs without CPU affinity.
Therefore, disable thread-level cache topology in the general machine part. At present, i386 has not enabled SMP cache, so disabling the thread parameter does not pose compatibility issues.
In the future, if there is a clear demand for this feature, the correct approach would be to add a new control field in MachineClass.smp_props and enable it only for the machines that require it.
Message-ID: <[email protected]>
--- hw/core/machine-smp.c | 7 +++++++ 1 file changed, 7 insertions(+)
hw/core/machine-smp.c +7 -0
@@ -321,6 +321,13 @@ bool machine_parse_smp_cache(MachineState *ms,return false; } +if (props->topology ==CPU_TOPOLOGY_LEVEL_THREAD ) { +error_setg (errp, +"%s level cache not supported by this machine" , +CpuTopologyLevel_str (props->topology)); +return false; + } +if (!machine_check_topo_support (ms, props->topology, errp)) {return false; }
Signature · 1 line
2.47.1
[PULL 11/32] hw/sysbus: Declare QOM types using DEFINE_TYPES() macro
In reply to Philippe Mathieu-DaudéWhen multiple QOM types are registered in the same file, it is simpler to use the the DEFINE_TYPES() macro. In particular because type array declared with such macro are easier to review.
Message-Id: <[email protected]>
--- hw/core/sysbus.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-)
hw/core/sysbus.c +17 -23
@@ -19,7 +19,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu/module.h" #include "hw/sysbus.h" #include "monitor/monitor.h" #include "exec/address-spaces.h"
@@ -80,13 +79,6 @@ static void system_bus_class_init(ObjectClass *klass, void *data) k->get_fw_dev_path = sysbus_get_fw_dev_path; } -static const TypeInfo system_bus_info = { - .name =TYPE_SYSTEM_BUS , - .parent =TYPE_BUS , - .instance_size =sizeof (BusState), - .class_init = system_bus_class_init, -}; -/* Check whether an IRQ source exists */ bool sysbus_has_irq (SysBusDevice *dev,int n) {
@@ -306,15 +298,6 @@ static void sysbus_device_class_init(ObjectClass *klass, void *data) k->user_creatable = false; } -static const TypeInfo sysbus_device_type_info = { - .name =TYPE_SYS_BUS_DEVICE , - .parent =TYPE_DEVICE , - .instance_size =sizeof (SysBusDevice), - .abstract = true, - .class_size =sizeof (SysBusDeviceClass), - .class_init = sysbus_device_class_init, -}; -static BusState *main_system_bus;static void main_system_bus_create (void )
@@ -337,10 +320,21 @@ BusState *sysbus_get_default(void)return main_system_bus; } -static void sysbus_register_types (void ) -{ -type_register_static (&system_bus_info); -type_register_static (&sysbus_device_type_info); -} +static const TypeInfo sysbus_types[] = { + { + .name =TYPE_SYSTEM_BUS , + .parent =TYPE_BUS , + .instance_size =sizeof (BusState), + .class_init = system_bus_class_init, + }, + { + .name =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_DEVICE , + .instance_size =sizeof (SysBusDevice), + .abstract = true, + .class_size =sizeof (SysBusDeviceClass), + .class_init = sysbus_device_class_init, + }, +}; -type_init (sysbus_register_types) +DEFINE_TYPES (sysbus_types)
Signature · 1 line
2.47.1
[PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
In reply to Philippe Mathieu-DaudéReplace the DEVICE_NATIVE_ENDIAN MemoryRegionOps by a pair of DEVICE_LITTLE_ENDIAN / DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.
Message-Id: <[email protected]>
--- hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 +++++++++++++++--------- 4 files changed, 25 insertions(+), 13 deletions(-)
hw/microblaze/petalogix_ml605_mmu.c +1 -0
@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine)/* 2 timers at irq 2 @ 100 Mhz. */ dev =qdev_new ("xlnx.xps-timer" ); +qdev_prop_set_bit (dev,"little-endian" , true);qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,100 *1000000 );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -0
@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine)/* 2 timers at irq 2 @ 62 Mhz. */ dev =qdev_new ("xlnx.xps-timer" ); +qdev_prop_set_bit (dev,"little-endian" , !TARGET_BIG_ENDIAN );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
hw/ppc/virtex_ml507.c +1 -0
@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine)/* 2 timers at irq 2 @ 62 Mhz. */ dev =qdev_new ("xlnx.xps-timer" ); +qdev_prop_set_bit (dev,"little-endian" , false);qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
hw/timer/xilinx_timer.c +22 -13
@@ -3,6 +3,9 @@* * Copyright (c) 2009 Edgar E. Iglesias. * +* DS573: https://docs.amd.com/v/u/en-US/xps_timer +* LogiCORE IP XPS Timer/Counter (v1.02a) +* * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights
@@ -69,6 +72,7 @@ struct XpsTimerState {SysBusDevice parent_obj; +bool little_endian_model;MemoryRegion mmio;qemu_irq irq;uint8_t one_timer_only;
@@ -189,18 +193,21 @@ timer_write(void *opaque, hwaddr addr,timer_update_irq (t); } -static const MemoryRegionOps timer_ops = { - .read = timer_read, - .write = timer_write, - .endianness =DEVICE_NATIVE_ENDIAN , - .impl = { - .min_access_size =4 , - .max_access_size =4 , +static const MemoryRegionOps timer_ops[2 ] = { + [0 ...1 ] = { + .read = timer_read, + .write = timer_write, + .impl = { + .min_access_size =4 , + .max_access_size =4 , + }, + .valid = { + .min_access_size =4 , + .max_access_size =4 , + }, }, - .valid = { - .min_access_size =4 , - .max_access_size =4 - } + [0 ].endianness =DEVICE_BIG_ENDIAN , + [1 ].endianness =DEVICE_LITTLE_ENDIAN , };static void timer_hit (void *opaque)
@@ -233,8 +240,9 @@ static void xilinx_timer_realize(DeviceState *dev, Error **errp)ptimer_transaction_commit (xt->ptimer); } -memory_region_init_io (&t->mmio,OBJECT (t), &timer_ops, t,"xlnx.xps-timer" , -R_MAX *4 *num_timers (t)); +memory_region_init_io (&t->mmio,OBJECT (t), + &timer_ops[t->little_endian_model], t, +"xlnx.xps-timer" ,R_MAX *4 *num_timers (t));sysbus_init_mmio (SYS_BUS_DEVICE (dev), &t->mmio); }
@@ -247,6 +255,7 @@ static void xilinx_timer_init(Object *obj) }static const Property xilinx_timer_properties[] = { +DEFINE_PROP_BOOL ("little-endian" , XpsTimerState, little_endian_model, true),DEFINE_PROP_UINT32 ("clock-frequency" , XpsTimerState, freq_hz,62 *1000000 ),DEFINE_PROP_UINT8 ("one-timer-only" , XpsTimerState, one_timer_only,0 ), };
Signature · 1 line
2.47.1
Re: [PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
Quoted 45 lines · Philippe Mathieu-Daudé
Replace the
DEVICE_NATIVE_ENDIANMemoryRegionOps by a pair ofDEVICE_LITTLE_ENDIAN/DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-Id: <[email protected]>
--- hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 +++++++++++++++--------- 4 files changed, 25 insertions(+), 13 deletions(-)hw/microblaze/petalogix_ml605_mmu.c +1
-0@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine)/* 2 timers at irq 2 @ 100 Mhz. */ dev =qdev_new ("xlnx.xps-timer" ); +qdev_prop_set_bit (dev,"little-endian" , true);qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,100 *1000000 );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-0@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine)/* 2 timers at irq 2 @ 62 Mhz. */ dev =qdev_new ("xlnx.xps-timer" ); +qdev_prop_set_bit (dev,"little-endian" , !TARGET_BIG_ENDIAN );qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);hw/ppc/virtex_ml507.c +0
-0
hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 236
Quoted 7 lines
hw/ppc/virtex_ml507.c +1
-0@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine)/* 2 timers at irq 2 @ 62 Mhz. */ dev =qdev_new ("xlnx.xps-timer" ); +qdev_prop_set_bit (dev,"little-endian" , false);qdev_prop_set_uint32 (dev,"one-timer-only" ,0 );qdev_prop_set_uint32 (dev,"clock-frequency" ,62 *1000000 );sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);
Hi,
with this patch applied, the ppc_virtex_ml507 functional test is now failing for me ... could you please double-check whether "make check-functional-ppc" still works for you?
Thanks,
Thomas
Re: [PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
Quoted 53 lines · Thomas Huth
Quoted 43 lines · Philippe Mathieu-Daudé
Replace the
DEVICE_NATIVE_ENDIANMemoryRegionOps by a pair ofDEVICE_LITTLE_ENDIAN/DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-Id: <[email protected]>
---
hw/microblaze/petalogix_ml605_mmu.c | 1 +hw/microblaze/petalogix_s3adsp1800_mmu.c| 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 +++++++++++++++---------4 files changed, 25 insertions(+), 13 deletions(-)hw/microblaze/petalogix_ml605_mmu.c +1
-0@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine) /* 2 timers at irq 2 @ 100 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", true); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 100 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-0@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/ppc/virtex_ml507.c +0
-0hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 235
Quoted 6 lines
hw/ppc/virtex_ml507.c +1
-0@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);Hi,
Quoted 1 line
with this patch applied, the
ppc_virtex_ml507functional test is now failing for me ... could you please double-check whether "make check- functional-ppc" still works for you?
Thanks, not this patch problem, but patch #2 misses:
-- >8 --
hw/ppc/virtex_ml507.c +1 -0
@@ -219,2 +219,3 @@ static void virtex_init(MachineState *machine) dev =qdev_new ("xlnx.xps-intc" ); +qdev_prop_set_bit (dev,"little-endian" , false);qdev_prop_set_uint32 (dev,"kind-of-intr" ,0 );
---
Why is my CI green?
Re: [PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
Quoted 64 lines · Philippe Mathieu-Daudé
Quoted 53 lines · Thomas Huth
Quoted 43 lines · Philippe Mathieu-Daudé
Replace the
DEVICE_NATIVE_ENDIANMemoryRegionOps by a pair ofDEVICE_LITTLE_ENDIAN/DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-Id: <[email protected]>
---
hw/microblaze/petalogix_ml605_mmu.c | 1 +hw/microblaze/petalogix_s3adsp1800_mmu.c| 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 +++++++++++++++---------4 files changed, 25 insertions(+), 13 deletions(-)hw/microblaze/petalogix_ml605_mmu.c +1
-0@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine) /* 2 timers at irq 2 @ 100 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", true); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 100 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-0@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/ppc/virtex_ml507.c +0
-0hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 235
Quoted 6 lines
hw/ppc/virtex_ml507.c +1
-0@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);Hi,
Quoted 1 line
with this patch applied, the
ppc_virtex_ml507functional test is now failing for me ... could you please double-check whether "make check- functional-ppc" still works for you?Thanks, not this patch problem, but patch #2 misses:
-- >8 --
hw/ppc/virtex_ml507.c +0
-0
hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 220
Quoted 2 lines
hw/ppc/virtex_ml507.c +1
-0@@ -219,2 +219,3 @@ static void virtex_init(MachineState *machine) dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_bit(dev, "little-endian", false);
It looks to me like another "default value problem", where using a tri-state with default=unset would have catched.
"disas/dis-asm.h" defines:
enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
Maybe endianness is common enough than we can add a QAPI enum, in machine-common.json or even common.json?
Then I'd use qdev_prop_set_enum() here.
Quoted 4 lines
hw/ppc/virtex_ml507.c +0
-1qdev_prop_set_uint32(dev, "kind-of-intr", 0); ---Why is my CI green?
Re: [PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
Quoted 72 lines · Philippe Mathieu-Daudé
Quoted 65 lines · Philippe Mathieu-Daudé
Quoted 54 lines · Thomas Huth
Quoted 44 lines · Philippe Mathieu-Daudé
Replace the
DEVICE_NATIVE_ENDIANMemoryRegionOps by a pair ofDEVICE_LITTLE_ENDIAN/DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-Id: <[email protected]>
---
hw/microblaze/petalogix_ml605_mmu.c | 1 +hw/microblaze/petalogix_s3adsp1800_mmu.c| 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 ++++++++++++++
+---------4 files changed, 25 insertions(+), 13 deletions(-)hw/microblaze/petalogix_ml605_mmu.c +1
-0@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine) /* 2 timers at irq 2 @ 100 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", true); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 100 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-0@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/ppc/virtex_ml507.c +0
-0hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 235
Quoted 6 lines
hw/ppc/virtex_ml507.c +1
-0@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);Hi,
Quoted 1 line
with this patch applied, the
ppc_virtex_ml507functional test is now failing for me ... could you please double-check whether "make check- functional-ppc" still works for you?Thanks, not this patch problem, but patch #2 misses:
-- >8 --
hw/ppc/virtex_ml507.c +0
-0hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 220
Quoted 2 lines
hw/ppc/virtex_ml507.c +1
-0@@ -219,2 +219,3 @@ static void virtex_init(MachineState *machine) dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_bit(dev, "little-endian", false);It looks to me like another "default value problem", where using a tri-state with default=unset would have catched.
Quoted 8 lines
"
disas/dis-asm.h" defines:enum
bfd_endian{BFD_ENDIAN_BIG,BFD_ENDIAN_LITTLE,BFD_ENDIAN_UNKNOWN};Maybe endianness is common enough than we can add a QAPI enum, in machine-common.json or even common.json?
Then I'd use
qdev_prop_set_enum()here.
I'll post a series doing that.
Re: [PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
In reply to Philippe Mathieu-DaudéQuoted 69 lines · Philippe Mathieu-Daudé
Quoted 53 lines · Thomas Huth
Quoted 43 lines · Philippe Mathieu-Daudé
Replace the
DEVICE_NATIVE_ENDIANMemoryRegionOps by a pair ofDEVICE_LITTLE_ENDIAN/DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-Id: <[email protected]>
---
hw/microblaze/petalogix_ml605_mmu.c | 1 +hw/microblaze/petalogix_s3adsp1800_mmu.c| 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 +++++++++++++++---------4 files changed, 25 insertions(+), 13 deletions(-)hw/microblaze/petalogix_ml605_mmu.c +1
-0@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine) /* 2 timers at irq 2 @ 100 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", true); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 100 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-0@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/ppc/virtex_ml507.c +0
-0hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 235
Quoted 6 lines
hw/ppc/virtex_ml507.c +1
-0@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);Hi,
Quoted 1 line
with this patch applied, the
ppc_virtex_ml507functional test is now failing for me ... could you please double-check whether "make check- functional-ppc" still works for you?Thanks, not this patch problem, but patch #2 misses:
-- >8 --
hw/ppc/virtex_ml507.c +1
-1@@ -219,2 +219,3 @@ static void virtex_init(MachineState *machine) dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "kind-of-intr", 0); ---
Quoted 1 line
Why is my CI green?
Looking at https://gitlab.com/philmd/qemu/-/pipelines/1664238124 it seems like you did not start the functional test jobs?
Thomas
Re: [PULL 04/32] hw/timer/xilinx_timer: Make device endianness configurable
Quoted 71 lines · Thomas Huth
Quoted 70 lines · Philippe Mathieu-Daudé
Quoted 54 lines · Thomas Huth
Quoted 44 lines · Philippe Mathieu-Daudé
Replace the
DEVICE_NATIVE_ENDIANMemoryRegionOps by a pair ofDEVICE_LITTLE_ENDIAN/DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness for each machine using the device.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>Message-Id: <[email protected]>
---
hw/microblaze/petalogix_ml605_mmu.c | 1 +hw/microblaze/petalogix_s3adsp1800_mmu.c| 1 + hw/ppc/virtex_ml507.c | 1 + hw/timer/xilinx_timer.c | 35 ++++++++++++++
+---------4 files changed, 25 insertions(+), 13 deletions(-)hw/microblaze/petalogix_ml605_mmu.c +1
-0@@ -127,6 +127,7 @@ petalogix_ml605_init(MachineState *machine) /* 2 timers at irq 2 @ 100 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", true); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 100 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/microblaze/petalogix_s3adsp1800_mmu.c +1
-0@@ -114,6 +114,7 @@ petalogix_s3adsp1800_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", !TARGET_BIG_ENDIAN); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);hw/ppc/virtex_ml507.c +0
-0hw/ppc/virtex_ml507.c static void virtex_init(MachineState *machine) · line 235
Quoted 6 lines
hw/ppc/virtex_ml507.c +1
-0@@ -230,6 +230,7 @@ static void virtex_init(MachineState *machine) /* 2 timers at irq 2 @ 62 Mhz. */ dev = qdev_new("xlnx.xps-timer"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "one-timer-only", 0); qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);Hi,
Quoted 1 line
with this patch applied, the
ppc_virtex_ml507functional test is now failing for me ... could you please double-check whether "make check- functional-ppc" still works for you?Thanks, not this patch problem, but patch #2 misses:
-- >8 --
hw/ppc/virtex_ml507.c +1
-1@@ -219,2 +219,3 @@ static void virtex_init(MachineState *machine) dev = qdev_new("xlnx.xps-intc"); + qdev_prop_set_bit(dev, "little-endian", false); qdev_prop_set_uint32(dev, "kind-of-intr", 0); ---
Quoted 3 lines
Quoted 1 line
Why is my CI green?
Looking at https://gitlab.com/philmd/qemu/-/pipelines/1664238124 it seems like you did not start the functional test jobs?
Doh, while doing my PR process I forgot even using push-ci-now these need to be triggered manually :S
Quoted 3 lines
Thomas
[PULL 16/32] hw/net: Have eTSEC device inherit from DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéBecause the network eTSEC device can be optionally plugged on the TYPE_PLATFORM_BUS_DEVICE, have it inherit TYPE_DYNAMIC_SYS_BUS_DEVICE.
Message-Id: <[email protected]>
--- hw/net/fsl_etsec/etsec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/net/fsl_etsec/etsec.c +1 -3
@@ -425,14 +425,12 @@ static void etsec_class_init(ObjectClass *klass, void *data) dc->realize = etsec_realize;device_class_set_legacy_reset (dc, etsec_reset);device_class_set_props (dc, etsec_properties); -/* Supported by ppce500 machine */ - dc->user_creatable = true; }static const TypeInfo etsec_types[] = { { .name =TYPE_ETSEC_COMMON , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_DYNAMIC_SYS_BUS_DEVICE , .instance_size =sizeof (eTSEC), .class_init = etsec_class_init, .instance_init = etsec_instance_init,
Signature · 1 line
2.47.1
[PULL 19/32] hw/xen: Have legacy Xen backend inherit from DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéBecause the legacy Xen backend devices can optionally be plugged on the TYPE_PLATFORM_BUS_DEVICE, have it inherit TYPE_DYNAMIC_SYS_BUS_DEVICE. Remove the implicit TYPE_XENSYSDEV instance_size.
Message-Id: <[email protected]>
--- include/hw/xen/xen_pvdev.h | 5 +++-- hw/xen/xen-legacy-backend.c | 7 ++----- 2 files changed, 5 insertions(+), 7 deletions(-)
include/hw/xen/xen_pvdev.h +3 -2
@@ -1,7 +1,7 @@#ifndef QEMU_HW_XEN_PVDEV_H #define QEMU_HW_XEN_PVDEV_H -#include "hw/qdev-core.h" +#include "hw/sysbus.h" #include "hw/xen/xen_backend_ops.h" /* ------------------------------------------------------------- */
@@ -32,7 +32,8 @@ struct XenDevOps { };struct XenLegacyDevice { -DeviceState qdev; +SysBusDevice parent_obj; +const char *type;int dom;int dev;
hw/xen/xen-legacy-backend.c +2 -5
@@ -640,16 +640,14 @@ static void xendev_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);set_bit (DEVICE_CATEGORY_MISC , dc->categories); -/* xen-backend devices can be plugged/unplugged dynamically */ - dc->user_creatable = true; dc->bus_type =TYPE_XENSYSBUS ; }static const TypeInfo xendev_type_info = { .name =TYPE_XENBACKEND , - .parent =TYPE_DEVICE , + .parent =TYPE_DYNAMIC_SYS_BUS_DEVICE , .class_init = xendev_class_init, - .instance_size =sizeof (struct XenLegacyDevice ), + .instance_size =sizeof (XenLegacyDevice), };static void xen_sysbus_class_init (ObjectClass *klass,void *data)
@@ -672,7 +670,6 @@ static const TypeInfo xensysbus_info = {static const TypeInfo xensysdev_info = { .name =TYPE_XENSYSDEV , .parent =TYPE_SYS_BUS_DEVICE , - .instance_size =sizeof (SysBusDevice), };static void xenbe_register_types (void )
Signature · 1 line
2.47.1
[PULL 10/32] hw/sysbus: Use sizeof(BusState) in main_system_bus_create()
In reply to Philippe Mathieu-DaudéRather than using the obscure system_bus_info.instance_size, directly use sizeof(BusState).
Message-Id: <[email protected]>
--- hw/core/sysbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/core/sysbus.c +2 -2
@@ -323,8 +323,8 @@ static void main_system_bus_create(void)* assign main_system_bus before qbus_init() * in order to make "if (bus != sysbus_get_default())" work */ - main_system_bus =g_malloc0 (system_bus_info.instance_size); -qbus_init (main_system_bus, system_bus_info.instance_size, + main_system_bus =g_new0 (BusState,1 ); +qbus_init (main_system_bus,sizeof (BusState),TYPE_SYSTEM_BUS ,NULL ,"main-system-bus" );OBJECT (main_system_bus)->free = g_free; }
Signature · 1 line
2.47.1
[PULL 08/32] hw/intc/apic: Fixes magic number use, removes outdated comment
In reply to Philippe Mathieu-DaudéFrom: Phil Dennis-Jordan <[email protected]>
This changes replaces the use of an explicit literal constant for the APIC base address mask with the existing symbolic constant intended for this purpose.
Additionally, we remove the comment about not being able to re-enable the APIC after disabling it. This is no longer the case after the APIC implementation's state machine was modified in 9.0.
Message-ID: <[email protected]>
--- hw/intc/apic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/intc/apic.c +1 -2
@@ -350,9 +350,8 @@ static int apic_set_base(APICCommonState *s, uint64_t val)return -1 ; } - s->apicbase = (val &0xfffff000 ) | + s->apicbase = (val &MSR_IA32_APICBASE_BASE ) | (s->apicbase & (MSR_IA32_APICBASE_BSP |MSR_IA32_APICBASE_ENABLE )); -/* if disabled, cannot be enabled again */ if (!(val &MSR_IA32_APICBASE_ENABLE )) { s->apicbase &= ~MSR_IA32_APICBASE_ENABLE ;cpu_clear_apic_feature (&s->cpu->env);
Signature · 1 line
2.47.1
[PULL 03/32] hw/net/xilinx_ethlite: Make device endianness configurable
In reply to Philippe Mathieu-DaudéReplace the DEVICE_NATIVE_ENDIAN MemoryRegionOps by a pair of DEVICE_LITTLE_ENDIAN / DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness on the single machine using the device.
Message-Id: <[email protected]>
--- hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + hw/net/xilinx_ethlite.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-)
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -0
@@ -121,6 +121,7 @@ petalogix_s3adsp1800_init(MachineState *machine)sysbus_connect_irq (SYS_BUS_DEVICE (dev),0 , irq[TIMER_IRQ ]); dev =qdev_new ("xlnx.xps-ethernetlite" ); +qdev_prop_set_bit (dev,"little-endian" , !TARGET_BIG_ENDIAN );qemu_configure_nic_device (dev, true,NULL );qdev_prop_set_uint32 (dev,"tx-ping-pong" ,0 );qdev_prop_set_uint32 (dev,"rx-ping-pong" ,0 );
hw/net/xilinx_ethlite.c +14 -6
@@ -90,6 +90,7 @@ struct XlnxXpsEthLiteNICState *nic;NICConf conf; +bool little_endian_model;uint32_t c_tx_pingpong;uint32_t c_rx_pingpong;unsigned int port_index;/* dual port RAM index */
@@ -183,10 +184,10 @@ static void port_tx_write(void *opaque, hwaddr addr, uint64_t value, } } -static const MemoryRegionOps eth_porttx_ops = { +static const MemoryRegionOps eth_porttx_ops[2 ] = { + [0 ...1 ] = { .read = port_tx_read, .write = port_tx_write, - .endianness =DEVICE_NATIVE_ENDIAN , .impl = { .min_access_size =4 , .max_access_size =4 ,
@@ -195,6 +196,9 @@ static const MemoryRegionOps eth_porttx_ops = { .min_access_size = 4, .max_access_size = 4, }, + }, + [0].endianness = DEVICE_BIG_ENDIAN, + [1].endianness = DEVICE_LITTLE_ENDIAN, };static uint64_t port_rx_read (void *opaque,hwaddr addr,unsigned int size)
@@ -232,10 +236,10 @@ static void port_rx_write(void *opaque, hwaddr addr, uint64_t value, } } -static const MemoryRegionOps eth_portrx_ops = { +static const MemoryRegionOps eth_portrx_ops[2 ] = { + [0 ...1 ] = { .read = port_rx_read, .write = port_rx_write, - .endianness =DEVICE_NATIVE_ENDIAN , .impl = { .min_access_size =4 , .max_access_size =4 ,
@@ -244,6 +248,9 @@ static const MemoryRegionOps eth_portrx_ops = { .min_access_size = 4, .max_access_size = 4, }, + }, + [0].endianness = DEVICE_BIG_ENDIAN, + [1].endianness = DEVICE_LITTLE_ENDIAN, };static bool eth_can_rx (NetClientState *nc)
@@ -328,7 +335,7 @@ static void xilinx_ethlite_realize(DeviceState *dev, Error **errp) BUFSZ_MAX, &error_abort);memory_region_add_subregion (&s->container,0x0800 * i, &s->port[i].txbuf);memory_region_init_io (&s->port[i].txio,OBJECT (dev), - ð_porttx_ops, s, + ð_porttx_ops[s->little_endian_model], s, i ?"ethlite.tx[1]io" :"ethlite.tx[0]io" ,4 *TX_MAX ); memory_region_add_subregion(&s->container, i ? A_TX_BASE1 : A_TX_BASE0,
@@ -340,7 +347,7 @@ static void xilinx_ethlite_realize(DeviceState *dev, Error **errp)memory_region_add_subregion (&s->container,0x1000 +0x0800 * i, &s->port[i].rxbuf);memory_region_init_io (&s->port[i].rxio,OBJECT (dev), - ð_portrx_ops, s, + ð_portrx_ops[s->little_endian_model], s, i ?"ethlite.rx[1]io" :"ethlite.rx[0]io" ,4 *RX_MAX ); memory_region_add_subregion(&s->container, i ? A_RX_BASE1 : A_RX_BASE0,
@@ -363,6 +370,7 @@ static void xilinx_ethlite_init(Object *obj) }static const Property xilinx_ethlite_properties[] = { +DEFINE_PROP_BOOL ("little-endian" , XlnxXpsEthLite, little_endian_model, true),DEFINE_PROP_UINT32 ("tx-ping-pong" , XlnxXpsEthLite, c_tx_pingpong,1 ),DEFINE_PROP_UINT32 ("rx-ping-pong" , XlnxXpsEthLite, c_rx_pingpong,1 ),DEFINE_NIC_PROPERTIES (XlnxXpsEthLite, conf),
Signature · 1 line
2.47.1
[PULL 05/32] hw/char/xilinx_uartlite: Make device endianness configurable
In reply to Philippe Mathieu-DaudéReplace the DEVICE_NATIVE_ENDIAN MemoryRegionOps by a pair of DEVICE_LITTLE_ENDIAN / DEVICE_BIG_ENDIAN.
Add the "little-endian" property to select the device endianness, defaulting to little endian.
Set the proper endianness on the single machine using the device.
Message-Id: <[email protected]>
--- hw/char/xilinx_uartlite.c | 27 ++++++++++++++---------- hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + 2 files changed, 17 insertions(+), 11 deletions(-)
hw/char/xilinx_uartlite.c +16 -11
@@ -57,6 +57,7 @@struct XilinxUARTLite {SysBusDevice parent_obj; +bool little_endian_model;MemoryRegion mmio;CharBackend chr;qemu_irq irq;
@@ -166,17 +167,21 @@ uart_write(void *opaque, hwaddr addr,uart_update_irq (s); } -static const MemoryRegionOps uart_ops = { - .read = uart_read, - .write = uart_write, - .endianness =DEVICE_NATIVE_ENDIAN , - .valid = { - .min_access_size =1 , - .max_access_size =4 - } +static const MemoryRegionOps uart_ops[2 ] = { + [0 ...1 ] = { + .read = uart_read, + .write = uart_write, + .valid = { + .min_access_size =1 , + .max_access_size =4 , + }, + }, + [0 ].endianness =DEVICE_BIG_ENDIAN , + [1 ].endianness =DEVICE_LITTLE_ENDIAN , };static const Property xilinx_uartlite_properties[] = { +DEFINE_PROP_BOOL ("little-endian" , XilinxUARTLite, little_endian_model, true),DEFINE_PROP_CHR ("chardev" , XilinxUARTLite, chr), };
@@ -214,6 +219,9 @@ static void xilinx_uartlite_realize(DeviceState *dev, Error **errp) {XilinxUARTLite *s =XILINX_UARTLITE (dev); +memory_region_init_io (&s->mmio,OBJECT (dev), + &uart_ops[s->little_endian_model], + s,"xlnx.xps-uartlite" ,R_MAX *4 );qemu_chr_fe_set_handlers (&s->chr, uart_can_rx, uart_rx, uart_event,NULL , s,NULL , true); }
@@ -223,9 +231,6 @@ static void xilinx_uartlite_init(Object *obj)XilinxUARTLite *s =XILINX_UARTLITE (obj);sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); - -memory_region_init_io (&s->mmio, obj, &uart_ops, s, -"xlnx.xps-uartlite" ,R_MAX *4 );sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); }
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -0
@@ -107,6 +107,7 @@ petalogix_s3adsp1800_init(MachineState *machine) } dev =qdev_new (TYPE_XILINX_UARTLITE ); +qdev_prop_set_bit (dev,"little-endian" , !TARGET_BIG_ENDIAN );qdev_prop_set_chr (dev,"chardev" ,serial_hd (0 ));sysbus_realize_and_unref (SYS_BUS_DEVICE (dev), &error_fatal);sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 ,UARTLITE_BASEADDR );
Signature · 1 line
2.47.1
[PULL 24/32] hw/arm: Remove all invalid uses of auto_create_sdcard=true
In reply to Philippe Mathieu-DaudéMachineClass::auto_create_sdcard is only useful to automatically create a SD card, attach a IF_SD block drive to it and plug the card onto a SD bus. None of the ARM machines modified by this commit try to use the IF_SD interface.
Message-Id: <[email protected]>
--- hw/arm/aspeed.c | 1 - hw/arm/b-l475e-iot01a.c | 1 - hw/arm/collie.c | 1 - hw/arm/digic_boards.c | 1 - hw/arm/highbank.c | 2 -- hw/arm/kzm.c | 1 - hw/arm/microbit.c | 1 - hw/arm/mps2-tz.c | 4 ---- hw/arm/mps2.c | 4 ---- hw/arm/mps3r.c | 1 - hw/arm/msf2-som.c | 1 - hw/arm/musca.c | 2 -- hw/arm/musicpal.c | 1 - hw/arm/netduino2.c | 1 - hw/arm/netduinoplus2.c | 1 - hw/arm/olimex-stm32-h405.c | 1 - hw/arm/sbsa-ref.c | 1 - hw/arm/stellaris.c | 1 - hw/arm/stm32vldiscovery.c | 1 - hw/arm/virt.c | 1 - hw/arm/xen-pvh.c | 1 - 21 files changed, 29 deletions(-)
hw/arm/aspeed.c +0 -1
@@ -1658,7 +1658,6 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, amc->spi_model ="w25q256" ; amc->num_cs =2 ; amc->macs_mask =0 ; - mc->auto_create_sdcard = true;aspeed_machine_class_init_cpus_defaults (mc); }
hw/arm/b-l475e-iot01a.c +0 -1
@@ -120,7 +120,6 @@ static void bl475e_machine_init(ObjectClass *oc, void *data) mc->desc ="B-L475E-IOT01A Discovery Kit (Cortex-M4)" ; mc->init = bl475e_init; mc->valid_cpu_types = machine_valid_cpu_types; - mc->auto_create_sdcard = true;/* SRAM pre-allocated as part of the SoC instantiation */ mc->default_ram_size =0 ;
hw/arm/collie.c +0 -1
@@ -79,7 +79,6 @@ static void collie_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("sa1110" ); mc->default_ram_size =RAM_SIZE ; mc->default_ram_id ="strongarm.sdram" ; - mc->auto_create_sdcard = true; }static const TypeInfo collie_machine_typeinfo = {
hw/arm/digic_boards.c +0 -1
@@ -143,7 +143,6 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; mc->default_ram_size =64 * MiB; mc->default_ram_id ="ram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("canon-a1100" , canon_a1100_machine_init)
hw/arm/highbank.c +0 -2
@@ -357,7 +357,6 @@ static void highbank_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="highbank.dram" ; - mc->auto_create_sdcard = true; }static const TypeInfo highbank_type = {
@@ -382,7 +381,6 @@ static void midway_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="highbank.dram" ; - mc->auto_create_sdcard = true; }static const TypeInfo midway_type = {
hw/arm/kzm.c +0 -1
@@ -137,7 +137,6 @@ static void kzm_machine_init(MachineClass *mc) mc->init = kzm_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="kzm.ram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("kzm" , kzm_machine_init)
hw/arm/microbit.c +0 -1
@@ -67,7 +67,6 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data) mc->desc ="BBC micro:bit (Cortex-M0)" ; mc->init = microbit_init; mc->max_cpus =1 ; - mc->auto_create_sdcard = true; }static const TypeInfo microbit_info = {
hw/arm/mps2-tz.c +0 -4
@@ -1320,7 +1320,6 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN505 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41045050 ; mmc->sysclk_frq =20 *1000 *1000 ;/* 20MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1355,7 +1354,6 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN521 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41045210 ; mmc->sysclk_frq =20 *1000 *1000 ;/* 20MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1390,7 +1388,6 @@ static void mps3tz_an524_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN524 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41045240 ; mmc->sysclk_frq =32 *1000 *1000 ;/* 32MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1430,7 +1427,6 @@ static void mps3tz_an547_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN547 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m55" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41055470 ; mmc->sysclk_frq =32 *1000 *1000 ;/* 32MHz */ mmc->apb_periph_frq =25 *1000 *1000 ;/* 25MHz */
hw/arm/mps2.c +0 -4
@@ -487,7 +487,6 @@ static void mps2_an385_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN385 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41043850 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
@@ -507,7 +506,6 @@ static void mps2_an386_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN386 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m4" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41043860 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
@@ -527,7 +525,6 @@ static void mps2_an500_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN500 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m7" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41045000 ; mmc->psram_base =0x60000000 ; mmc->ethernet_base =0xa0000000 ;
@@ -547,7 +544,6 @@ static void mps2_an511_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN511 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->scc_id =0x41045110 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
hw/arm/mps3r.c +0 -1
@@ -618,7 +618,6 @@ static void mps3r_an536_class_init(ObjectClass *oc, void *data) mc->max_cpus =2 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-r52" ); mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; mmc->raminfo = an536_raminfo;mps3r_set_default_ram_info (mmc); }
hw/arm/msf2-som.c +0 -1
@@ -106,7 +106,6 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->desc ="SmartFusion2 SOM kit from Emcraft (M2S010)" ; mc->init = emcraft_sf2_s2s010_init; mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("emcraft-sf2" , emcraft_sf2_machine_init)
hw/arm/musca.c +0 -2
@@ -615,7 +615,6 @@ static void musca_a_class_init(ObjectClass *oc, void *data)MuscaMachineClass *mmc =MUSCA_MACHINE_CLASS (oc); mc->desc ="ARM Musca-A board (dual Cortex-M33)" ; - mc->auto_create_sdcard = true; mmc->type =MUSCA_A ; mmc->init_svtor =0x10200000 ; mmc->sram_addr_width =15 ;
@@ -630,7 +629,6 @@ static void musca_b1_class_init(ObjectClass *oc, void *data)MuscaMachineClass *mmc =MUSCA_MACHINE_CLASS (oc); mc->desc ="ARM Musca-B1 board (dual Cortex-M33)" ; - mc->auto_create_sdcard = true; mmc->type =MUSCA_B1 ;/* * This matches the DAPlink firmware which boots from QSPI. There
hw/arm/musicpal.c +0 -1
@@ -1342,7 +1342,6 @@ static void musicpal_machine_init(MachineClass *mc) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_size =MP_RAM_DEFAULT_SIZE ; mc->default_ram_id ="musicpal.ram" ; - mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/arm/netduino2.c +0 -1
@@ -63,7 +63,6 @@ static void netduino2_machine_init(MachineClass *mc) mc->init = netduino2_init; mc->valid_cpu_types = valid_cpu_types; mc->ignore_memory_transaction_failures = true; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("netduino2" , netduino2_machine_init)
hw/arm/netduinoplus2.c +0 -1
@@ -63,7 +63,6 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->desc ="Netduino Plus 2 Machine (Cortex-M4)" ; mc->init = netduinoplus2_init; mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("netduinoplus2" , netduinoplus2_machine_init)
hw/arm/olimex-stm32-h405.c +0 -1
@@ -66,7 +66,6 @@ static void olimex_stm32_h405_machine_init(MachineClass *mc) mc->desc ="Olimex STM32-H405 (Cortex-M4)" ; mc->init = olimex_stm32_h405_init; mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true;/* SRAM pre-allocated as part of the SoC instantiation */ mc->default_ram_size =0 ;
hw/arm/sbsa-ref.c +0 -1
@@ -900,7 +900,6 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data) mc->minimum_page_bits =12 ; mc->block_default_type =IF_IDE ; mc->no_cdrom =1 ; - mc->auto_create_sdcard = true; mc->default_nic ="e1000e" ; mc->default_ram_size =1 * GiB; mc->default_ram_id ="sbsa-ref.ram" ;
hw/arm/stellaris.c +0 -1
@@ -1421,7 +1421,6 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data) mc->init = lm3s811evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); - mc->auto_create_sdcard = true; }static const TypeInfo lm3s811evb_type = {
hw/arm/stm32vldiscovery.c +0 -1
@@ -66,7 +66,6 @@ static void stm32vldiscovery_machine_init(MachineClass *mc) mc->desc ="ST STM32VLDISCOVERY (Cortex-M3)" ; mc->init = stm32vldiscovery_init; mc->valid_cpu_types = valid_cpu_types; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("stm32vldiscovery" , stm32vldiscovery_machine_init)
hw/arm/virt.c +0 -1
@@ -3125,7 +3125,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)#endif mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; - mc->auto_create_sdcard = true; mc->pci_allow_0_address = true;/* We know we will never create a pre-ARMv7 CPU which needs 1K pages */ mc->minimum_page_bits =12 ;
hw/arm/xen-pvh.c +0 -1
@@ -75,7 +75,6 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)* mc->max_cpus, QEMU will bail out with an error message. */ mc->max_cpus =GUEST_MAX_VCPUS ; - mc->auto_create_sdcard = true;/* Xen/ARM does not use buffered IOREQs. */ xpc->handle_bufioreq =HVM_IOREQSRV_BUFIOREQ_OFF ;
Signature · 1 line
2.47.1
[PULL 23/32] hw/boards: Do not create unusable default if=sd drives
In reply to Philippe Mathieu-DaudéA number of machines create an if=sd drive by default even though they lack an SD bus, and therefore cannot use the drive.
This drive is created when the machine sets flag
@auto_create_sdcard.
See for example running HMP "info block" on the HPPA C3700 machine:
$ qemu-system-hppa -M C3700 -monitor stdio -S (qemu) info block
floppy0: [not inserted]
Removable device: not locked, tray closed
sd0: [not inserted]
Removable device: not locked, tray closed
$ qemu-system-hppa -M C3700 -sd /bin/sh qemu-system-hppa: -sd /bin/sh: machine type does not support if=sd,bus=0,unit=0
Delete that from machines that lack an SD bus.
Note, only the ARM and RISCV targets use such feature:
$ git grep -wl IF_SD hw | cut -d/ -f-2 | sort -u hw/arm hw/riscv $
Message-Id: <[email protected]>
--- hw/alpha/dp264.c | 1 - hw/avr/arduino.c | 1 - hw/hppa/machine.c | 2 - hw/i386/pc.c | 1 - hw/i386/x86.c | 1 - hw/i386/xen/xen-pvh.c | 1 - hw/loongarch/virt.c | 1 - hw/m68k/an5206.c | 1 - hw/m68k/mcf5208.c | 1 - hw/m68k/next-cube.c | 1 - hw/m68k/q800.c | 1 - hw/m68k/virt.c | 1 - hw/microblaze/petalogix_ml605_mmu.c | 1 - hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 - hw/microblaze/xlnx-zynqmp-pmu.c | 1 - hw/mips/boston.c | 1 - hw/mips/fuloong2e.c | 1 - hw/mips/jazz.c | 2 - hw/mips/loongson3_virt.c | 1 - hw/mips/malta.c | 1 - hw/mips/mipssim.c | 1 - hw/openrisc/openrisc_sim.c | 1 - hw/openrisc/virt.c | 1 - hw/ppc/amigaone.c | 1 - hw/ppc/e500plat.c | 1 - hw/ppc/mac_newworld.c | 1 - hw/ppc/mac_oldworld.c | 1 - hw/ppc/mpc8544ds.c | 1 - hw/ppc/pegasos2.c | 1 - hw/ppc/pnv.c | 1 - hw/ppc/ppc405_boards.c | 1 - hw/ppc/ppc440_bamboo.c | 1 - hw/ppc/prep.c | 1 - hw/ppc/sam460ex.c | 1 - hw/ppc/spapr.c | 1 - hw/ppc/virtex_ml507.c | 1 - hw/remote/machine.c | 1 - hw/rx/rx-gdbsim.c | 1 - hw/sh4/r2d.c | 1 - hw/sparc/leon3.c | 1 - hw/sparc/sun4m.c | 1 - hw/sparc64/niagara.c | 1 - hw/sparc64/sun4u.c | 2 - hw/tricore/triboard.c | 1 - hw/tricore/tricore_testboard.c | 1 - hw/xen/xen-pvh-common.c | 1 - hw/xenpv/xen_machine_pv.c | 1 - hw/xtensa/sim.c | 1 - hw/xtensa/virt.c | 1 - hw/xtensa/xtfpga.c | 8 ---- tests/qemu-iotests/172.out | 60 ------------------------ 51 files changed, 120 deletions(-)
hw/alpha/dp264.c +0 -1
@@ -213,7 +213,6 @@ static void clipper_machine_init(MachineClass *mc) mc->default_cpu_type =ALPHA_CPU_TYPE_NAME ("ev67" ); mc->default_ram_id ="ram" ; mc->default_nic ="e1000" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("clipper" , clipper_machine_init)
hw/avr/arduino.c +0 -1
@@ -67,7 +67,6 @@ static void arduino_machine_class_init(ObjectClass *oc, void *data) mc->no_floppy =1 ; mc->no_cdrom =1 ; mc->no_parallel =1 ; - mc->auto_create_sdcard = true; }static void arduino_duemilanove_class_init (ObjectClass *oc,void *data)
hw/hppa/machine.c +0 -2
@@ -704,7 +704,6 @@ static void HP_B160L_machine_init_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_ram_id ="ram" ; mc->default_nic ="tulip" ; - mc->auto_create_sdcard = true; nc->nmi_monitor_handler = hppa_nmi; }
@@ -741,7 +740,6 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_ram_id ="ram" ; mc->default_nic ="tulip" ; - mc->auto_create_sdcard = true; nc->nmi_monitor_handler = hppa_nmi; }
hw/i386/pc.c +0 -1
@@ -1799,7 +1799,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->smp_props.dies_supported = true; mc->smp_props.modules_supported = true; mc->default_ram_id ="pc.ram" ; - mc->auto_create_sdcard = true; pcmc->default_smbios_ep_type =SMBIOS_ENTRY_POINT_TYPE_AUTO ; object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",
hw/i386/x86.c +0 -1
@@ -382,7 +382,6 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; - mc->auto_create_sdcard = true; x86mc->save_tsc_khz = true; x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi;
hw/i386/xen/xen-pvh.c +0 -1
@@ -82,7 +82,6 @@ static void xen_pvh_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Xen PVH x86 machine" ; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; - mc->auto_create_sdcard = true;/* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */ mc->max_cpus =HVM_MAX_VCPUS ;
hw/loongarch/virt.c +0 -1
@@ -1471,7 +1471,6 @@ static void virt_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ; mc->no_cdrom =1 ; - mc->auto_create_sdcard = true; mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = virt_cpu_index_to_props; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;
hw/m68k/an5206.c +0 -1
@@ -99,7 +99,6 @@ static void an5206_machine_init(MachineClass *mc) mc->init = an5206_init; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m5206" ); mc->default_ram_id ="an5206.ram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("an5206" , an5206_machine_init)
hw/m68k/mcf5208.c +0 -1
@@ -398,7 +398,6 @@ static void mcf5208evb_machine_init(MachineClass *mc) mc->is_default = true; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m5208" ); mc->default_ram_id ="mcf5208.ram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("mcf5208evb" , mcf5208evb_machine_init)
hw/m68k/next-cube.c +0 -1
@@ -1359,7 +1359,6 @@ static void next_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_id ="next.ram" ; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m68040" ); mc->no_cdrom = true; - mc->auto_create_sdcard = true; }static const TypeInfo next_typeinfo = {
hw/m68k/q800.c +0 -1
@@ -743,7 +743,6 @@ static void q800_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ; mc->block_default_type =IF_SCSI ; mc->default_ram_id ="m68k_mac.ram" ; - mc->auto_create_sdcard = true;machine_add_audiodev_property (mc);compat_props_add (mc->compat_props, hw_compat_q800, hw_compat_q800_len);
hw/m68k/virt.c +0 -1
@@ -318,7 +318,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ; mc->no_floppy =1 ; mc->no_parallel =1 ; - mc->auto_create_sdcard = true; mc->default_ram_id ="m68k_virt.ram" ; }
hw/microblaze/petalogix_ml605_mmu.c +0 -1
@@ -223,7 +223,6 @@ static void petalogix_ml605_machine_init(MachineClass *mc) mc->desc ="PetaLogix linux refdesign for xilinx ml605 (little endian)" ;#endif mc->init = petalogix_ml605_init; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("petalogix-ml605" , petalogix_ml605_machine_init)
hw/microblaze/petalogix_s3adsp1800_mmu.c +0 -1
@@ -146,7 +146,6 @@ static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) mc->desc ="PetaLogix linux refdesign for xilinx Spartan 3ADSP1800" ; mc->init = petalogix_s3adsp1800_init; mc->is_default = true; - mc->auto_create_sdcard = true; }static const TypeInfo petalogix_s3adsp1800_machine_types[] = {
hw/microblaze/xlnx-zynqmp-pmu.c +0 -1
@@ -188,7 +188,6 @@ static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) mc->desc ="Xilinx ZynqMP PMU machine (little endian)" ;#endif mc->init = xlnx_zynqmp_pmu_init; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("xlnx-zynqmp-pmu" , xlnx_zynqmp_pmu_machine_init)
hw/mips/boston.c +0 -1
@@ -842,7 +842,6 @@ static void boston_mach_class_init(MachineClass *mc) mc->default_ram_id ="boston.ddr" ; mc->max_cpus =16 ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("I6400" ); - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("boston" , boston_mach_class_init)
hw/mips/fuloong2e.c +0 -1
@@ -335,7 +335,6 @@ static void mips_fuloong2e_machine_init(MachineClass *mc) mc->default_ram_size =256 * MiB; mc->default_ram_id ="fuloong2e.ram" ; mc->minimum_page_bits =14 ; - mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/mips/jazz.c +0 -2
@@ -424,7 +424,6 @@ static void mips_magnum_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("R4000" ); mc->default_ram_id ="mips_jazz.ram" ; - mc->auto_create_sdcard = true; }static const TypeInfo mips_magnum_type = {
@@ -442,7 +441,6 @@ static void mips_pica61_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("R4000" ); mc->default_ram_id ="mips_jazz.ram" ; - mc->auto_create_sdcard = true; }static const TypeInfo mips_pica61_type = {
hw/mips/loongson3_virt.c +0 -1
@@ -679,7 +679,6 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size =1600 * MiB; mc->minimum_page_bits =14 ; mc->default_nic ="virtio-net-pci" ; - mc->auto_create_sdcard = true; }static const TypeInfo loongson3_machine_types[] = {
hw/mips/malta.c +0 -1
@@ -1306,7 +1306,6 @@ static void mips_malta_machine_init(MachineClass *mc) mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("24Kf" );#endif mc->default_ram_id ="mips_malta.ram" ; - mc->auto_create_sdcard = true;compat_props_add (mc->compat_props, malta_compat, malta_compat_len); }
hw/mips/mipssim.c +0 -1
@@ -247,7 +247,6 @@ static void mips_mipssim_machine_init(MachineClass *mc) mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("24Kf" );#endif mc->default_ram_id ="mips_mipssim.ram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("mipssim" , mips_mipssim_machine_init)
hw/openrisc/openrisc_sim.c +0 -1
@@ -368,7 +368,6 @@ static void openrisc_sim_machine_init(ObjectClass *oc, void *data) mc->max_cpus =OR1KSIM_CPUS_MAX ; mc->is_default = true; mc->default_cpu_type =OPENRISC_CPU_TYPE_NAME ("or1200" ); - mc->auto_create_sdcard = true; }static const TypeInfo or1ksim_machine_typeinfo = {
hw/openrisc/virt.c +0 -1
@@ -554,7 +554,6 @@ static void openrisc_virt_machine_init(ObjectClass *oc, void *data) mc->max_cpus =VIRT_CPUS_MAX ; mc->is_default = false; mc->default_cpu_type =OPENRISC_CPU_TYPE_NAME ("or1200" ); - mc->auto_create_sdcard = true; }static const TypeInfo or1ksim_machine_typeinfo = {
hw/ppc/amigaone.c +0 -1
@@ -173,7 +173,6 @@ static void amigaone_machine_init(MachineClass *mc) mc->default_display ="std" ; mc->default_ram_id ="ram" ; mc->default_ram_size =512 * MiB; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("amigaone" , amigaone_machine_init)
hw/ppc/e500plat.c +0 -1
@@ -100,7 +100,6 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("e500v2_v30" ); mc->default_ram_id ="mpc8544ds.ram" ; mc->default_nic ="virtio-net-pci" ; - mc->auto_create_sdcard = true;machine_class_allow_dynamic_sysbus_dev (mc,TYPE_ETSEC_COMMON ); }
hw/ppc/mac_newworld.c +0 -1
@@ -580,7 +580,6 @@ static void core99_machine_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_display ="std" ; mc->default_nic ="sungem" ; - mc->auto_create_sdcard = true; mc->kvm_type = core99_kvm_type;#ifdef TARGET_PPC64 mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("970fx_v3.1" );
hw/ppc/mac_oldworld.c +0 -1
@@ -427,7 +427,6 @@ static void heathrow_class_init(ObjectClass *oc, void *data) mc->default_nic ="ne2k_pci" ; mc->ignore_boot_device_suffixes = true; mc->default_ram_id ="ppc_heathrow.ram" ; - mc->auto_create_sdcard = true; fwc->get_dev_path = heathrow_fw_dev_path; }
hw/ppc/mpc8544ds.c +0 -1
@@ -62,7 +62,6 @@ static void mpc8544ds_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("e500v2_v30" ); mc->default_ram_id ="mpc8544ds.ram" ; mc->default_nic ="virtio-net-pci" ; - mc->auto_create_sdcard = true; }#define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")
hw/ppc/pegasos2.c +0 -1
@@ -604,7 +604,6 @@ static void pegasos2_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("7457_v1.2" ); mc->default_ram_id ="pegasos2.ram" ; mc->default_ram_size =512 * MiB; - mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); vhc->cpu_in_nested = pegasos2_cpu_in_nested;
hw/ppc/pnv.c +0 -1
@@ -2878,7 +2878,6 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)/* Pnv provides a AHCI device for storage */ mc->block_default_type =IF_IDE ; mc->no_parallel =1 ; - mc->auto_create_sdcard = true; mc->default_boot_order =NULL ;/* * RAM defaults to less than 2048 for 32-bit hosts, and large
hw/ppc/ppc405_boards.c +0 -1
@@ -351,7 +351,6 @@ static void ppc405_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size =128 * MiB; mc->default_ram_id ="ppc405.ram" ; mc->deprecation_reason ="machine is old and unmaintained" ; - mc->auto_create_sdcard = true; }static const TypeInfo ppc405_machine_type = {
hw/ppc/ppc440_bamboo.c +0 -1
@@ -268,7 +268,6 @@ static void bamboo_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("440epb" ); mc->default_ram_id ="ppc4xx.sdram" ; mc->default_nic ="e1000" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("bamboo" , bamboo_machine_init)
hw/ppc/prep.c +0 -1
@@ -428,7 +428,6 @@ static void ibm_40p_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("604" ); mc->default_display ="std" ; mc->default_nic ="pcnet" ; - mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/ppc/sam460ex.c +0 -1
@@ -524,7 +524,6 @@ static void sam460ex_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("460exb" ); mc->default_ram_size =512 * MiB; mc->default_ram_id ="ppc4xx.sdram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("sam460ex" , sam460ex_machine_init)
hw/ppc/spapr.c +0 -1
@@ -4594,7 +4594,6 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =SPAPR_IRQ_NR_IPIS ; mc->no_parallel =1 ; - mc->auto_create_sdcard = true; mc->default_boot_order ="" ; mc->default_ram_size =512 * MiB; mc->default_ram_id ="ppc_spapr.ram" ;
hw/ppc/virtex_ml507.c +0 -1
@@ -289,7 +289,6 @@ static void virtex_machine_init(MachineClass *mc) mc->init = virtex_init; mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("440-xilinx" ); mc->default_ram_id ="ram" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("virtex-ml507" , virtex_machine_init)
hw/remote/machine.c +0 -1
@@ -128,7 +128,6 @@ static void remote_machine_class_init(ObjectClass *oc, void *data) mc->init = remote_machine_init; mc->desc ="Experimental remote machine" ; - mc->auto_create_sdcard = true; hc->unplug = remote_machine_dev_unplug_cb;
hw/rx/rx-gdbsim.c +0 -1
@@ -166,7 +166,6 @@ static void rx_gdbsim_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RX62N_CPU ; mc->default_ram_size =16 * MiB; mc->default_ram_id ="ext-sdram" ; - mc->auto_create_sdcard = true; }static void rx62n7_class_init (ObjectClass *oc,void *data)
hw/sh4/r2d.c +0 -1
@@ -383,7 +383,6 @@ static void r2d_machine_init(MachineClass *mc) mc->block_default_type =IF_IDE ; mc->default_cpu_type =TYPE_SH7751R_CPU ; mc->default_nic ="rtl8139" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("r2d" , r2d_machine_init)
hw/sparc/leon3.c +0 -1
@@ -440,7 +440,6 @@ static void leon3_generic_machine_init(MachineClass *mc) mc->default_cpu_type =SPARC_CPU_TYPE_NAME ("LEON3" ); mc->default_ram_id ="leon3.ram" ; mc->max_cpus =MAX_CPUS ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("leon3_generic" , leon3_generic_machine_init)
hw/sparc/sun4m.c +0 -1
@@ -1113,7 +1113,6 @@ static void sun4m_machine_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="c" ; mc->default_display ="tcx" ; mc->default_ram_id ="sun4m.ram" ; - mc->auto_create_sdcard = true; }static void ss5_class_init (ObjectClass *oc,void *data)
hw/sparc64/niagara.c +0 -1
@@ -167,7 +167,6 @@ static void niagara_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="c" ; mc->default_cpu_type =SPARC_CPU_TYPE_NAME ("Sun-UltraSparc-T1" ); mc->default_ram_id ="sun4v-partition.ram" ; - mc->auto_create_sdcard = true; }static const TypeInfo niagara_type = {
hw/sparc64/sun4u.c +0 -2
@@ -809,7 +809,6 @@ static void sun4u_class_init(ObjectClass *oc, void *data) mc->default_display ="std" ; mc->default_nic ="sunhme" ; mc->no_parallel = !module_object_class_by_name (TYPE_ISA_PARALLEL ); - mc->auto_create_sdcard = true; fwc->get_dev_path = sun4u_fw_dev_path;compat_props_add (mc->compat_props, hw_compat_sparc64, hw_compat_sparc64_len); }
@@ -837,7 +836,6 @@ static void sun4v_class_init(ObjectClass *oc, void *data) mc->default_display ="std" ; mc->default_nic ="sunhme" ; mc->no_parallel = !module_object_class_by_name (TYPE_ISA_PARALLEL ); - mc->auto_create_sdcard = true; }static const TypeInfo sun4v_type = {
hw/tricore/triboard.c +0 -1
@@ -73,7 +73,6 @@ static void triboard_machine_tc277d_class_init(ObjectClass *oc, mc->init = triboard_machine_init; mc->desc ="Infineon AURIX TriBoard TC277 (D-Step)" ; mc->max_cpus =1 ; - mc->auto_create_sdcard = true; amc->soc_name ="tc277d-soc" ; };
hw/tricore/tricore_testboard.c +0 -1
@@ -111,7 +111,6 @@ static void ttb_machine_init(MachineClass *mc) mc->desc ="a minimal TriCore board" ; mc->init = tricoreboard_init; mc->default_cpu_type =TRICORE_CPU_TYPE_NAME ("tc1796" ); - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("tricore_testboard" , ttb_machine_init)
hw/xen/xen-pvh-common.c +0 -1
@@ -381,7 +381,6 @@ static void xen_pvh_class_init(ObjectClass *oc, void *data) mc->default_machine_opts ="accel=xen" ;/* Set to zero to make sure that the real ram size is passed. */ mc->default_ram_size =0 ; - mc->auto_create_sdcard = true; }static const TypeInfo xen_pvh_info = {
hw/xenpv/xen_machine_pv.c +0 -1
@@ -67,7 +67,6 @@ static void xenpv_machine_init(MachineClass *mc) mc->init = xen_init_pv; mc->max_cpus =1 ; mc->default_machine_opts ="accel=xen" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("xenpv" , xenpv_machine_init)
hw/xtensa/sim.c +0 -1
@@ -125,7 +125,6 @@ static void xtensa_sim_machine_init(MachineClass *mc) mc->max_cpus =4 ; mc->no_serial =1 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("sim" , xtensa_sim_machine_init)
hw/xtensa/virt.c +0 -1
@@ -122,7 +122,6 @@ static void xtensa_virt_machine_init(MachineClass *mc) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_nic ="virtio-net-pci" ; - mc->auto_create_sdcard = true; }DEFINE_MACHINE ("virt" , xtensa_virt_machine_init)
hw/xtensa/xtfpga.c +0 -8
@@ -594,7 +594,6 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =64 * MiB; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx60_type = {
@@ -612,7 +611,6 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =64 * MiB; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx60_nommu_type = {
@@ -630,7 +628,6 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =96 * MiB; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx200_type = {
@@ -648,7 +645,6 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =96 * MiB; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx200_nommu_type = {
@@ -666,7 +662,6 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =512 * MiB -XTFPGA_MMU_RESERVED_MEMORY_SIZE ; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_ml605_type = {
@@ -684,7 +679,6 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =256 * MiB; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_ml605_nommu_type = {
@@ -702,7 +696,6 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =1 * GiB -XTFPGA_MMU_RESERVED_MEMORY_SIZE ; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_kc705_type = {
@@ -720,7 +713,6 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =256 * MiB; - mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_kc705_nommu_type = {
tests/qemu-iotests/172.out +0 -60
180 lines not on this page · raw message
Signature · 1 line
2.47.1
[PULL 18/32] hw/xen: Prefer QOM cast for XenLegacyDevice
In reply to Philippe Mathieu-DaudéFrom: Bernhard Beschow <[email protected]>
Makes the code less sensitive regarding changes in the class hierarchy which will be performed in the next patch.
Message-ID: <[email protected]>
--- hw/usb/xen-usb.c | 6 +++--- hw/xen/xen-legacy-backend.c | 2 +- hw/xen/xen_pvdev.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
hw/usb/xen-usb.c +3 -3
@@ -755,10 +755,10 @@ static void usbback_portid_add(struct usbback_info *usbif, unsigned port, qdict =qdict_new ();qdict_put_str (qdict,"driver" ,"usb-host" ); - tmp =g_strdup_printf ("%s.0" , usbif->xendev.qdev.id); + tmp =g_strdup_printf ("%s.0" ,DEVICE (&usbif->xendev)->id);qdict_put_str (qdict,"bus" , tmp);g_free (tmp); - tmp =g_strdup_printf ("%s-%u" , usbif->xendev.qdev.id, port); + tmp =g_strdup_printf ("%s-%u" ,DEVICE (&usbif->xendev)->id, port);qdict_put_str (qdict,"id" , tmp);g_free (tmp);qdict_put_int (qdict,"port" , port);
@@ -1022,7 +1022,7 @@ static void usbback_alloc(struct XenLegacyDevice *xendev) usbif = container_of(xendev, struct usbback_info, xendev);usb_bus_new (&usbif->bus,sizeof (usbif->bus), &xen_usb_bus_ops, -DEVICE (&xendev->qdev)); +DEVICE (xendev));for (i =0 ; i <USBBACK_MAXPORTS ; i++) { p = &(usbif->ports[i].port); usb_register_port(&usbif->bus, p, usbif, i, &xen_usb_port_ops,
hw/xen/xen-legacy-backend.c +1 -1
@@ -163,7 +163,7 @@ static struct XenLegacyDevice *xen_be_get_xendev(const char *type, int dom,/* init new xendev */ xendev =g_malloc0 (ops->size); -object_initialize (&xendev->qdev, ops->size,TYPE_XENBACKEND ); +object_initialize (xendev, ops->size,TYPE_XENBACKEND );OBJECT (xendev)->free = g_free;qdev_set_id (DEVICE (xendev),g_strdup_printf ("xen-%s-%d" , type, dev), &error_fatal);
hw/xen/xen_pvdev.c +1 -1
@@ -273,7 +273,7 @@ void xen_pv_del_xendev(struct XenLegacyDevice *xendev)QTAILQ_REMOVE (&xendevs, xendev, next); -qdev_unplug (&xendev->qdev,NULL ); +qdev_unplug (DEVICE (xendev),NULL ); }void xen_pv_insert_xendev (struct XenLegacyDevice *xendev)
Signature · 1 line
2.47.1
[PULL 14/32] hw/display: Have RAMFB device inherit from DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéBecause the RAM FB device can be optionally plugged on the TYPE_PLATFORM_BUS_DEVICE, have it inherit TYPE_DYNAMIC_SYS_BUS_DEVICE.
Message-Id: <[email protected]>
--- hw/display/ramfb-standalone.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/display/ramfb-standalone.c +1 -2
@@ -72,13 +72,12 @@ static void ramfb_class_initfn(ObjectClass *klass, void *data) dc->vmsd = &ramfb_dev_vmstate; dc->realize = ramfb_realizefn; dc->desc ="ram framebuffer standalone device" ; - dc->user_creatable = true;device_class_set_props (dc, ramfb_properties); }static const TypeInfo ramfb_info = { .name =TYPE_RAMFB_DEVICE , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_DYNAMIC_SYS_BUS_DEVICE , .instance_size =sizeof (RAMFBStandaloneState), .class_init = ramfb_class_initfn, };
Signature · 1 line
2.47.1
[PULL 17/32] hw/tpm: Have TPM TIS sysbus device inherit from DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéBecause the TPM TIS sysbus device can be optionally plugged on the TYPE_PLATFORM_BUS_DEVICE, have it inherit TYPE_DYNAMIC_SYS_BUS_DEVICE.
Message-Id: <[email protected]>
--- hw/tpm/tpm_tis_sysbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/tpm/tpm_tis_sysbus.c +1 -2
@@ -133,7 +133,6 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data) dc->vmsd = &vmstate_tpm_tis_sysbus; tc->model =TPM_MODEL_TPM_TIS ; dc->realize = tpm_tis_sysbus_realizefn; - dc->user_creatable = true;device_class_set_legacy_reset (dc, tpm_tis_sysbus_reset); tc->request_completed = tpm_tis_sysbus_request_completed; tc->get_version = tpm_tis_sysbus_get_tpm_version;
@@ -142,7 +141,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data)static const TypeInfo tpm_tis_sysbus_info = { .name =TYPE_TPM_TIS_SYSBUS , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_DYNAMIC_SYS_BUS_DEVICE , .instance_size =sizeof (TPMStateSysBus), .instance_init = tpm_tis_sysbus_initfn, .class_init = tpm_tis_sysbus_class_init,
Signature · 1 line
2.47.1
[PULL 29/32] tests/functional: Remove sleep() kludges from microblaze tests
In reply to Philippe Mathieu-DaudéCommit f0ec14c78c4 ("tests/avocado: Fix console data loss") fixed QEMUMachine's problem with console, we don't need to use the sleep() kludges.
Message-Id: <[email protected]>
--- tests/functional/test_microblazeel_s3adsp1800.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
tests/functional/test_microblazeel_s3adsp1800.py +3 -5
@@ -7,8 +7,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. -import time -from qemu_test import exec_command, exec_command_and_wait_for_pattern +from qemu_test import exec_command_and_wait_for_pattern from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern
@@ -31,9 +30,8 @@ def do_xmaton_le_test(self, machine): self.vm.add_args('-nic', f'user,tftp={tftproot}') self.vm.launch() wait_for_console_pattern(self, 'QEMU Advent Calendar 2023') - time.sleep(0.1) - exec_command(self, 'root') - time.sleep(0.1) + wait_for_console_pattern(self, 'buildroot login:') + exec_command_and_wait_for_pattern(self, 'root', '#') exec_command_and_wait_for_pattern(self, 'tftp -g -r xmaton.png 10.0.2.2 ; md5sum xmaton.png', '821cd3cab8efd16ad6ee5acc3642a8ea')
Signature · 1 line
2.47.1
[PULL 32/32] hw/net/smc91c111: Ignore attempt to pop from empty RX fifo
In reply to Philippe Mathieu-DaudéFrom: Peter Maydell <[email protected]>
The SMC91C111 includes an MMU Command register which permits the guest to remove entries from the RX FIFO. The datasheet does not specify what happens if the guest tries to do this when the FIFO is already empty; there are no status registers containing error bits which might be applicable.
Currently we don't guard at all against pop of an empty RX FIFO, with the result that we allow the guest to drive the rx_fifo_len index to negative values, which will cause smc91c111_receive() to write to the rx_fifo[] array out of bounds when we receive the next packet.
Instead ignore attempts to pop an empty RX FIFO.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2780
Message-ID: <[email protected]>
--- hw/net/smc91c111.c | 9 +++++++++ 1 file changed, 9 insertions(+)
hw/net/smc91c111.c +9 -0
@@ -182,6 +182,15 @@ static void smc91c111_pop_rx_fifo(smc91c111_state *s) {int i; +if (s->rx_fifo_len ==0 ) { +/* +* The datasheet doesn't document what the behaviour is if the +* guest tries to pop an empty RX FIFO, and there's no obvious +* error status register to report it. Just ignore the attempt. +*/ +return ; + } + s->rx_fifo_len--;if (s->rx_fifo_len) {for (i =0 ; i < s->rx_fifo_len; i++)
Signature · 1 line
2.47.1
[PULL 25/32] hw/riscv: Remove all invalid uses of auto_create_sdcard=true
In reply to Philippe Mathieu-DaudéMachineClass::auto_create_sdcard is only useful to automatically create a SD card, attach a IF_SD block drive to it and plug the card onto a SD bus. None of the RISCV machines modified by this commit try to use the IF_SD interface.
Message-Id: <[email protected]>
--- hw/riscv/opentitan.c | 1 - hw/riscv/shakti_c.c | 1 - hw/riscv/sifive_e.c | 1 - hw/riscv/spike.c | 1 - hw/riscv/virt.c | 1 - 5 files changed, 5 deletions(-)
hw/riscv/opentitan.c +0 -1
@@ -121,7 +121,6 @@ static void opentitan_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_IBEX ; mc->default_ram_id ="riscv.lowrisc.ibex.ram" ; mc->default_ram_size = ibex_memmap[IBEX_DEV_RAM ].size; - mc->auto_create_sdcard = true; }static void lowrisc_ibex_soc_init (Object *obj)
hw/riscv/shakti_c.c +0 -1
@@ -84,7 +84,6 @@ static void shakti_c_machine_class_init(ObjectClass *klass, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_SHAKTI_C ; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id ="riscv.shakti.c.ram" ; - mc->auto_create_sdcard = true; }static const TypeInfo shakti_c_machine_type_info = {
hw/riscv/sifive_e.c +0 -1
@@ -153,7 +153,6 @@ static void sifive_e_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =SIFIVE_E_CPU ; mc->default_ram_id ="riscv.sifive.e.ram" ; mc->default_ram_size = sifive_e_memmap[SIFIVE_E_DEV_DTIM ].size; - mc->auto_create_sdcard = true;object_class_property_add_bool (oc,"revb" , sifive_e_machine_get_revb, sifive_e_machine_set_revb);
hw/riscv/spike.c +0 -1
@@ -358,7 +358,6 @@ static void spike_machine_class_init(ObjectClass *oc, void *data)/* platform instead of architectural choice */ mc->cpu_cluster_has_numa_boundary = true; mc->default_ram_id ="riscv.spike.ram" ; - mc->auto_create_sdcard = true;object_class_property_add_str (oc,"signature" ,NULL , spike_set_signature);object_class_property_set_description (oc,"signature" ,"File to write ACT test signature" );
hw/riscv/virt.c +0 -1
@@ -1918,7 +1918,6 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_BASE ; mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; - mc->auto_create_sdcard = true; mc->pci_allow_0_address = true; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;
Signature · 1 line
2.47.1
[PULL 30/32] tests/functional: Have microblaze tests inherit common parent class
In reply to Philippe Mathieu-DaudéHave the MicroblazeMachine class being common to both MicroblazeBigEndianMachine and MicroblazeLittleEndianMachine classes. Move the xmaton and ballerina tests to the parent class.
Message-Id: <[email protected]>
--- .../functional/test_microblaze_s3adsp1800.py | 23 +++++++++++++++ .../test_microblazeel_s3adsp1800.py | 29 ++----------------- 2 files changed, 26 insertions(+), 26 deletions(-)
tests/functional/test_microblaze_s3adsp1800.py +23 -0
@@ -7,6 +7,7 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. +from qemu_test import exec_command_and_wait_for_pattern from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern
@@ -20,6 +21,10 @@ class MicroblazeMachine(QemuSystemTest): 'day17.tar.xz'), '3ba7439dfbea7af4876662c97f8e1f0cdad9231fc166e4861d17042489270057') + ASSET_IMAGE_LE = Asset( + ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), + 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22') + def do_ballerina_be_test(self, machine): self.set_machine(machine) self.archive_extract(self.ASSET_IMAGE_BE)
@@ -34,6 +39,24 @@ def do_ballerina_be_test(self, machine): # message, that's why we don't test for a later string here. This # needs some investigation by a microblaze wizard one day... + def do_xmaton_le_test(self, machine): + self.require_netdev('user') + self.set_machine(machine) + self.archive_extract(self.ASSET_IMAGE_LE) + self.vm.set_console() + self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin')) + tftproot = self.scratch_file('day13') + self.vm.add_args('-nic', f'user,tftp={tftproot}') + self.vm.launch() + wait_for_console_pattern(self, 'QEMU Advent Calendar 2023') + wait_for_console_pattern(self, 'buildroot login:') + exec_command_and_wait_for_pattern(self, 'root', '#') + exec_command_and_wait_for_pattern(self, + 'tftp -g -r xmaton.png 10.0.2.2 ; md5sum xmaton.png', + '821cd3cab8efd16ad6ee5acc3642a8ea') + +class MicroblazeBigEndianMachine(MicroblazeMachine): + def test_microblaze_s3adsp1800_legacy_be(self): self.do_ballerina_be_test('petalogix-s3adsp1800')
tests/functional/test_microblazeel_s3adsp1800.py +3 -26
@@ -7,34 +7,11 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. -from qemu_test import exec_command_and_wait_for_pattern -from qemu_test import QemuSystemTest, Asset -from qemu_test import wait_for_console_pattern +from qemu_test import QemuSystemTest +from test_microblaze_s3adsp1800 import MicroblazeMachine -class MicroblazeelMachine(QemuSystemTest): - - timeout = 90 - - ASSET_IMAGE_LE = Asset( - ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), - 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22') - - def do_xmaton_le_test(self, machine): - self.require_netdev('user') - self.set_machine(machine) - self.archive_extract(self.ASSET_IMAGE_LE) - self.vm.set_console() - self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin')) - tftproot = self.scratch_file('day13') - self.vm.add_args('-nic', f'user,tftp={tftproot}') - self.vm.launch() - wait_for_console_pattern(self, 'QEMU Advent Calendar 2023') - wait_for_console_pattern(self, 'buildroot login:') - exec_command_and_wait_for_pattern(self, 'root', '#') - exec_command_and_wait_for_pattern(self, - 'tftp -g -r xmaton.png 10.0.2.2 ; md5sum xmaton.png', - '821cd3cab8efd16ad6ee5acc3642a8ea') +class MicroblazeLittleEndianMachine(MicroblazeMachine): def test_microblaze_s3adsp1800_legacy_le(self): self.do_xmaton_le_test('petalogix-s3adsp1800')
Signature · 1 line
2.47.1
[PULL 07/32] hw/arm/xlnx-zynqmp: Use &error_abort for programming errors
In reply to Philippe Mathieu-DaudéWhen a property value is static (not provided by QMP or CLI), error shouldn't happen, otherwise it is a programming error. Therefore simplify and use &error_abort as this can't fail.
Message-Id: <[email protected]>
--- hw/arm/xlnx-zynqmp.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-)
hw/arm/xlnx-zynqmp.c +12 -26
@@ -689,16 +689,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)* - SDIO Specification Version 3.0 * - eMMC Specification Version 4.51 */ -if (!object_property_set_uint (sdhci,"sd-spec-version" ,3 , errp)) { -return ; - } -if (!object_property_set_uint (sdhci,"capareg" ,SDHCI_CAPABILITIES , - errp)) { -return ; - } -if (!object_property_set_uint (sdhci,"uhs" ,UHS_I , errp)) { -return ; - } +object_property_set_uint (sdhci,"sd-spec-version" ,3 , &error_abort); +object_property_set_uint (sdhci,"capareg" ,SDHCI_CAPABILITIES , + &error_abort); +object_property_set_uint (sdhci,"uhs" ,UHS_I , &error_abort);if (!sysbus_realize (SYS_BUS_DEVICE (sdhci), errp)) {return ; }
@@ -763,14 +757,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)xlnx_zynqmp_create_unimp_mmio (s);for (i =0 ; i <XLNX_ZYNQMP_NUM_GDMA_CH ; i++) { -if (!object_property_set_uint (OBJECT (&s->gdma[i]),"bus-width" ,128 , - errp)) { -return ; - } -if (!object_property_set_link (OBJECT (&s->gdma[i]),"dma" , -OBJECT (system_memory), errp)) { -return ; - } +object_property_set_uint (OBJECT (&s->gdma[i]),"bus-width" ,128 , + &error_abort); +object_property_set_link (OBJECT (&s->gdma[i]),"dma" , +OBJECT (system_memory), &error_abort);if (!sysbus_realize (SYS_BUS_DEVICE (&s->gdma[i]), errp)) {return ; }
@@ -811,10 +801,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)sysbus_connect_irq (SYS_BUS_DEVICE (&s->qspi_dma),0 ,qdev_get_gpio_in (DEVICE (&s->qspi_irq_orgate),0 )); -if (!object_property_set_link (OBJECT (&s->qspi),"stream-connected-dma" , -OBJECT (&s->qspi_dma), errp)) { -return ; - } +object_property_set_link (OBJECT (&s->qspi),"stream-connected-dma" , +OBJECT (&s->qspi_dma), &error_abort);if (!sysbus_realize (SYS_BUS_DEVICE (&s->qspi), errp)) {return ; }
@@ -833,10 +821,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) }for (i =0 ; i <XLNX_ZYNQMP_NUM_USB ; i++) { -if (!object_property_set_link (OBJECT (&s->usb[i].sysbus_xhci),"dma" , -OBJECT (system_memory), errp)) { -return ; - } +object_property_set_link (OBJECT (&s->usb[i].sysbus_xhci),"dma" , +OBJECT (system_memory), &error_abort);qdev_prop_set_uint32 (DEVICE (&s->usb[i].sysbus_xhci),"intrs" ,4 );qdev_prop_set_uint32 (DEVICE (&s->usb[i].sysbus_xhci),"slots" ,2 );
Signature · 1 line
2.47.1
[PULL 27/32] tests/functional: Explicit endianness of microblaze assets
In reply to Philippe Mathieu-DaudéThe archive used in test_microblaze_s3adsp1800.py (testing a big-endian target) contains a big-endian kernel. Rename using the _BE suffix.
Similarly, the archive in test_microblazeel_s3adsp1800 (testing a little-endian target) contains a little-endian kernel. Rename using _LE suffix.
These changes will help when adding cross-endian kernel tests.
Message-Id: <[email protected]>
--- tests/functional/test_microblaze_s3adsp1800.py | 6 +++--- tests/functional/test_microblazeel_s3adsp1800.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
tests/functional/test_microblaze_s3adsp1800.py +3 -3
@@ -15,14 +15,14 @@ class MicroblazeMachine(QemuSystemTest): timeout = 90 - ASSET_IMAGE = Asset( + ASSET_IMAGE_BE = Asset( ('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/' 'day17.tar.xz'), '3ba7439dfbea7af4876662c97f8e1f0cdad9231fc166e4861d17042489270057') - def test_microblaze_s3adsp1800(self): + def test_microblaze_s3adsp1800_be(self): self.set_machine('petalogix-s3adsp1800') - self.archive_extract(self.ASSET_IMAGE) + self.archive_extract(self.ASSET_IMAGE_BE) self.vm.set_console() self.vm.add_args('-kernel', self.scratch_file('day17', 'ballerina.bin'))
tests/functional/test_microblazeel_s3adsp1800.py +3 -3
@@ -17,14 +17,14 @@ class MicroblazeelMachine(QemuSystemTest): timeout = 90 - ASSET_IMAGE = Asset( + ASSET_IMAGE_LE = Asset( ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22') - def test_microblazeel_s3adsp1800(self): + def test_microblazeel_s3adsp1800_le(self): self.require_netdev('user') self.set_machine('petalogix-s3adsp1800') - self.archive_extract(self.ASSET_IMAGE) + self.archive_extract(self.ASSET_IMAGE_LE) self.vm.set_console() self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin')) tftproot = self.scratch_file('day13')
Signature · 1 line
2.47.1
[PULL 22/32] hw/boards: Rename no_sdcard -> auto_create_sdcard
In reply to Philippe Mathieu-DaudéInvert the 'no_sdcard' logic, renaming it as the more explicit "auto_create_sdcard". Machines are supposed to create a SD Card drive when this flag is set. In many cases it doesn't make much sense (as boards don't expose SD Card host controller), but this is patch only aims to expose that nonsense; so no logical change intended (mechanical patch using gsed).
Most of the changes are:
- mc->no_sdcard = ON_OFF_AUTO_OFF;
+ mc->auto_create_sdcard = true;
Except in
. hw/core/null-machine.c
. hw/arm/xilinx_zynq.c
. hw/s390x/s390-virtio-ccw.c
where the disabled option is manually removed (since default):
- mc->no_sdcard = ON_OFF_AUTO_ON; + mc->auto_create_sdcard = false; - mc->auto_create_sdcard = false;
and in system/vl.c we change the 'default_sdcard' type to boolean.
Message-Id: <[email protected]>
--- include/hw/boards.h | 2 +- hw/alpha/dp264.c | 2 +- hw/arm/aspeed.c | 42 ++++++++++++------------ hw/arm/b-l475e-iot01a.c | 2 +- hw/arm/bananapi_m2u.c | 2 +- hw/arm/collie.c | 2 +- hw/arm/cubieboard.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/exynos4_boards.c | 4 +-- hw/arm/fby35.c | 2 +- hw/arm/highbank.c | 4 +-- hw/arm/imx25_pdk.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/mcimx7d-sabre.c | 2 +- hw/arm/microbit.c | 2 +- hw/arm/mps2-tz.c | 8 ++--- hw/arm/mps2.c | 8 ++--- hw/arm/mps3r.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/musca.c | 4 +-- hw/arm/musicpal.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/npcm7xx_boards.c | 10 +++--- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/omap_sx1.c | 4 +-- hw/arm/orangepi.c | 2 +- hw/arm/raspi.c | 10 +++--- hw/arm/raspi4b.c | 2 +- hw/arm/realview.c | 8 ++--- hw/arm/sabrelite.c | 2 +- hw/arm/sbsa-ref.c | 2 +- hw/arm/stellaris.c | 4 +-- hw/arm/stm32vldiscovery.c | 2 +- hw/arm/versatilepb.c | 4 +-- hw/arm/vexpress.c | 4 +-- hw/arm/virt.c | 2 +- hw/arm/xen-pvh.c | 2 +- hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/xlnx-zcu102.c | 2 +- hw/avr/arduino.c | 2 +- hw/core/null-machine.c | 1 - hw/hppa/machine.c | 4 +-- hw/i386/pc.c | 2 +- hw/i386/x86.c | 2 +- hw/i386/xen/xen-pvh.c | 2 +- hw/loongarch/virt.c | 2 +- hw/m68k/an5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/m68k/next-cube.c | 2 +- hw/m68k/q800.c | 2 +- hw/m68k/virt.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- hw/microblaze/xlnx-zynqmp-pmu.c | 2 +- hw/mips/boston.c | 2 +- hw/mips/fuloong2e.c | 2 +- hw/mips/jazz.c | 4 +-- hw/mips/loongson3_virt.c | 2 +- hw/mips/malta.c | 2 +- hw/mips/mipssim.c | 2 +- hw/openrisc/openrisc_sim.c | 2 +- hw/openrisc/virt.c | 2 +- hw/ppc/amigaone.c | 2 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544ds.c | 2 +- hw/ppc/pegasos2.c | 2 +- hw/ppc/pnv.c | 2 +- hw/ppc/ppc405_boards.c | 2 +- hw/ppc/ppc440_bamboo.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/sam460ex.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/virtex_ml507.c | 2 +- hw/remote/machine.c | 2 +- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/opentitan.c | 2 +- hw/riscv/shakti_c.c | 2 +- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- hw/rx/rx-gdbsim.c | 2 +- hw/s390x/s390-virtio-ccw.c | 1 - hw/sh4/r2d.c | 2 +- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- hw/sparc64/niagara.c | 2 +- hw/sparc64/sun4u.c | 4 +-- hw/tricore/triboard.c | 2 +- hw/tricore/tricore_testboard.c | 2 +- hw/xen/xen-pvh-common.c | 2 +- hw/xenpv/xen_machine_pv.c | 2 +- hw/xtensa/sim.c | 2 +- hw/xtensa/virt.c | 2 +- hw/xtensa/xtfpga.c | 16 ++++----- system/vl.c | 9 +++-- 102 files changed, 156 insertions(+), 160 deletions(-)
include/hw/boards.h +1 -1
@@ -285,7 +285,7 @@ struct MachineClass { no_cdrom:1, pci_allow_0_address:1, legacy_fw_cfg_order:1; -OnOffAuto no_sdcard; +bool auto_create_sdcard;bool is_default;const char *default_machine_opts;const char *default_boot_order;
hw/alpha/dp264.c +1 -1
@@ -213,7 +213,7 @@ static void clipper_machine_init(MachineClass *mc) mc->default_cpu_type =ALPHA_CPU_TYPE_NAME ("ev67" ); mc->default_ram_id ="ram" ; mc->default_nic ="e1000" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("clipper" , clipper_machine_init)
hw/arm/aspeed.c +21 -21
168 lines not on this page · raw message
hw/arm/b-l475e-iot01a.c +1 -1
@@ -120,7 +120,7 @@ static void bl475e_machine_init(ObjectClass *oc, void *data) mc->desc ="B-L475E-IOT01A Discovery Kit (Cortex-M4)" ; mc->init = bl475e_init; mc->valid_cpu_types = machine_valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;/* SRAM pre-allocated as part of the SoC instantiation */ mc->default_ram_size =0 ;
hw/arm/bananapi_m2u.c +1 -1
@@ -141,7 +141,7 @@ static void bpim2u_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; mc->default_ram_size =1 * GiB; mc->default_ram_id ="bpim2u.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("bpim2u" , bpim2u_machine_init)
hw/arm/collie.c +1 -1
@@ -79,7 +79,7 @@ static void collie_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("sa1110" ); mc->default_ram_size =RAM_SIZE ; mc->default_ram_id ="strongarm.sdram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo collie_machine_typeinfo = {
hw/arm/cubieboard.c +1 -1
@@ -122,7 +122,7 @@ static void cubieboard_machine_init(MachineClass *mc) mc->units_per_default_bus =1 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="cubieboard.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("cubieboard" , cubieboard_machine_init)
hw/arm/digic_boards.c +1 -1
@@ -143,7 +143,7 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; mc->default_ram_size =64 * MiB; mc->default_ram_id ="ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("canon-a1100" , canon_a1100_machine_init)
hw/arm/exynos4_boards.c +2 -2
@@ -165,7 +165,7 @@ static void nuri_class_init(ObjectClass *oc, void *data) mc->min_cpus =EXYNOS4210_NCPUS ; mc->default_cpus =EXYNOS4210_NCPUS ; mc->ignore_memory_transaction_failures = true; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo nuri_type = {
@@ -185,7 +185,7 @@ static void smdkc210_class_init(ObjectClass *oc, void *data) mc->min_cpus =EXYNOS4210_NCPUS ; mc->default_cpus =EXYNOS4210_NCPUS ; mc->ignore_memory_transaction_failures = true; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo smdkc210_type = {
hw/arm/fby35.c +1 -1
@@ -170,7 +170,7 @@ static void fby35_class_init(ObjectClass *oc, void *data) mc->init = fby35_init; mc->no_floppy =1 ; mc->no_cdrom =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->min_cpus = mc->max_cpus = mc->default_cpus =3 ; object_class_property_add_bool(oc, "execute-in-place",
hw/arm/highbank.c +2 -2
@@ -357,7 +357,7 @@ static void highbank_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="highbank.dram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo highbank_type = {
@@ -382,7 +382,7 @@ static void midway_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="highbank.dram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo midway_type = {
hw/arm/imx25_pdk.c +1 -1
@@ -147,7 +147,7 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->init = imx25_pdk_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="imx25.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("imx25-pdk" , imx25_pdk_machine_init)
hw/arm/integratorcp.c +1 -1
@@ -688,7 +688,7 @@ static void integratorcp_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="integrator.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/arm/kzm.c +1 -1
@@ -137,7 +137,7 @@ static void kzm_machine_init(MachineClass *mc) mc->init = kzm_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="kzm.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("kzm" , kzm_machine_init)
hw/arm/mcimx6ul-evk.c +1 -1
@@ -74,6 +74,6 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->init = mcimx6ul_evk_init; mc->max_cpus =FSL_IMX6UL_NUM_CPUS ; mc->default_ram_id ="mcimx6ul-evk.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("mcimx6ul-evk" , mcimx6ul_evk_machine_init)
hw/arm/mcimx7d-sabre.c +1 -1
@@ -74,6 +74,6 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc) mc->init = mcimx7d_sabre_init; mc->max_cpus =FSL_IMX7_NUM_CPUS ; mc->default_ram_id ="mcimx7d-sabre.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("mcimx7d-sabre" , mcimx7d_sabre_machine_init)
hw/arm/microbit.c +1 -1
@@ -67,7 +67,7 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data) mc->desc ="BBC micro:bit (Cortex-M0)" ; mc->init = microbit_init; mc->max_cpus =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo microbit_info = {
hw/arm/mps2-tz.c +4 -4
@@ -1320,7 +1320,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN505 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41045050 ; mmc->sysclk_frq =20 *1000 *1000 ;/* 20MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1355,7 +1355,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN521 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41045210 ; mmc->sysclk_frq =20 *1000 *1000 ;/* 20MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1390,7 +1390,7 @@ static void mps3tz_an524_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN524 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41045240 ; mmc->sysclk_frq =32 *1000 *1000 ;/* 32MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1430,7 +1430,7 @@ static void mps3tz_an547_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN547 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m55" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41055470 ; mmc->sysclk_frq =32 *1000 *1000 ;/* 32MHz */ mmc->apb_periph_frq =25 *1000 *1000 ;/* 25MHz */
hw/arm/mps2.c +4 -4
@@ -487,7 +487,7 @@ static void mps2_an385_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN385 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41043850 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
@@ -507,7 +507,7 @@ static void mps2_an386_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN386 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m4" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41043860 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
@@ -527,7 +527,7 @@ static void mps2_an500_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN500 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m7" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41045000 ; mmc->psram_base =0x60000000 ; mmc->ethernet_base =0xa0000000 ;
@@ -547,7 +547,7 @@ static void mps2_an511_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN511 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->scc_id =0x41045110 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
hw/arm/mps3r.c +1 -1
@@ -618,7 +618,7 @@ static void mps3r_an536_class_init(ObjectClass *oc, void *data) mc->max_cpus =2 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-r52" ); mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->raminfo = an536_raminfo;mps3r_set_default_ram_info (mmc); }
hw/arm/msf2-som.c +1 -1
@@ -106,7 +106,7 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->desc ="SmartFusion2 SOM kit from Emcraft (M2S010)" ; mc->init = emcraft_sf2_s2s010_init; mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("emcraft-sf2" , emcraft_sf2_machine_init)
hw/arm/musca.c +2 -2
@@ -615,7 +615,7 @@ static void musca_a_class_init(ObjectClass *oc, void *data)MuscaMachineClass *mmc =MUSCA_MACHINE_CLASS (oc); mc->desc ="ARM Musca-A board (dual Cortex-M33)" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->type =MUSCA_A ; mmc->init_svtor =0x10200000 ; mmc->sram_addr_width =15 ;
@@ -630,7 +630,7 @@ static void musca_b1_class_init(ObjectClass *oc, void *data)MuscaMachineClass *mmc =MUSCA_MACHINE_CLASS (oc); mc->desc ="ARM Musca-B1 board (dual Cortex-M33)" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mmc->type =MUSCA_B1 ;/* * This matches the DAPlink firmware which boots from QSPI. There
hw/arm/musicpal.c +1 -1
@@ -1342,7 +1342,7 @@ static void musicpal_machine_init(MachineClass *mc) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_size =MP_RAM_DEFAULT_SIZE ; mc->default_ram_id ="musicpal.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/arm/netduino2.c +1 -1
@@ -63,7 +63,7 @@ static void netduino2_machine_init(MachineClass *mc) mc->init = netduino2_init; mc->valid_cpu_types = valid_cpu_types; mc->ignore_memory_transaction_failures = true; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("netduino2" , netduino2_machine_init)
hw/arm/netduinoplus2.c +1 -1
@@ -63,7 +63,7 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->desc ="Netduino Plus 2 Machine (Cortex-M4)" ; mc->init = netduinoplus2_init; mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("netduinoplus2" , netduinoplus2_machine_init)
hw/arm/npcm7xx_boards.c +5 -5
@@ -481,7 +481,7 @@ static void npcm750_evb_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Nuvoton NPCM750 Evaluation Board (Cortex-A9)" ; mc->init = npcm750_evb_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_size =512 * MiB; };
@@ -494,7 +494,7 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Quanta GSJ (Cortex-A9)" ; mc->init = quanta_gsj_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_size =512 * MiB; };
@@ -507,7 +507,7 @@ static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Quanta GBS (Cortex-A9)" ; mc->init = quanta_gbs_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_size =1 * GiB; }
@@ -520,7 +520,7 @@ static void kudo_bmc_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Kudo BMC (Cortex-A9)" ; mc->init = kudo_bmc_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_size =1 * GiB; };
@@ -533,7 +533,7 @@ static void mori_bmc_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Mori BMC (Cortex-A9)" ; mc->init = mori_bmc_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_size =1 * GiB; }
hw/arm/olimex-stm32-h405.c +1 -1
@@ -66,7 +66,7 @@ static void olimex_stm32_h405_machine_init(MachineClass *mc) mc->desc ="Olimex STM32-H405 (Cortex-M4)" ; mc->init = olimex_stm32_h405_init; mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;/* SRAM pre-allocated as part of the SoC instantiation */ mc->default_ram_size =0 ;
hw/arm/omap_sx1.c +2 -2
@@ -216,7 +216,7 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("ti925t" ); mc->default_ram_size =SDRAM_SIZE ; mc->default_ram_id ="omap1.dram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo sx1_machine_v2_type = {
@@ -235,7 +235,7 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("ti925t" ); mc->default_ram_size =SDRAM_SIZE ; mc->default_ram_id ="omap1.dram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo sx1_machine_v1_type = {
hw/arm/orangepi.c +1 -1
@@ -121,7 +121,7 @@ static void orangepi_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; mc->default_ram_size =1 * GiB; mc->default_ram_id ="orangepi.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("orangepi-pc" , orangepi_machine_init)
hw/arm/raspi.c +5 -5
@@ -342,7 +342,7 @@ static void raspi0_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; rmc->board_rev =0x920092 ;/* Revision 1.2 */ raspi_machine_class_init (mc, rmc->board_rev); };
@@ -352,7 +352,7 @@ static void raspi1ap_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; rmc->board_rev =0x900021 ;/* Revision 1.1 */ raspi_machine_class_init (mc, rmc->board_rev); };
@@ -362,7 +362,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; rmc->board_rev =0xa21041 ;raspi_machine_class_init (mc, rmc->board_rev); };
@@ -373,7 +373,7 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; rmc->board_rev =0x9020e0 ;/* Revision 1.0 */ raspi_machine_class_init (mc, rmc->board_rev); };
@@ -383,7 +383,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; rmc->board_rev =0xa02082 ;raspi_machine_class_init (mc, rmc->board_rev); };
hw/arm/raspi4b.c +1 -1
@@ -118,7 +118,7 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev =0xb03115 ;/* Revision 1.5, 2 Gb RAM */ #endif raspi_machine_class_common_init (mc, rmc->board_rev); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->init = raspi4b_machine_init; }
hw/arm/realview.c +4 -4
@@ -415,7 +415,7 @@ static void realview_eb_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
@@ -436,7 +436,7 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm11mpcore" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
@@ -455,7 +455,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data) mc->init = realview_pb_a8_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-a8" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
@@ -475,7 +475,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-a9" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/arm/sabrelite.c +1 -1
@@ -110,7 +110,7 @@ static void sabrelite_machine_init(MachineClass *mc) mc->max_cpus =FSL_IMX6_NUM_CPUS ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="sabrelite.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("sabrelite" , sabrelite_machine_init)
hw/arm/sbsa-ref.c +1 -1
@@ -900,7 +900,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data) mc->minimum_page_bits =12 ; mc->block_default_type =IF_IDE ; mc->no_cdrom =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_nic ="e1000e" ; mc->default_ram_size =1 * GiB; mc->default_ram_id ="sbsa-ref.ram" ;
hw/arm/stellaris.c +2 -2
@@ -1421,7 +1421,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data) mc->init = lm3s811evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo lm3s811evb_type = {
@@ -1442,7 +1442,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data) mc->init = lm3s6965evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo lm3s6965evb_type = {
hw/arm/stm32vldiscovery.c +1 -1
@@ -66,7 +66,7 @@ static void stm32vldiscovery_machine_init(MachineClass *mc) mc->desc ="ST STM32VLDISCOVERY (Cortex-M3)" ; mc->init = stm32vldiscovery_init; mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("stm32vldiscovery" , stm32vldiscovery_machine_init)
hw/arm/versatilepb.c +2 -2
@@ -419,7 +419,7 @@ static void versatilepb_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="versatile.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
@@ -440,7 +440,7 @@ static void versatileab_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="versatile.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/arm/vexpress.c +2 -2
@@ -803,7 +803,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data) mc->desc ="ARM Versatile Express for Cortex-A9" ; mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; vmc->daughterboard = &a9_daughterboard; }
@@ -819,7 +819,7 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) mc->desc ="ARM Versatile Express for Cortex-A15" ; mc->valid_cpu_types = valid_cpu_types; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; vmc->daughterboard = &a15_daughterboard;
hw/arm/virt.c +1 -1
@@ -3125,7 +3125,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)#endif mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->pci_allow_0_address = true;/* We know we will never create a pre-ARMv7 CPU which needs 1K pages */ mc->minimum_page_bits =12 ;
hw/arm/xen-pvh.c +1 -1
@@ -75,7 +75,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)* mc->max_cpus, QEMU will bail out with an error message. */ mc->max_cpus =GUEST_MAX_VCPUS ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;/* Xen/ARM does not use buffered IOREQs. */ xpc->handle_bufioreq =HVM_IOREQSRV_BUFIOREQ_OFF ;
hw/arm/xilinx_zynq.c +0 -1
@@ -463,7 +463,6 @@ static void zynq_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Xilinx Zynq Platform Baseboard for Cortex-A9" ; mc->init = zynq_init; mc->max_cpus =ZYNQ_MAX_CPUS ; - mc->no_sdcard =ON_OFF_AUTO_ON ; mc->ignore_memory_transaction_failures = true; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id ="zynq.ext_ram" ;
hw/arm/xlnx-versal-virt.c +1 -1
@@ -818,7 +818,7 @@ static void versal_virt_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =XLNX_VERSAL_NR_ACPUS +XLNX_VERSAL_NR_RCPUS ; mc->default_cpus =XLNX_VERSAL_NR_ACPUS +XLNX_VERSAL_NR_RCPUS ; mc->no_cdrom = true; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_id ="ddr" ;object_class_property_add_str (oc,"ospi-flash" , versal_get_ospi_model, versal_set_ospi_model);
hw/arm/xlnx-zcu102.c +1 -1
@@ -280,7 +280,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =XLNX_ZYNQMP_NUM_APU_CPUS +XLNX_ZYNQMP_NUM_RPU_CPUS ; mc->default_cpus =XLNX_ZYNQMP_NUM_APU_CPUS ; mc->default_ram_id ="ddr-ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); object_class_property_add_bool(oc, "secure", zcu102_get_secure,
hw/avr/arduino.c +1 -1
@@ -67,7 +67,7 @@ static void arduino_machine_class_init(ObjectClass *oc, void *data) mc->no_floppy =1 ; mc->no_cdrom =1 ; mc->no_parallel =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static void arduino_duemilanove_class_init (ObjectClass *oc,void *data)
hw/core/null-machine.c +0 -1
@@ -53,7 +53,6 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_parallel =1 ; mc->no_floppy =1 ; mc->no_cdrom =1 ; - mc->no_sdcard =ON_OFF_AUTO_ON ; }DEFINE_MACHINE ("none" , machine_none_machine_init)
hw/hppa/machine.c +2 -2
@@ -704,7 +704,7 @@ static void HP_B160L_machine_init_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_ram_id ="ram" ; mc->default_nic ="tulip" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; nc->nmi_monitor_handler = hppa_nmi; }
@@ -741,7 +741,7 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_ram_id ="ram" ; mc->default_nic ="tulip" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; nc->nmi_monitor_handler = hppa_nmi; }
hw/i386/pc.c +1 -1
@@ -1799,7 +1799,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->smp_props.dies_supported = true; mc->smp_props.modules_supported = true; mc->default_ram_id ="pc.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; pcmc->default_smbios_ep_type =SMBIOS_ENTRY_POINT_TYPE_AUTO ; object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",
hw/i386/x86.c +1 -1
@@ -382,7 +382,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; x86mc->save_tsc_khz = true; x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi;
hw/i386/xen/xen-pvh.c +1 -1
@@ -82,7 +82,7 @@ static void xen_pvh_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Xen PVH x86 machine" ; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;/* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */ mc->max_cpus =HVM_MAX_VCPUS ;
hw/loongarch/virt.c +1 -1
@@ -1471,7 +1471,7 @@ static void virt_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ; mc->no_cdrom =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = virt_cpu_index_to_props; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;
hw/m68k/an5206.c +1 -1
@@ -99,7 +99,7 @@ static void an5206_machine_init(MachineClass *mc) mc->init = an5206_init; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m5206" ); mc->default_ram_id ="an5206.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("an5206" , an5206_machine_init)
hw/m68k/mcf5208.c +1 -1
@@ -398,7 +398,7 @@ static void mcf5208evb_machine_init(MachineClass *mc) mc->is_default = true; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m5208" ); mc->default_ram_id ="mcf5208.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("mcf5208evb" , mcf5208evb_machine_init)
hw/m68k/next-cube.c +1 -1
@@ -1359,7 +1359,7 @@ static void next_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_id ="next.ram" ; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m68040" ); mc->no_cdrom = true; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo next_typeinfo = {
hw/m68k/q800.c +1 -1
@@ -743,7 +743,7 @@ static void q800_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ; mc->block_default_type =IF_SCSI ; mc->default_ram_id ="m68k_mac.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc);compat_props_add (mc->compat_props, hw_compat_q800, hw_compat_q800_len);
hw/m68k/virt.c +1 -1
@@ -318,7 +318,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ; mc->no_floppy =1 ; mc->no_parallel =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_ram_id ="m68k_virt.ram" ; }
hw/microblaze/petalogix_ml605_mmu.c +1 -1
@@ -223,7 +223,7 @@ static void petalogix_ml605_machine_init(MachineClass *mc) mc->desc ="PetaLogix linux refdesign for xilinx ml605 (little endian)" ;#endif mc->init = petalogix_ml605_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("petalogix-ml605" , petalogix_ml605_machine_init)
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -1
@@ -146,7 +146,7 @@ static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) mc->desc ="PetaLogix linux refdesign for xilinx Spartan 3ADSP1800" ; mc->init = petalogix_s3adsp1800_init; mc->is_default = true; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo petalogix_s3adsp1800_machine_types[] = {
hw/microblaze/xlnx-zynqmp-pmu.c +1 -1
@@ -188,7 +188,7 @@ static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) mc->desc ="Xilinx ZynqMP PMU machine (little endian)" ;#endif mc->init = xlnx_zynqmp_pmu_init; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("xlnx-zynqmp-pmu" , xlnx_zynqmp_pmu_machine_init)
hw/mips/boston.c +1 -1
@@ -842,7 +842,7 @@ static void boston_mach_class_init(MachineClass *mc) mc->default_ram_id ="boston.ddr" ; mc->max_cpus =16 ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("I6400" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("boston" , boston_mach_class_init)
hw/mips/fuloong2e.c +1 -1
@@ -335,7 +335,7 @@ static void mips_fuloong2e_machine_init(MachineClass *mc) mc->default_ram_size =256 * MiB; mc->default_ram_id ="fuloong2e.ram" ; mc->minimum_page_bits =14 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/mips/jazz.c +2 -2
@@ -424,7 +424,7 @@ static void mips_magnum_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("R4000" ); mc->default_ram_id ="mips_jazz.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo mips_magnum_type = {
@@ -442,7 +442,7 @@ static void mips_pica61_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("R4000" ); mc->default_ram_id ="mips_jazz.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo mips_pica61_type = {
hw/mips/loongson3_virt.c +1 -1
@@ -679,7 +679,7 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size =1600 * MiB; mc->minimum_page_bits =14 ; mc->default_nic ="virtio-net-pci" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo loongson3_machine_types[] = {
hw/mips/malta.c +1 -1
@@ -1306,7 +1306,7 @@ static void mips_malta_machine_init(MachineClass *mc) mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("24Kf" );#endif mc->default_ram_id ="mips_malta.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;compat_props_add (mc->compat_props, malta_compat, malta_compat_len); }
hw/mips/mipssim.c +1 -1
@@ -247,7 +247,7 @@ static void mips_mipssim_machine_init(MachineClass *mc) mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("24Kf" );#endif mc->default_ram_id ="mips_mipssim.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("mipssim" , mips_mipssim_machine_init)
hw/openrisc/openrisc_sim.c +1 -1
@@ -368,7 +368,7 @@ static void openrisc_sim_machine_init(ObjectClass *oc, void *data) mc->max_cpus =OR1KSIM_CPUS_MAX ; mc->is_default = true; mc->default_cpu_type =OPENRISC_CPU_TYPE_NAME ("or1200" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo or1ksim_machine_typeinfo = {
hw/openrisc/virt.c +1 -1
@@ -554,7 +554,7 @@ static void openrisc_virt_machine_init(ObjectClass *oc, void *data) mc->max_cpus =VIRT_CPUS_MAX ; mc->is_default = false; mc->default_cpu_type =OPENRISC_CPU_TYPE_NAME ("or1200" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo or1ksim_machine_typeinfo = {
hw/ppc/amigaone.c +1 -1
@@ -173,7 +173,7 @@ static void amigaone_machine_init(MachineClass *mc) mc->default_display ="std" ; mc->default_ram_id ="ram" ; mc->default_ram_size =512 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("amigaone" , amigaone_machine_init)
hw/ppc/e500plat.c +1 -1
@@ -100,7 +100,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("e500v2_v30" ); mc->default_ram_id ="mpc8544ds.ram" ; mc->default_nic ="virtio-net-pci" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_class_allow_dynamic_sysbus_dev (mc,TYPE_ETSEC_COMMON ); }
hw/ppc/mac_newworld.c +1 -1
@@ -580,7 +580,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_display ="std" ; mc->default_nic ="sungem" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->kvm_type = core99_kvm_type;#ifdef TARGET_PPC64 mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("970fx_v3.1" );
hw/ppc/mac_oldworld.c +1 -1
@@ -427,7 +427,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data) mc->default_nic ="ne2k_pci" ; mc->ignore_boot_device_suffixes = true; mc->default_ram_id ="ppc_heathrow.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; fwc->get_dev_path = heathrow_fw_dev_path; }
hw/ppc/mpc8544ds.c +1 -1
@@ -62,7 +62,7 @@ static void mpc8544ds_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("e500v2_v30" ); mc->default_ram_id ="mpc8544ds.ram" ; mc->default_nic ="virtio-net-pci" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }#define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")
hw/ppc/pegasos2.c +1 -1
@@ -604,7 +604,7 @@ static void pegasos2_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("7457_v1.2" ); mc->default_ram_id ="pegasos2.ram" ; mc->default_ram_size =512 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); vhc->cpu_in_nested = pegasos2_cpu_in_nested;
hw/ppc/pnv.c +1 -1
@@ -2878,7 +2878,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)/* Pnv provides a AHCI device for storage */ mc->block_default_type =IF_IDE ; mc->no_parallel =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_boot_order =NULL ;/* * RAM defaults to less than 2048 for 32-bit hosts, and large
hw/ppc/ppc405_boards.c +1 -1
@@ -351,7 +351,7 @@ static void ppc405_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size =128 * MiB; mc->default_ram_id ="ppc405.ram" ; mc->deprecation_reason ="machine is old and unmaintained" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo ppc405_machine_type = {
hw/ppc/ppc440_bamboo.c +1 -1
@@ -268,7 +268,7 @@ static void bamboo_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("440epb" ); mc->default_ram_id ="ppc4xx.sdram" ; mc->default_nic ="e1000" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("bamboo" , bamboo_machine_init)
hw/ppc/prep.c +1 -1
@@ -428,7 +428,7 @@ static void ibm_40p_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("604" ); mc->default_display ="std" ; mc->default_nic ="pcnet" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;machine_add_audiodev_property (mc); }
hw/ppc/sam460ex.c +1 -1
@@ -524,7 +524,7 @@ static void sam460ex_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("460exb" ); mc->default_ram_size =512 * MiB; mc->default_ram_id ="ppc4xx.sdram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("sam460ex" , sam460ex_machine_init)
hw/ppc/spapr.c +1 -1
@@ -4594,7 +4594,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =SPAPR_IRQ_NR_IPIS ; mc->no_parallel =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->default_boot_order ="" ; mc->default_ram_size =512 * MiB; mc->default_ram_id ="ppc_spapr.ram" ;
hw/ppc/virtex_ml507.c +1 -1
@@ -289,7 +289,7 @@ static void virtex_machine_init(MachineClass *mc) mc->init = virtex_init; mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("440-xilinx" ); mc->default_ram_id ="ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("virtex-ml507" , virtex_machine_init)
hw/remote/machine.c +1 -1
@@ -128,7 +128,7 @@ static void remote_machine_class_init(ObjectClass *oc, void *data) mc->init = remote_machine_init; mc->desc ="Experimental remote machine" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; hc->unplug = remote_machine_dev_unplug_cb;
hw/riscv/microchip_pfsoc.c +1 -1
@@ -650,7 +650,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data) mc->min_cpus =MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT +1 ; mc->default_cpus = mc->min_cpus; mc->default_ram_id ="microchip.icicle.kit.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;/* * Map 513 MiB high memory, the minimum required high memory size, because
hw/riscv/opentitan.c +1 -1
@@ -121,7 +121,7 @@ static void opentitan_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_IBEX ; mc->default_ram_id ="riscv.lowrisc.ibex.ram" ; mc->default_ram_size = ibex_memmap[IBEX_DEV_RAM ].size; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static void lowrisc_ibex_soc_init (Object *obj)
hw/riscv/shakti_c.c +1 -1
@@ -84,7 +84,7 @@ static void shakti_c_machine_class_init(ObjectClass *klass, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_SHAKTI_C ; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id ="riscv.shakti.c.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo shakti_c_machine_type_info = {
hw/riscv/sifive_e.c +1 -1
@@ -153,7 +153,7 @@ static void sifive_e_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =SIFIVE_E_CPU ; mc->default_ram_id ="riscv.sifive.e.ram" ; mc->default_ram_size = sifive_e_memmap[SIFIVE_E_DEV_DTIM ].size; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;object_class_property_add_bool (oc,"revb" , sifive_e_machine_get_revb, sifive_e_machine_set_revb);
hw/riscv/sifive_u.c +1 -1
@@ -724,7 +724,7 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =SIFIVE_U_CPU ; mc->default_cpus = mc->min_cpus; mc->default_ram_id ="riscv.sifive.u.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; object_class_property_add_bool(oc, "start-in-flash", sifive_u_machine_get_start_in_flash,
hw/riscv/spike.c +1 -1
@@ -358,7 +358,7 @@ static void spike_machine_class_init(ObjectClass *oc, void *data)/* platform instead of architectural choice */ mc->cpu_cluster_has_numa_boundary = true; mc->default_ram_id ="riscv.spike.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true;object_class_property_add_str (oc,"signature" ,NULL , spike_set_signature);object_class_property_set_description (oc,"signature" ,"File to write ACT test signature" );
hw/riscv/virt.c +1 -1
@@ -1918,7 +1918,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_BASE ; mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; mc->pci_allow_0_address = true; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;
hw/rx/rx-gdbsim.c +1 -1
@@ -166,7 +166,7 @@ static void rx_gdbsim_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RX62N_CPU ; mc->default_ram_size =16 * MiB; mc->default_ram_id ="ext-sdram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static void rx62n7_class_init (ObjectClass *oc,void *data)
hw/s390x/s390-virtio-ccw.c +0 -1
@@ -817,7 +817,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_cdrom =1 ; mc->no_floppy =1 ; mc->no_parallel =1 ; - mc->no_sdcard =ON_OFF_AUTO_ON ; mc->max_cpus =S390_MAX_CPUS ; mc->has_hotpluggable_cpus = true; mc->smp_props.books_supported = true;
hw/sh4/r2d.c +1 -1
@@ -383,7 +383,7 @@ static void r2d_machine_init(MachineClass *mc) mc->block_default_type =IF_IDE ; mc->default_cpu_type =TYPE_SH7751R_CPU ; mc->default_nic ="rtl8139" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("r2d" , r2d_machine_init)
hw/sparc/leon3.c +1 -1
@@ -440,7 +440,7 @@ static void leon3_generic_machine_init(MachineClass *mc) mc->default_cpu_type =SPARC_CPU_TYPE_NAME ("LEON3" ); mc->default_ram_id ="leon3.ram" ; mc->max_cpus =MAX_CPUS ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("leon3_generic" , leon3_generic_machine_init)
hw/sparc/sun4m.c +1 -1
@@ -1113,7 +1113,7 @@ static void sun4m_machine_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="c" ; mc->default_display ="tcx" ; mc->default_ram_id ="sun4m.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static void ss5_class_init (ObjectClass *oc,void *data)
hw/sparc64/niagara.c +1 -1
@@ -167,7 +167,7 @@ static void niagara_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="c" ; mc->default_cpu_type =SPARC_CPU_TYPE_NAME ("Sun-UltraSparc-T1" ); mc->default_ram_id ="sun4v-partition.ram" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo niagara_type = {
hw/sparc64/sun4u.c +2 -2
@@ -809,7 +809,7 @@ static void sun4u_class_init(ObjectClass *oc, void *data) mc->default_display ="std" ; mc->default_nic ="sunhme" ; mc->no_parallel = !module_object_class_by_name (TYPE_ISA_PARALLEL ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; fwc->get_dev_path = sun4u_fw_dev_path;compat_props_add (mc->compat_props, hw_compat_sparc64, hw_compat_sparc64_len); }
@@ -837,7 +837,7 @@ static void sun4v_class_init(ObjectClass *oc, void *data) mc->default_display ="std" ; mc->default_nic ="sunhme" ; mc->no_parallel = !module_object_class_by_name (TYPE_ISA_PARALLEL ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo sun4v_type = {
hw/tricore/triboard.c +1 -1
@@ -73,7 +73,7 @@ static void triboard_machine_tc277d_class_init(ObjectClass *oc, mc->init = triboard_machine_init; mc->desc ="Infineon AURIX TriBoard TC277 (D-Step)" ; mc->max_cpus =1 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; amc->soc_name ="tc277d-soc" ; };
hw/tricore/tricore_testboard.c +1 -1
@@ -111,7 +111,7 @@ static void ttb_machine_init(MachineClass *mc) mc->desc ="a minimal TriCore board" ; mc->init = tricoreboard_init; mc->default_cpu_type =TRICORE_CPU_TYPE_NAME ("tc1796" ); - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("tricore_testboard" , ttb_machine_init)
hw/xen/xen-pvh-common.c +1 -1
@@ -381,7 +381,7 @@ static void xen_pvh_class_init(ObjectClass *oc, void *data) mc->default_machine_opts ="accel=xen" ;/* Set to zero to make sure that the real ram size is passed. */ mc->default_ram_size =0 ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xen_pvh_info = {
hw/xenpv/xen_machine_pv.c +1 -1
@@ -67,7 +67,7 @@ static void xenpv_machine_init(MachineClass *mc) mc->init = xen_init_pv; mc->max_cpus =1 ; mc->default_machine_opts ="accel=xen" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("xenpv" , xenpv_machine_init)
hw/xtensa/sim.c +1 -1
@@ -125,7 +125,7 @@ static void xtensa_sim_machine_init(MachineClass *mc) mc->max_cpus =4 ; mc->no_serial =1 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("sim" , xtensa_sim_machine_init)
hw/xtensa/virt.c +1 -1
@@ -122,7 +122,7 @@ static void xtensa_virt_machine_init(MachineClass *mc) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_nic ="virtio-net-pci" ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }DEFINE_MACHINE ("virt" , xtensa_virt_machine_init)
hw/xtensa/xtfpga.c +8 -8
@@ -594,7 +594,7 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =64 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx60_type = {
@@ -612,7 +612,7 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =64 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx60_nommu_type = {
@@ -630,7 +630,7 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =96 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx200_type = {
@@ -648,7 +648,7 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =96 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_lx200_nommu_type = {
@@ -666,7 +666,7 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =512 * MiB -XTFPGA_MMU_RESERVED_MEMORY_SIZE ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_ml605_type = {
@@ -684,7 +684,7 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =256 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_ml605_nommu_type = {
@@ -702,7 +702,7 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =1 * GiB -XTFPGA_MMU_RESERVED_MEMORY_SIZE ; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_kc705_type = {
@@ -720,7 +720,7 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =256 * MiB; - mc->no_sdcard =ON_OFF_AUTO_OFF ; + mc->auto_create_sdcard = true; }static const TypeInfo xtfpga_kc705_nommu_type = {
system/vl.c +4 -5
@@ -194,7 +194,7 @@ static int default_parallel = 1;static int default_monitor =1 ;static int default_floppy =1 ;static int default_cdrom =1 ; -static int default_sdcard =1 ; +static bool auto_create_sdcard = true;static int default_vga =1 ;static int default_net =1 ;
@@ -718,7 +718,7 @@ static void configure_blockdev(BlockdevOptionsQueue *bdo_queue,default_drive (default_cdrom, snapshot, machine_class->block_default_type,2 ,CDROM_OPTS );default_drive (default_floppy, snapshot,IF_FLOPPY ,0 ,FD_OPTS ); -default_drive (default_sdcard, snapshot,IF_SD ,0 ,SD_OPTS ); +default_drive (auto_create_sdcard, snapshot,IF_SD ,0 ,SD_OPTS ); }
@@ -1346,9 +1346,8 @@ static void qemu_disable_default_devices(void)if (!has_defaults || machine_class->no_cdrom) { default_cdrom =0 ; } -assert (machine_class->no_sdcard !=ON_OFF_AUTO_AUTO ); -if (!has_defaults || machine_class->no_sdcard ==ON_OFF_AUTO_ON ) { - default_sdcard =0 ; +if (!has_defaults || !machine_class->auto_create_sdcard) { + auto_create_sdcard = false; }if (!has_defaults) { default_audio =0 ;
Signature · 1 line
2.47.1
[PULL 15/32] hw/i386: Have X86_IOMMU devices inherit from DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéDo not explain why _X86_IOMMU devices are user_creatable, have them inherit TYPE_DYNAMIC_SYS_BUS_DEVICE, to explicit they can optionally be plugged on TYPE_PLATFORM_BUS_DEVICE.
Message-Id: <[email protected]>
--- hw/i386/amd_iommu.c | 2 -- hw/i386/intel_iommu.c | 2 -- hw/i386/x86-iommu.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-)
hw/i386/amd_iommu.c +0 -2
@@ -1687,8 +1687,6 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) dc->hotpluggable = false; dc_class->realize = amdvi_sysbus_realize; dc_class->int_remap = amdvi_int_remap; -/* Supported by the pc-q35-* machine types */ - dc->user_creatable = true;set_bit (DEVICE_CATEGORY_MISC , dc->categories); dc->desc ="AMD IOMMU (AMD-Vi) DMA Remapping device" ;device_class_set_props (dc, amdvi_properties);
hw/i386/intel_iommu.c +0 -2
@@ -4871,8 +4871,6 @@ static void vtd_class_init(ObjectClass *klass, void *data) dc->hotpluggable = false; x86_class->realize = vtd_realize; x86_class->int_remap = vtd_int_remap; -/* Supported by the pc-q35-* machine types */ - dc->user_creatable = true;set_bit (DEVICE_CATEGORY_MISC , dc->categories); dc->desc ="Intel IOMMU (VT-d) DMA Remapping device" ; }
hw/i386/x86-iommu.c +1 -1
@@ -146,7 +146,7 @@ bool x86_iommu_ir_supported(X86IOMMUState *s)static const TypeInfo x86_iommu_info = { .name =TYPE_X86_IOMMU_DEVICE , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_DYNAMIC_SYS_BUS_DEVICE , .instance_size =sizeof (X86IOMMUState), .class_init = x86_iommu_class_init, .class_size =sizeof (X86IOMMUClass),
Signature · 1 line
2.47.1
[PULL 28/32] tests/functional: Allow microblaze tests to take a machine name argument
In reply to Philippe Mathieu-DaudéMake microblaze tests a bit more generic.
Message-Id: <[email protected]>
--- tests/functional/test_microblaze_s3adsp1800.py | 7 +++++-- tests/functional/test_microblazeel_s3adsp1800.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-)
tests/functional/test_microblaze_s3adsp1800.py +5 -2
@@ -20,8 +20,8 @@ class MicroblazeMachine(QemuSystemTest): 'day17.tar.xz'), '3ba7439dfbea7af4876662c97f8e1f0cdad9231fc166e4861d17042489270057') - def test_microblaze_s3adsp1800_be(self): - self.set_machine('petalogix-s3adsp1800') + def do_ballerina_be_test(self, machine): + self.set_machine(machine) self.archive_extract(self.ASSET_IMAGE_BE) self.vm.set_console() self.vm.add_args('-kernel',
@@ -34,5 +34,8 @@ def test_microblaze_s3adsp1800_be(self): # message, that's why we don't test for a later string here. This # needs some investigation by a microblaze wizard one day... + def test_microblaze_s3adsp1800_legacy_be(self): + self.do_ballerina_be_test('petalogix-s3adsp1800') + if __name__ == '__main__': QemuSystemTest.main()
tests/functional/test_microblazeel_s3adsp1800.py +5 -2
@@ -21,9 +21,9 @@ class MicroblazeelMachine(QemuSystemTest): ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22') - def test_microblazeel_s3adsp1800_le(self): + def do_xmaton_le_test(self, machine): self.require_netdev('user') - self.set_machine('petalogix-s3adsp1800') + self.set_machine(machine) self.archive_extract(self.ASSET_IMAGE_LE) self.vm.set_console() self.vm.add_args('-kernel', self.scratch_file('day13', 'xmaton.bin'))
@@ -38,5 +38,8 @@ def test_microblazeel_s3adsp1800_le(self): 'tftp -g -r xmaton.png 10.0.2.2 ; md5sum xmaton.png', '821cd3cab8efd16ad6ee5acc3642a8ea') + def test_microblaze_s3adsp1800_legacy_le(self): + self.do_xmaton_le_test('petalogix-s3adsp1800') + if __name__ == '__main__': QemuSystemTest.main()
Signature · 1 line
2.47.1
[PULL 20/32] hw/boards: Convert no_sdcard flag to OnOffAuto tri-state
In reply to Philippe Mathieu-DaudéMachineClass::no_sdcard is initialized as false by default. To catch all uses, convert it to a tri-state, having the current default (false) becoming AUTO.
No logical change intended.
Message-Id: <[email protected]>
--- include/hw/boards.h | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/core/null-machine.c | 2 +- hw/s390x/s390-virtio-ccw.c | 2 +- system/vl.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
include/hw/boards.h +1 -1
@@ -283,9 +283,9 @@ struct MachineClass { no_parallel:1, no_floppy:1, no_cdrom:1, - no_sdcard:1, pci_allow_0_address:1, legacy_fw_cfg_order:1; +OnOffAuto no_sdcard;bool is_default;const char *default_machine_opts;const char *default_boot_order;
hw/arm/xilinx_zynq.c +1 -1
@@ -463,7 +463,7 @@ static void zynq_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Xilinx Zynq Platform Baseboard for Cortex-A9" ; mc->init = zynq_init; mc->max_cpus =ZYNQ_MAX_CPUS ; - mc->no_sdcard =1 ; + mc->no_sdcard =ON_OFF_AUTO_ON ; mc->ignore_memory_transaction_failures = true; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id ="zynq.ext_ram" ;
hw/core/null-machine.c +1 -1
@@ -53,7 +53,7 @@ static void machine_none_machine_init(MachineClass *mc) mc->no_parallel =1 ; mc->no_floppy =1 ; mc->no_cdrom =1 ; - mc->no_sdcard =1 ; + mc->no_sdcard =ON_OFF_AUTO_ON ; }DEFINE_MACHINE ("none" , machine_none_machine_init)
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -817,7 +817,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) mc->no_cdrom =1 ; mc->no_floppy =1 ; mc->no_parallel =1 ; - mc->no_sdcard =1 ; + mc->no_sdcard =ON_OFF_AUTO_ON ; mc->max_cpus =S390_MAX_CPUS ; mc->has_hotpluggable_cpus = true; mc->smp_props.books_supported = true;
system/vl.c +1 -1
@@ -1346,7 +1346,7 @@ static void qemu_disable_default_devices(void)if (!has_defaults || machine_class->no_cdrom) { default_cdrom =0 ; } -if (!has_defaults || machine_class->no_sdcard) { +if (!has_defaults || machine_class->no_sdcard ==ON_OFF_AUTO_ON ) { default_sdcard =0 ; }if (!has_defaults) {
Signature · 1 line
2.47.1
[PULL 21/32] hw/boards: Explicit no_sdcard=false as ON_OFF_AUTO_OFF
In reply to Philippe Mathieu-DaudéUpdate MachineClass::no_sdcard default implicit AUTO initialization to explicit OFF. This flag is consumed in system/vl.c::qemu_disable_default_devices(). Use this place to assert we don't have anymore AUTO state.
In hw/ppc/e500.c we add the ppce500_machine_class_init() method to initialize once all the inherited classes.
Message-Id: <[email protected]>
--- hw/alpha/dp264.c | 1 + hw/arm/aspeed.c | 21 +++++++++++++++++++++ hw/arm/b-l475e-iot01a.c | 1 + hw/arm/bananapi_m2u.c | 1 + hw/arm/collie.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/digic_boards.c | 1 + hw/arm/exynos4_boards.c | 2 ++ hw/arm/fby35.c | 1 + hw/arm/highbank.c | 2 ++ hw/arm/imx25_pdk.c | 1 + hw/arm/integratorcp.c | 1 + hw/arm/kzm.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/microbit.c | 1 + hw/arm/mps2-tz.c | 4 ++++ hw/arm/mps2.c | 4 ++++ hw/arm/mps3r.c | 1 + hw/arm/msf2-som.c | 1 + hw/arm/musca.c | 2 ++ hw/arm/musicpal.c | 1 + hw/arm/netduino2.c | 1 + hw/arm/netduinoplus2.c | 1 + hw/arm/npcm7xx_boards.c | 5 +++++ hw/arm/olimex-stm32-h405.c | 1 + hw/arm/omap_sx1.c | 2 ++ hw/arm/orangepi.c | 1 + hw/arm/raspi.c | 5 +++++ hw/arm/raspi4b.c | 1 + hw/arm/realview.c | 4 ++++ hw/arm/sabrelite.c | 1 + hw/arm/sbsa-ref.c | 1 + hw/arm/stellaris.c | 2 ++ hw/arm/stm32vldiscovery.c | 1 + hw/arm/versatilepb.c | 2 ++ hw/arm/vexpress.c | 2 ++ hw/arm/virt.c | 1 + hw/arm/xen-pvh.c | 1 + hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-zcu102.c | 1 + hw/avr/arduino.c | 1 + hw/hppa/machine.c | 2 ++ hw/i386/pc.c | 1 + hw/i386/x86.c | 1 + hw/i386/xen/xen-pvh.c | 1 + hw/loongarch/virt.c | 1 + hw/m68k/an5206.c | 1 + hw/m68k/mcf5208.c | 1 + hw/m68k/next-cube.c | 1 + hw/m68k/q800.c | 1 + hw/m68k/virt.c | 1 + hw/microblaze/petalogix_ml605_mmu.c | 1 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 1 + hw/microblaze/xlnx-zynqmp-pmu.c | 1 + hw/mips/boston.c | 1 + hw/mips/fuloong2e.c | 1 + hw/mips/jazz.c | 2 ++ hw/mips/loongson3_virt.c | 1 + hw/mips/malta.c | 1 + hw/mips/mipssim.c | 1 + hw/openrisc/openrisc_sim.c | 1 + hw/openrisc/virt.c | 1 + hw/ppc/amigaone.c | 1 + hw/ppc/e500plat.c | 1 + hw/ppc/mac_newworld.c | 1 + hw/ppc/mac_oldworld.c | 1 + hw/ppc/mpc8544ds.c | 1 + hw/ppc/pegasos2.c | 1 + hw/ppc/pnv.c | 1 + hw/ppc/ppc405_boards.c | 1 + hw/ppc/ppc440_bamboo.c | 1 + hw/ppc/prep.c | 1 + hw/ppc/sam460ex.c | 1 + hw/ppc/spapr.c | 1 + hw/ppc/virtex_ml507.c | 1 + hw/remote/machine.c | 1 + hw/riscv/microchip_pfsoc.c | 1 + hw/riscv/opentitan.c | 1 + hw/riscv/shakti_c.c | 1 + hw/riscv/sifive_e.c | 1 + hw/riscv/sifive_u.c | 1 + hw/riscv/spike.c | 1 + hw/riscv/virt.c | 1 + hw/rx/rx-gdbsim.c | 1 + hw/sh4/r2d.c | 1 + hw/sparc/leon3.c | 1 + hw/sparc/sun4m.c | 1 + hw/sparc64/niagara.c | 1 + hw/sparc64/sun4u.c | 2 ++ hw/tricore/triboard.c | 1 + hw/tricore/tricore_testboard.c | 1 + hw/xen/xen-pvh-common.c | 1 + hw/xenpv/xen_machine_pv.c | 1 + hw/xtensa/sim.c | 1 + hw/xtensa/virt.c | 1 + hw/xtensa/xtfpga.c | 8 ++++++++ system/vl.c | 1 + 98 files changed, 152 insertions(+)
hw/alpha/dp264.c +1 -0
@@ -213,6 +213,7 @@ static void clipper_machine_init(MachineClass *mc) mc->default_cpu_type =ALPHA_CPU_TYPE_NAME ("ev67" ); mc->default_ram_id ="ram" ; mc->default_nic ="e1000" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("clipper" , clipper_machine_init)
hw/arm/aspeed.c +21 -0
@@ -1253,6 +1253,7 @@ static void aspeed_machine_palmetto_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx25l25635f" ; amc->num_cs =1 ; amc->i2c_init = palmetto_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =256 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1269,6 +1270,7 @@ static void aspeed_machine_quanta_q71l_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx25l25635e" ; amc->num_cs =1 ; amc->i2c_init = quanta_q71l_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =128 * MiB;aspeed_machine_class_init_cpus_defaults (mc); }
@@ -1287,6 +1289,7 @@ static void aspeed_machine_supermicrox11_bmc_class_init(ObjectClass *oc, amc->num_cs =1 ; amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON ; amc->i2c_init = palmetto_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =256 * MiB;aspeed_machine_class_init_cpus_defaults (mc); }
@@ -1305,6 +1308,7 @@ static void aspeed_machine_supermicro_x11spi_bmc_class_init(ObjectClass *oc, amc->num_cs =1 ; amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON ; amc->i2c_init = palmetto_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); }
@@ -1321,6 +1325,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx25l25635f" ; amc->num_cs =1 ; amc->i2c_init = ast2500_evb_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1338,6 +1343,7 @@ static void aspeed_machine_yosemitev2_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx25l25635e" ; amc->num_cs =2 ; amc->i2c_init = yosemitev2_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1354,6 +1360,7 @@ static void aspeed_machine_romulus_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx66l1g45g" ; amc->num_cs =2 ; amc->i2c_init = romulus_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1371,6 +1378,7 @@ static void aspeed_machine_tiogapass_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx25l25635e" ; amc->num_cs =2 ; amc->i2c_init = tiogapass_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1387,6 +1395,7 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx66l1g45g" ; amc->num_cs =2 ; amc->i2c_init = sonorapass_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1403,6 +1412,7 @@ static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) amc->spi_model ="mx66l1g45g" ; amc->num_cs =2 ; amc->i2c_init = witherspoon_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1423,6 +1433,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)ASPEED_MAC3_ON ; amc->sdhci_wp_inverted = true; amc->i2c_init = ast2600_evb_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB;aspeed_machine_class_init_cpus_defaults (mc);aspeed_machine_ast2600_class_emmc_init (oc);
@@ -1441,6 +1452,7 @@ static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data) amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON ; amc->i2c_init = g220a_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1024 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1458,6 +1470,7 @@ static void aspeed_machine_fp5280g2_class_init(ObjectClass *oc, void *data) amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON ; amc->i2c_init = fp5280g2_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1476,6 +1489,7 @@ static void aspeed_machine_rainier_class_init(ObjectClass *oc, void *data) amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC2_ON |ASPEED_MAC3_ON ; amc->i2c_init = rainier_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB;aspeed_machine_class_init_cpus_defaults (mc);aspeed_machine_ast2600_class_emmc_init (oc);
@@ -1498,6 +1512,7 @@ static void aspeed_machine_fuji_class_init(ObjectClass *oc, void *data) amc->macs_mask =ASPEED_MAC3_ON ; amc->i2c_init = fuji_bmc_i2c_init; amc->uart_default =ASPEED_DEV_UART1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =FUJI_BMC_RAM_SIZE ;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1518,6 +1533,7 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc, void *data) amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC2_ON ; amc->i2c_init = bletchley_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =BLETCHLEY_BMC_RAM_SIZE ;aspeed_machine_class_init_cpus_defaults (mc); }
@@ -1559,6 +1575,7 @@ static void aspeed_machine_fby35_class_init(ObjectClass *oc, void *data) amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC3_ON ; amc->i2c_init = fby35_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ;/* FIXME: Replace this macro with something more general */ mc->default_ram_size =FUJI_BMC_RAM_SIZE ;aspeed_machine_class_init_cpus_defaults (mc);
@@ -1641,6 +1658,7 @@ static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, amc->spi_model ="w25q256" ; amc->num_cs =2 ; amc->macs_mask =0 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;aspeed_machine_class_init_cpus_defaults (mc); }
@@ -1669,6 +1687,7 @@ static void aspeed_machine_ast2700_evb_class_init(ObjectClass *oc, void *data) amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON |ASPEED_MAC2_ON ; amc->uart_default =ASPEED_DEV_UART12 ; amc->i2c_init = ast2700_evb_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB;aspeed_machine_class_init_cpus_defaults (mc); }
@@ -1689,6 +1708,7 @@ static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc, amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC2_ON |ASPEED_MAC3_ON ; amc->i2c_init = qcom_dc_scm_bmc_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB;aspeed_machine_class_init_cpus_defaults (mc); };
@@ -1708,6 +1728,7 @@ static void aspeed_machine_qcom_firework_class_init(ObjectClass *oc, amc->num_cs =2 ; amc->macs_mask =ASPEED_MAC2_ON |ASPEED_MAC3_ON ; amc->i2c_init = qcom_dc_scm_firework_i2c_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB;aspeed_machine_class_init_cpus_defaults (mc); };
hw/arm/b-l475e-iot01a.c +1 -0
@@ -120,6 +120,7 @@ static void bl475e_machine_init(ObjectClass *oc, void *data) mc->desc ="B-L475E-IOT01A Discovery Kit (Cortex-M4)" ; mc->init = bl475e_init; mc->valid_cpu_types = machine_valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ;/* SRAM pre-allocated as part of the SoC instantiation */ mc->default_ram_size =0 ;
hw/arm/bananapi_m2u.c +1 -0
@@ -141,6 +141,7 @@ static void bpim2u_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; mc->default_ram_size =1 * GiB; mc->default_ram_id ="bpim2u.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("bpim2u" , bpim2u_machine_init)
hw/arm/collie.c +1 -0
@@ -79,6 +79,7 @@ static void collie_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("sa1110" ); mc->default_ram_size =RAM_SIZE ; mc->default_ram_id ="strongarm.sdram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo collie_machine_typeinfo = {
hw/arm/cubieboard.c +1 -0
@@ -122,6 +122,7 @@ static void cubieboard_machine_init(MachineClass *mc) mc->units_per_default_bus =1 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="cubieboard.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("cubieboard" , cubieboard_machine_init)
hw/arm/digic_boards.c +1 -0
@@ -143,6 +143,7 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; mc->default_ram_size =64 * MiB; mc->default_ram_id ="ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("canon-a1100" , canon_a1100_machine_init)
hw/arm/exynos4_boards.c +2 -0
@@ -165,6 +165,7 @@ static void nuri_class_init(ObjectClass *oc, void *data) mc->min_cpus =EXYNOS4210_NCPUS ; mc->default_cpus =EXYNOS4210_NCPUS ; mc->ignore_memory_transaction_failures = true; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo nuri_type = {
@@ -184,6 +185,7 @@ static void smdkc210_class_init(ObjectClass *oc, void *data) mc->min_cpus =EXYNOS4210_NCPUS ; mc->default_cpus =EXYNOS4210_NCPUS ; mc->ignore_memory_transaction_failures = true; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo smdkc210_type = {
hw/arm/fby35.c +1 -0
@@ -170,6 +170,7 @@ static void fby35_class_init(ObjectClass *oc, void *data) mc->init = fby35_init; mc->no_floppy =1 ; mc->no_cdrom =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->min_cpus = mc->max_cpus = mc->default_cpus =3 ; object_class_property_add_bool(oc, "execute-in-place",
hw/arm/highbank.c +2 -0
@@ -357,6 +357,7 @@ static void highbank_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="highbank.dram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo highbank_type = {
@@ -381,6 +382,7 @@ static void midway_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="highbank.dram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo midway_type = {
hw/arm/imx25_pdk.c +1 -0
@@ -147,6 +147,7 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->init = imx25_pdk_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="imx25.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("imx25-pdk" , imx25_pdk_machine_init)
hw/arm/integratorcp.c +1 -0
@@ -688,6 +688,7 @@ static void integratorcp_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="integrator.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
hw/arm/kzm.c +1 -0
@@ -137,6 +137,7 @@ static void kzm_machine_init(MachineClass *mc) mc->init = kzm_init; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="kzm.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("kzm" , kzm_machine_init)
hw/arm/mcimx6ul-evk.c +1 -0
@@ -74,5 +74,6 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->init = mcimx6ul_evk_init; mc->max_cpus =FSL_IMX6UL_NUM_CPUS ; mc->default_ram_id ="mcimx6ul-evk.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("mcimx6ul-evk" , mcimx6ul_evk_machine_init)
hw/arm/mcimx7d-sabre.c +1 -0
@@ -74,5 +74,6 @@ static void mcimx7d_sabre_machine_init(MachineClass *mc) mc->init = mcimx7d_sabre_init; mc->max_cpus =FSL_IMX7_NUM_CPUS ; mc->default_ram_id ="mcimx7d-sabre.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("mcimx7d-sabre" , mcimx7d_sabre_machine_init)
hw/arm/microbit.c +1 -0
@@ -67,6 +67,7 @@ static void microbit_machine_class_init(ObjectClass *oc, void *data) mc->desc ="BBC micro:bit (Cortex-M0)" ; mc->init = microbit_init; mc->max_cpus =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo microbit_info = {
hw/arm/mps2-tz.c +4 -0
@@ -1320,6 +1320,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN505 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41045050 ; mmc->sysclk_frq =20 *1000 *1000 ;/* 20MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1354,6 +1355,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN521 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41045210 ; mmc->sysclk_frq =20 *1000 *1000 ;/* 20MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1388,6 +1390,7 @@ static void mps3tz_an524_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN524 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m33" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41045240 ; mmc->sysclk_frq =32 *1000 *1000 ;/* 32MHz */ mmc->apb_periph_frq = mmc->sysclk_frq;
@@ -1427,6 +1430,7 @@ static void mps3tz_an547_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN547 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m55" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41055470 ; mmc->sysclk_frq =32 *1000 *1000 ;/* 32MHz */ mmc->apb_periph_frq =25 *1000 *1000 ;/* 25MHz */
hw/arm/mps2.c +4 -0
@@ -487,6 +487,7 @@ static void mps2_an385_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN385 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41043850 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
@@ -506,6 +507,7 @@ static void mps2_an386_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN386 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m4" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41043860 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
@@ -525,6 +527,7 @@ static void mps2_an500_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN500 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m7" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41045000 ; mmc->psram_base =0x60000000 ; mmc->ethernet_base =0xa0000000 ;
@@ -544,6 +547,7 @@ static void mps2_an511_class_init(ObjectClass *oc, void *data) mmc->fpga_type =FPGA_AN511 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->scc_id =0x41045110 ; mmc->psram_base =0x21000000 ; mmc->ethernet_base =0x40200000 ;
hw/arm/mps3r.c +1 -0
@@ -618,6 +618,7 @@ static void mps3r_an536_class_init(ObjectClass *oc, void *data) mc->max_cpus =2 ; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-r52" ); mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->raminfo = an536_raminfo;mps3r_set_default_ram_info (mmc); }
hw/arm/msf2-som.c +1 -0
@@ -106,6 +106,7 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->desc ="SmartFusion2 SOM kit from Emcraft (M2S010)" ; mc->init = emcraft_sf2_s2s010_init; mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("emcraft-sf2" , emcraft_sf2_machine_init)
hw/arm/musca.c +2 -0
@@ -615,6 +615,7 @@ static void musca_a_class_init(ObjectClass *oc, void *data)MuscaMachineClass *mmc =MUSCA_MACHINE_CLASS (oc); mc->desc ="ARM Musca-A board (dual Cortex-M33)" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->type =MUSCA_A ; mmc->init_svtor =0x10200000 ; mmc->sram_addr_width =15 ;
@@ -629,6 +630,7 @@ static void musca_b1_class_init(ObjectClass *oc, void *data)MuscaMachineClass *mmc =MUSCA_MACHINE_CLASS (oc); mc->desc ="ARM Musca-B1 board (dual Cortex-M33)" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mmc->type =MUSCA_B1 ;/* * This matches the DAPlink firmware which boots from QSPI. There
hw/arm/musicpal.c +1 -0
@@ -1342,6 +1342,7 @@ static void musicpal_machine_init(MachineClass *mc) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_size =MP_RAM_DEFAULT_SIZE ; mc->default_ram_id ="musicpal.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
hw/arm/netduino2.c +1 -0
@@ -63,6 +63,7 @@ static void netduino2_machine_init(MachineClass *mc) mc->init = netduino2_init; mc->valid_cpu_types = valid_cpu_types; mc->ignore_memory_transaction_failures = true; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("netduino2" , netduino2_machine_init)
hw/arm/netduinoplus2.c +1 -0
@@ -63,6 +63,7 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->desc ="Netduino Plus 2 Machine (Cortex-M4)" ; mc->init = netduinoplus2_init; mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("netduinoplus2" , netduinoplus2_machine_init)
hw/arm/npcm7xx_boards.c +5 -0
@@ -481,6 +481,7 @@ static void npcm750_evb_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Nuvoton NPCM750 Evaluation Board (Cortex-A9)" ; mc->init = npcm750_evb_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB; };
@@ -493,6 +494,7 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Quanta GSJ (Cortex-A9)" ; mc->init = quanta_gsj_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =512 * MiB; };
@@ -505,6 +507,7 @@ static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Quanta GBS (Cortex-A9)" ; mc->init = quanta_gbs_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB; }
@@ -517,6 +520,7 @@ static void kudo_bmc_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Kudo BMC (Cortex-A9)" ; mc->init = kudo_bmc_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB; };
@@ -529,6 +533,7 @@ static void mori_bmc_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Mori BMC (Cortex-A9)" ; mc->init = mori_bmc_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_size =1 * GiB; }
hw/arm/olimex-stm32-h405.c +1 -0
@@ -66,6 +66,7 @@ static void olimex_stm32_h405_machine_init(MachineClass *mc) mc->desc ="Olimex STM32-H405 (Cortex-M4)" ; mc->init = olimex_stm32_h405_init; mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ;/* SRAM pre-allocated as part of the SoC instantiation */ mc->default_ram_size =0 ;
hw/arm/omap_sx1.c +2 -0
@@ -216,6 +216,7 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("ti925t" ); mc->default_ram_size =SDRAM_SIZE ; mc->default_ram_id ="omap1.dram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo sx1_machine_v2_type = {
@@ -234,6 +235,7 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =ARM_CPU_TYPE_NAME ("ti925t" ); mc->default_ram_size =SDRAM_SIZE ; mc->default_ram_id ="omap1.dram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo sx1_machine_v1_type = {
hw/arm/orangepi.c +1 -0
@@ -121,6 +121,7 @@ static void orangepi_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; mc->default_ram_size =1 * GiB; mc->default_ram_id ="orangepi.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("orangepi-pc" , orangepi_machine_init)
hw/arm/raspi.c +5 -0
@@ -342,6 +342,7 @@ static void raspi0_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); + mc->no_sdcard =ON_OFF_AUTO_OFF ; rmc->board_rev =0x920092 ;/* Revision 1.2 */ raspi_machine_class_init (mc, rmc->board_rev); };
@@ -351,6 +352,7 @@ static void raspi1ap_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); + mc->no_sdcard =ON_OFF_AUTO_OFF ; rmc->board_rev =0x900021 ;/* Revision 1.1 */ raspi_machine_class_init (mc, rmc->board_rev); };
@@ -360,6 +362,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); + mc->no_sdcard =ON_OFF_AUTO_OFF ; rmc->board_rev =0xa21041 ;raspi_machine_class_init (mc, rmc->board_rev); };
@@ -370,6 +373,7 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); + mc->no_sdcard =ON_OFF_AUTO_OFF ; rmc->board_rev =0x9020e0 ;/* Revision 1.0 */ raspi_machine_class_init (mc, rmc->board_rev); };
@@ -379,6 +383,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data)MachineClass *mc =MACHINE_CLASS (oc);RaspiBaseMachineClass *rmc =RASPI_BASE_MACHINE_CLASS (oc); + mc->no_sdcard =ON_OFF_AUTO_OFF ; rmc->board_rev =0xa02082 ;raspi_machine_class_init (mc, rmc->board_rev); };
hw/arm/raspi4b.c +1 -0
@@ -118,6 +118,7 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev =0xb03115 ;/* Revision 1.5, 2 Gb RAM */ #endif raspi_machine_class_common_init (mc, rmc->board_rev); + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->init = raspi4b_machine_init; }
hw/arm/realview.c +4 -0
@@ -415,6 +415,7 @@ static void realview_eb_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
@@ -435,6 +436,7 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm11mpcore" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
@@ -453,6 +455,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void *data) mc->init = realview_pb_a8_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-a8" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
@@ -472,6 +475,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc, void *data) mc->max_cpus =4 ; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-a9" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
hw/arm/sabrelite.c +1 -0
@@ -110,6 +110,7 @@ static void sabrelite_machine_init(MachineClass *mc) mc->max_cpus =FSL_IMX6_NUM_CPUS ; mc->ignore_memory_transaction_failures = true; mc->default_ram_id ="sabrelite.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("sabrelite" , sabrelite_machine_init)
hw/arm/sbsa-ref.c +1 -0
@@ -900,6 +900,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data) mc->minimum_page_bits =12 ; mc->block_default_type =IF_IDE ; mc->no_cdrom =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_nic ="e1000e" ; mc->default_ram_size =1 * GiB; mc->default_ram_id ="sbsa-ref.ram" ;
hw/arm/stellaris.c +2 -0
@@ -1421,6 +1421,7 @@ static void lm3s811evb_class_init(ObjectClass *oc, void *data) mc->init = lm3s811evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo lm3s811evb_type = {
@@ -1441,6 +1442,7 @@ static void lm3s6965evb_class_init(ObjectClass *oc, void *data) mc->init = lm3s6965evb_init; mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m3" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo lm3s6965evb_type = {
hw/arm/stm32vldiscovery.c +1 -0
@@ -66,6 +66,7 @@ static void stm32vldiscovery_machine_init(MachineClass *mc) mc->desc ="ST STM32VLDISCOVERY (Cortex-M3)" ; mc->init = stm32vldiscovery_init; mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("stm32vldiscovery" , stm32vldiscovery_machine_init)
hw/arm/versatilepb.c +2 -0
@@ -419,6 +419,7 @@ static void versatilepb_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="versatile.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
@@ -439,6 +440,7 @@ static void versatileab_class_init(ObjectClass *oc, void *data) mc->ignore_memory_transaction_failures = true; mc->default_cpu_type =ARM_CPU_TYPE_NAME ("arm926" ); mc->default_ram_id ="versatile.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
hw/arm/vexpress.c +2 -0
@@ -803,6 +803,7 @@ static void vexpress_a9_class_init(ObjectClass *oc, void *data) mc->desc ="ARM Versatile Express for Cortex-A9" ; mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; vmc->daughterboard = &a9_daughterboard; }
@@ -818,6 +819,7 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) mc->desc ="ARM Versatile Express for Cortex-A15" ; mc->valid_cpu_types = valid_cpu_types; + mc->no_sdcard =ON_OFF_AUTO_OFF ; vmc->daughterboard = &a15_daughterboard;
hw/arm/virt.c +1 -0
@@ -3125,6 +3125,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)#endif mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->pci_allow_0_address = true;/* We know we will never create a pre-ARMv7 CPU which needs 1K pages */ mc->minimum_page_bits =12 ;
hw/arm/xen-pvh.c +1 -0
@@ -75,6 +75,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)* mc->max_cpus, QEMU will bail out with an error message. */ mc->max_cpus =GUEST_MAX_VCPUS ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;/* Xen/ARM does not use buffered IOREQs. */ xpc->handle_bufioreq =HVM_IOREQSRV_BUFIOREQ_OFF ;
hw/arm/xlnx-versal-virt.c +1 -0
@@ -818,6 +818,7 @@ static void versal_virt_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =XLNX_VERSAL_NR_ACPUS +XLNX_VERSAL_NR_RCPUS ; mc->default_cpus =XLNX_VERSAL_NR_ACPUS +XLNX_VERSAL_NR_RCPUS ; mc->no_cdrom = true; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_id ="ddr" ;object_class_property_add_str (oc,"ospi-flash" , versal_get_ospi_model, versal_set_ospi_model);
hw/arm/xlnx-zcu102.c +1 -0
@@ -280,6 +280,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =XLNX_ZYNQMP_NUM_APU_CPUS +XLNX_ZYNQMP_NUM_RPU_CPUS ; mc->default_cpus =XLNX_ZYNQMP_NUM_APU_CPUS ; mc->default_ram_id ="ddr-ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); object_class_property_add_bool(oc, "secure", zcu102_get_secure,
hw/avr/arduino.c +1 -0
@@ -67,6 +67,7 @@ static void arduino_machine_class_init(ObjectClass *oc, void *data) mc->no_floppy =1 ; mc->no_cdrom =1 ; mc->no_parallel =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static void arduino_duemilanove_class_init (ObjectClass *oc,void *data)
hw/hppa/machine.c +2 -0
@@ -704,6 +704,7 @@ static void HP_B160L_machine_init_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_ram_id ="ram" ; mc->default_nic ="tulip" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; nc->nmi_monitor_handler = hppa_nmi; }
@@ -740,6 +741,7 @@ static void HP_C3700_machine_init_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_ram_id ="ram" ; mc->default_nic ="tulip" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; nc->nmi_monitor_handler = hppa_nmi; }
hw/i386/pc.c +1 -0
@@ -1799,6 +1799,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) mc->smp_props.dies_supported = true; mc->smp_props.modules_supported = true; mc->default_ram_id ="pc.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; pcmc->default_smbios_ep_type =SMBIOS_ENTRY_POINT_TYPE_AUTO ; object_class_property_add(oc, PC_MACHINE_MAX_RAM_BELOW_4G, "size",
hw/i386/x86.c +1 -0
@@ -382,6 +382,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) mc->get_default_cpu_node_id = x86_get_default_cpu_node_id; mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; mc->kvm_type = x86_kvm_type; + mc->no_sdcard =ON_OFF_AUTO_OFF ; x86mc->save_tsc_khz = true; x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi;
hw/i386/xen/xen-pvh.c +1 -0
@@ -82,6 +82,7 @@ static void xen_pvh_machine_class_init(ObjectClass *oc, void *data) mc->desc ="Xen PVH x86 machine" ; mc->default_cpu_type =TARGET_DEFAULT_CPU_TYPE ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;/* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts. */ mc->max_cpus =HVM_MAX_VCPUS ;
hw/loongarch/virt.c +1 -0
@@ -1471,6 +1471,7 @@ static void virt_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_VIRTIO ; mc->default_boot_order ="c" ; mc->no_cdrom =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = virt_cpu_index_to_props; mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;
hw/m68k/an5206.c +1 -0
@@ -99,6 +99,7 @@ static void an5206_machine_init(MachineClass *mc) mc->init = an5206_init; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m5206" ); mc->default_ram_id ="an5206.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("an5206" , an5206_machine_init)
hw/m68k/mcf5208.c +1 -0
@@ -398,6 +398,7 @@ static void mcf5208evb_machine_init(MachineClass *mc) mc->is_default = true; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m5208" ); mc->default_ram_id ="mcf5208.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("mcf5208evb" , mcf5208evb_machine_init)
hw/m68k/next-cube.c +1 -0
@@ -1359,6 +1359,7 @@ static void next_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_id ="next.ram" ; mc->default_cpu_type =M68K_CPU_TYPE_NAME ("m68040" ); mc->no_cdrom = true; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo next_typeinfo = {
hw/m68k/q800.c +1 -0
@@ -743,6 +743,7 @@ static void q800_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ; mc->block_default_type =IF_SCSI ; mc->default_ram_id ="m68k_mac.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc);compat_props_add (mc->compat_props, hw_compat_q800, hw_compat_q800_len);
hw/m68k/virt.c +1 -0
@@ -318,6 +318,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =1 ; mc->no_floppy =1 ; mc->no_parallel =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_ram_id ="m68k_virt.ram" ; }
hw/microblaze/petalogix_ml605_mmu.c +1 -0
@@ -223,6 +223,7 @@ static void petalogix_ml605_machine_init(MachineClass *mc) mc->desc ="PetaLogix linux refdesign for xilinx ml605 (little endian)" ;#endif mc->init = petalogix_ml605_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("petalogix-ml605" , petalogix_ml605_machine_init)
hw/microblaze/petalogix_s3adsp1800_mmu.c +1 -0
@@ -146,6 +146,7 @@ static void petalogix_s3adsp1800_machine_class_init(ObjectClass *oc, void *data) mc->desc ="PetaLogix linux refdesign for xilinx Spartan 3ADSP1800" ; mc->init = petalogix_s3adsp1800_init; mc->is_default = true; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo petalogix_s3adsp1800_machine_types[] = {
hw/microblaze/xlnx-zynqmp-pmu.c +1 -0
@@ -188,6 +188,7 @@ static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) mc->desc ="Xilinx ZynqMP PMU machine (little endian)" ;#endif mc->init = xlnx_zynqmp_pmu_init; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("xlnx-zynqmp-pmu" , xlnx_zynqmp_pmu_machine_init)
hw/mips/boston.c +1 -0
@@ -842,6 +842,7 @@ static void boston_mach_class_init(MachineClass *mc) mc->default_ram_id ="boston.ddr" ; mc->max_cpus =16 ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("I6400" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("boston" , boston_mach_class_init)
hw/mips/fuloong2e.c +1 -0
@@ -335,6 +335,7 @@ static void mips_fuloong2e_machine_init(MachineClass *mc) mc->default_ram_size =256 * MiB; mc->default_ram_id ="fuloong2e.ram" ; mc->minimum_page_bits =14 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
hw/mips/jazz.c +2 -0
@@ -424,6 +424,7 @@ static void mips_magnum_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("R4000" ); mc->default_ram_id ="mips_jazz.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo mips_magnum_type = {
@@ -441,6 +442,7 @@ static void mips_pica61_class_init(ObjectClass *oc, void *data) mc->block_default_type =IF_SCSI ; mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("R4000" ); mc->default_ram_id ="mips_jazz.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo mips_pica61_type = {
hw/mips/loongson3_virt.c +1 -0
@@ -679,6 +679,7 @@ static void loongson3v_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size =1600 * MiB; mc->minimum_page_bits =14 ; mc->default_nic ="virtio-net-pci" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo loongson3_machine_types[] = {
hw/mips/malta.c +1 -0
@@ -1306,6 +1306,7 @@ static void mips_malta_machine_init(MachineClass *mc) mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("24Kf" );#endif mc->default_ram_id ="mips_malta.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;compat_props_add (mc->compat_props, malta_compat, malta_compat_len); }
hw/mips/mipssim.c +1 -0
@@ -247,6 +247,7 @@ static void mips_mipssim_machine_init(MachineClass *mc) mc->default_cpu_type =MIPS_CPU_TYPE_NAME ("24Kf" );#endif mc->default_ram_id ="mips_mipssim.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("mipssim" , mips_mipssim_machine_init)
hw/openrisc/openrisc_sim.c +1 -0
@@ -368,6 +368,7 @@ static void openrisc_sim_machine_init(ObjectClass *oc, void *data) mc->max_cpus =OR1KSIM_CPUS_MAX ; mc->is_default = true; mc->default_cpu_type =OPENRISC_CPU_TYPE_NAME ("or1200" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo or1ksim_machine_typeinfo = {
hw/openrisc/virt.c +1 -0
@@ -554,6 +554,7 @@ static void openrisc_virt_machine_init(ObjectClass *oc, void *data) mc->max_cpus =VIRT_CPUS_MAX ; mc->is_default = false; mc->default_cpu_type =OPENRISC_CPU_TYPE_NAME ("or1200" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo or1ksim_machine_typeinfo = {
hw/ppc/amigaone.c +1 -0
@@ -173,6 +173,7 @@ static void amigaone_machine_init(MachineClass *mc) mc->default_display ="std" ; mc->default_ram_id ="ram" ; mc->default_ram_size =512 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("amigaone" , amigaone_machine_init)
hw/ppc/e500plat.c +1 -0
@@ -100,6 +100,7 @@ static void e500plat_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("e500v2_v30" ); mc->default_ram_id ="mpc8544ds.ram" ; mc->default_nic ="virtio-net-pci" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_class_allow_dynamic_sysbus_dev (mc,TYPE_ETSEC_COMMON ); }
hw/ppc/mac_newworld.c +1 -0
@@ -580,6 +580,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="cd" ; mc->default_display ="std" ; mc->default_nic ="sungem" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->kvm_type = core99_kvm_type;#ifdef TARGET_PPC64 mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("970fx_v3.1" );
hw/ppc/mac_oldworld.c +1 -0
@@ -427,6 +427,7 @@ static void heathrow_class_init(ObjectClass *oc, void *data) mc->default_nic ="ne2k_pci" ; mc->ignore_boot_device_suffixes = true; mc->default_ram_id ="ppc_heathrow.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; fwc->get_dev_path = heathrow_fw_dev_path; }
hw/ppc/mpc8544ds.c +1 -0
@@ -62,6 +62,7 @@ static void mpc8544ds_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("e500v2_v30" ); mc->default_ram_id ="mpc8544ds.ram" ; mc->default_nic ="virtio-net-pci" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }#define TYPE_MPC8544DS_MACHINE MACHINE_TYPE_NAME("mpc8544ds")
hw/ppc/pegasos2.c +1 -0
@@ -604,6 +604,7 @@ static void pegasos2_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("7457_v1.2" ); mc->default_ram_id ="pegasos2.ram" ; mc->default_ram_size =512 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); vhc->cpu_in_nested = pegasos2_cpu_in_nested;
hw/ppc/pnv.c +1 -0
@@ -2878,6 +2878,7 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data)/* Pnv provides a AHCI device for storage */ mc->block_default_type =IF_IDE ; mc->no_parallel =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_boot_order =NULL ;/* * RAM defaults to less than 2048 for 32-bit hosts, and large
hw/ppc/ppc405_boards.c +1 -0
@@ -351,6 +351,7 @@ static void ppc405_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size =128 * MiB; mc->default_ram_id ="ppc405.ram" ; mc->deprecation_reason ="machine is old and unmaintained" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo ppc405_machine_type = {
hw/ppc/ppc440_bamboo.c +1 -0
@@ -268,6 +268,7 @@ static void bamboo_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("440epb" ); mc->default_ram_id ="ppc4xx.sdram" ; mc->default_nic ="e1000" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("bamboo" , bamboo_machine_init)
hw/ppc/prep.c +1 -0
@@ -428,6 +428,7 @@ static void ibm_40p_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("604" ); mc->default_display ="std" ; mc->default_nic ="pcnet" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;machine_add_audiodev_property (mc); }
hw/ppc/sam460ex.c +1 -0
@@ -524,6 +524,7 @@ static void sam460ex_machine_init(MachineClass *mc) mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("460exb" ); mc->default_ram_size =512 * MiB; mc->default_ram_id ="ppc4xx.sdram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("sam460ex" , sam460ex_machine_init)
hw/ppc/spapr.c +1 -0
@@ -4594,6 +4594,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus =SPAPR_IRQ_NR_IPIS ; mc->no_parallel =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->default_boot_order ="" ; mc->default_ram_size =512 * MiB; mc->default_ram_id ="ppc_spapr.ram" ;
hw/ppc/virtex_ml507.c +1 -0
@@ -289,6 +289,7 @@ static void virtex_machine_init(MachineClass *mc) mc->init = virtex_init; mc->default_cpu_type =POWERPC_CPU_TYPE_NAME ("440-xilinx" ); mc->default_ram_id ="ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("virtex-ml507" , virtex_machine_init)
hw/remote/machine.c +1 -0
@@ -128,6 +128,7 @@ static void remote_machine_class_init(ObjectClass *oc, void *data) mc->init = remote_machine_init; mc->desc ="Experimental remote machine" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; hc->unplug = remote_machine_dev_unplug_cb;
hw/riscv/microchip_pfsoc.c +1 -0
@@ -650,6 +650,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data) mc->min_cpus =MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT +1 ; mc->default_cpus = mc->min_cpus; mc->default_ram_id ="microchip.icicle.kit.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;/* * Map 513 MiB high memory, the minimum required high memory size, because
hw/riscv/opentitan.c +1 -0
@@ -121,6 +121,7 @@ static void opentitan_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_IBEX ; mc->default_ram_id ="riscv.lowrisc.ibex.ram" ; mc->default_ram_size = ibex_memmap[IBEX_DEV_RAM ].size; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static void lowrisc_ibex_soc_init (Object *obj)
hw/riscv/shakti_c.c +1 -0
@@ -84,6 +84,7 @@ static void shakti_c_machine_class_init(ObjectClass *klass, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_SHAKTI_C ; mc->valid_cpu_types = valid_cpu_types; mc->default_ram_id ="riscv.shakti.c.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo shakti_c_machine_type_info = {
hw/riscv/sifive_e.c +1 -0
@@ -153,6 +153,7 @@ static void sifive_e_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =SIFIVE_E_CPU ; mc->default_ram_id ="riscv.sifive.e.ram" ; mc->default_ram_size = sifive_e_memmap[SIFIVE_E_DEV_DTIM ].size; + mc->no_sdcard =ON_OFF_AUTO_OFF ;object_class_property_add_bool (oc,"revb" , sifive_e_machine_get_revb, sifive_e_machine_set_revb);
hw/riscv/sifive_u.c +1 -0
@@ -724,6 +724,7 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =SIFIVE_U_CPU ; mc->default_cpus = mc->min_cpus; mc->default_ram_id ="riscv.sifive.u.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; object_class_property_add_bool(oc, "start-in-flash", sifive_u_machine_get_start_in_flash,
hw/riscv/spike.c +1 -0
@@ -358,6 +358,7 @@ static void spike_machine_class_init(ObjectClass *oc, void *data)/* platform instead of architectural choice */ mc->cpu_cluster_has_numa_boundary = true; mc->default_ram_id ="riscv.spike.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ;object_class_property_add_str (oc,"signature" ,NULL , spike_set_signature);object_class_property_set_description (oc,"signature" ,"File to write ACT test signature" );
hw/riscv/virt.c +1 -0
@@ -1918,6 +1918,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RISCV_CPU_BASE ; mc->block_default_type =IF_VIRTIO ; mc->no_cdrom =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; mc->pci_allow_0_address = true; mc->possible_cpu_arch_ids = riscv_numa_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = riscv_numa_cpu_index_to_props;
hw/rx/rx-gdbsim.c +1 -0
@@ -166,6 +166,7 @@ static void rx_gdbsim_class_init(ObjectClass *oc, void *data) mc->default_cpu_type =TYPE_RX62N_CPU ; mc->default_ram_size =16 * MiB; mc->default_ram_id ="ext-sdram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static void rx62n7_class_init (ObjectClass *oc,void *data)
hw/sh4/r2d.c +1 -0
@@ -383,6 +383,7 @@ static void r2d_machine_init(MachineClass *mc) mc->block_default_type =IF_IDE ; mc->default_cpu_type =TYPE_SH7751R_CPU ; mc->default_nic ="rtl8139" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("r2d" , r2d_machine_init)
hw/sparc/leon3.c +1 -0
@@ -440,6 +440,7 @@ static void leon3_generic_machine_init(MachineClass *mc) mc->default_cpu_type =SPARC_CPU_TYPE_NAME ("LEON3" ); mc->default_ram_id ="leon3.ram" ; mc->max_cpus =MAX_CPUS ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("leon3_generic" , leon3_generic_machine_init)
hw/sparc/sun4m.c +1 -0
@@ -1113,6 +1113,7 @@ static void sun4m_machine_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="c" ; mc->default_display ="tcx" ; mc->default_ram_id ="sun4m.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static void ss5_class_init (ObjectClass *oc,void *data)
hw/sparc64/niagara.c +1 -0
@@ -167,6 +167,7 @@ static void niagara_class_init(ObjectClass *oc, void *data) mc->default_boot_order ="c" ; mc->default_cpu_type =SPARC_CPU_TYPE_NAME ("Sun-UltraSparc-T1" ); mc->default_ram_id ="sun4v-partition.ram" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo niagara_type = {
hw/sparc64/sun4u.c +2 -0
@@ -809,6 +809,7 @@ static void sun4u_class_init(ObjectClass *oc, void *data) mc->default_display ="std" ; mc->default_nic ="sunhme" ; mc->no_parallel = !module_object_class_by_name (TYPE_ISA_PARALLEL ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; fwc->get_dev_path = sun4u_fw_dev_path;compat_props_add (mc->compat_props, hw_compat_sparc64, hw_compat_sparc64_len); }
@@ -836,6 +837,7 @@ static void sun4v_class_init(ObjectClass *oc, void *data) mc->default_display ="std" ; mc->default_nic ="sunhme" ; mc->no_parallel = !module_object_class_by_name (TYPE_ISA_PARALLEL ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo sun4v_type = {
hw/tricore/triboard.c +1 -0
@@ -73,6 +73,7 @@ static void triboard_machine_tc277d_class_init(ObjectClass *oc, mc->init = triboard_machine_init; mc->desc ="Infineon AURIX TriBoard TC277 (D-Step)" ; mc->max_cpus =1 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; amc->soc_name ="tc277d-soc" ; };
hw/tricore/tricore_testboard.c +1 -0
@@ -111,6 +111,7 @@ static void ttb_machine_init(MachineClass *mc) mc->desc ="a minimal TriCore board" ; mc->init = tricoreboard_init; mc->default_cpu_type =TRICORE_CPU_TYPE_NAME ("tc1796" ); + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("tricore_testboard" , ttb_machine_init)
hw/xen/xen-pvh-common.c +1 -0
@@ -381,6 +381,7 @@ static void xen_pvh_class_init(ObjectClass *oc, void *data) mc->default_machine_opts ="accel=xen" ;/* Set to zero to make sure that the real ram size is passed. */ mc->default_ram_size =0 ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xen_pvh_info = {
hw/xenpv/xen_machine_pv.c +1 -0
@@ -67,6 +67,7 @@ static void xenpv_machine_init(MachineClass *mc) mc->init = xen_init_pv; mc->max_cpus =1 ; mc->default_machine_opts ="accel=xen" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("xenpv" , xenpv_machine_init)
hw/xtensa/sim.c +1 -0
@@ -125,6 +125,7 @@ static void xtensa_sim_machine_init(MachineClass *mc) mc->max_cpus =4 ; mc->no_serial =1 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("sim" , xtensa_sim_machine_init)
hw/xtensa/virt.c +1 -0
@@ -122,6 +122,7 @@ static void xtensa_virt_machine_init(MachineClass *mc) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_nic ="virtio-net-pci" ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }DEFINE_MACHINE ("virt" , xtensa_virt_machine_init)
hw/xtensa/xtfpga.c +8 -0
@@ -594,6 +594,7 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =64 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_lx60_type = {
@@ -611,6 +612,7 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =64 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_lx60_nommu_type = {
@@ -628,6 +630,7 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =96 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_lx200_type = {
@@ -645,6 +648,7 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =96 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_lx200_nommu_type = {
@@ -662,6 +666,7 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =512 * MiB -XTFPGA_MMU_RESERVED_MEMORY_SIZE ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_ml605_type = {
@@ -679,6 +684,7 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =256 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_ml605_nommu_type = {
@@ -696,6 +702,7 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_TYPE ; mc->default_ram_size =1 * GiB -XTFPGA_MMU_RESERVED_MEMORY_SIZE ; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_kc705_type = {
@@ -713,6 +720,7 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data) mc->max_cpus =32 ; mc->default_cpu_type =XTENSA_DEFAULT_CPU_NOMMU_TYPE ; mc->default_ram_size =256 * MiB; + mc->no_sdcard =ON_OFF_AUTO_OFF ; }static const TypeInfo xtfpga_kc705_nommu_type = {
system/vl.c +1 -0
@@ -1346,6 +1346,7 @@ static void qemu_disable_default_devices(void)if (!has_defaults || machine_class->no_cdrom) { default_cdrom =0 ; } +assert (machine_class->no_sdcard !=ON_OFF_AUTO_AUTO );if (!has_defaults || machine_class->no_sdcard ==ON_OFF_AUTO_ON ) { default_sdcard =0 ; }
Signature · 1 line
2.47.1
[PULL 26/32] hw/boards: Ensure machine setting auto_create_sdcard expose a SD Bus
In reply to Philippe Mathieu-DaudéUsing the auto_create_sdcard feature without SD Bus is irrelevant.
Message-Id: <[email protected]>
--- system/vl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
system/vl.c +16 -0
@@ -53,6 +53,7 @@#include "hw/usb.h" #include "hw/isa/isa.h" #include "hw/scsi/scsi.h" +#include "hw/sd/sd.h" #include "hw/display/vga.h" #include "hw/firmware/smbios.h" #include "hw/acpi/acpi.h"
@@ -2661,12 +2662,27 @@ static void qemu_init_displays(void)static void qemu_init_board (void ) { +MachineClass *machine_class =MACHINE_GET_CLASS (current_machine); +/* process plugin before CPUs are created, but once -smp has been parsed */ qemu_plugin_load_list (&plugin_list, &error_fatal);/* From here on we enter MACHINE_PHASE_INITIALIZED. */ machine_run_board_init (current_machine, mem_path, &error_fatal); +if (machine_class->auto_create_sdcard) { +bool ambigous; + +/* Ensure there is a SD bus available to create SD card on */ +Object *obj =object_resolve_path_type ("" ,TYPE_SD_BUS , &ambigous); +if (!obj && !ambigous) { +fprintf (stderr,"Can not create sd-card on '%s' machine" +" because it lacks a sd-bus\n" , + machine_class->name); +abort (); + } + } +drive_check_orphaned ();realtime_init ();
Signature · 1 line
2.47.1
[PULL 31/32] hw/riscv/opentitan: Include missing 'exec/address-spaces.h' header
In reply to Philippe Mathieu-Daudéopentitan_machine_init() calls get_system_memory(), which is declared in "exec/address-spaces.h". Include it in order to avoid when refactoring unrelated headers:
hw/riscv/opentitan.c:83:29: error: call to undeclared function 'get_system_memory'
83 | MemoryRegion *sys_mem = get_system_memory();
| ^Message-Id: <[email protected]>
--- hw/riscv/opentitan.c | 1 + 1 file changed, 1 insertion(+)
hw/riscv/opentitan.c +1 -0
@@ -28,6 +28,7 @@#include "hw/riscv/boot.h" #include "qemu/units.h" #include "system/system.h" +#include "exec/address-spaces.h" /* * This version of the OpenTitan machine currently supports
Signature · 1 line
2.47.1
[PULL 13/32] hw/vfio: Have VFIO_PLATFORM devices inherit from DYNAMIC_SYS_BUS_DEVICE
In reply to Philippe Mathieu-DaudéDo not explain why VFIO_PLATFORM devices are user_creatable, have them inherit TYPE_DYNAMIC_SYS_BUS_DEVICE, to make explicit that they can optionally be plugged on TYPE_PLATFORM_BUS_DEVICE.
Message-Id: <[email protected]>
--- hw/vfio/amd-xgbe.c | 2 -- hw/vfio/calxeda-xgmac.c | 2 -- hw/vfio/platform.c | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-)
hw/vfio/amd-xgbe.c +0 -2
@@ -41,8 +41,6 @@ static void vfio_amd_xgbe_class_init(ObjectClass *klass, void *data) &vcxc->parent_realize); dc->desc ="VFIO AMD XGBE" ; dc->vmsd = &vfio_platform_amd_xgbe_vmstate; -/* Supported by TYPE_VIRT_MACHINE */ - dc->user_creatable = true; }static const TypeInfo vfio_amd_xgbe_dev_info = {
hw/vfio/calxeda-xgmac.c +0 -2
@@ -41,8 +41,6 @@ static void vfio_calxeda_xgmac_class_init(ObjectClass *klass, void *data) &vcxc->parent_realize); dc->desc ="VFIO Calxeda XGMAC" ; dc->vmsd = &vfio_platform_calxeda_xgmac_vmstate; -/* Supported by TYPE_VIRT_MACHINE */ - dc->user_creatable = true; }static const TypeInfo vfio_calxeda_xgmac_dev_info = {
hw/vfio/platform.c +1 -3
@@ -672,13 +672,11 @@ static void vfio_platform_class_init(ObjectClass *klass, void *data) dc->desc ="VFIO-based platform device assignment" ; sbc->connect_irq_notifier = vfio_start_irqfd_injection;set_bit (DEVICE_CATEGORY_MISC , dc->categories); -/* Supported by TYPE_VIRT_MACHINE */ - dc->user_creatable = true; }static const TypeInfo vfio_platform_dev_info = { .name =TYPE_VFIO_PLATFORM , - .parent =TYPE_SYS_BUS_DEVICE , + .parent =TYPE_DYNAMIC_SYS_BUS_DEVICE , .instance_size =sizeof (VFIOPlatformDevice), .instance_init = vfio_platform_instance_init, .class_init = vfio_platform_class_init,
Signature · 1 line
2.47.1
Quoted 16 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches
Quoted 8 lines
- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368
Thanks,
Stefan
Quoted 114 lines
- Prevent out-of-bound access in SMC91C111 RX path (Peter)
----------------------------------------------------------------
Bernhard Beschow (1):
hw/xen: Prefer QOM cast for XenLegacyDevicePeter Maydell (1):
hw/net/smc91c111: Ignore attempt to pop from empty RX fifoPhil Dennis-Jordan (1):
hw/intc/apic: Fixes magic number use, removes outdated commentPhilippe Mathieu-Daudé (28):
backends/tpm: Useqemu_hexdump_line()to avoidsprintf()hw/intc/xilinx_intc: Make device endianness configurable hw/net/xilinx_ethlite: Make device endianness configurable hw/timer/xilinx_timer: Make device endianness configurable hw/char/xilinx_uartlite: Make device endianness configurable hw/ssi/xilinx_spi: Make device endianness configurable hw/arm/xlnx-zynqmp: Use&error_abortfor programming errors hw/sysbus: Use sizeof(BusState) inmain_system_bus_create()hw/sysbus: Declare QOM types usingDEFINE_TYPES()macro hw/sysbus: IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE
hw/vfio: HaveVFIO_PLATFORMdevices inherit from
DYNAMIC_SYS_BUS_DEVICE
hw/display: Have RAMFB device inherit fromDYNAMIC_SYS_BUS_DEVICEhw/i386: HaveX86_IOMMUdevices inherit fromDYNAMIC_SYS_BUS_DEVICEhw/net: Have eTSEC device inherit fromDYNAMIC_SYS_BUS_DEVICEhw/tpm: Have TPM TIS sysbus device inherit fromDYNAMIC_SYS_BUS_DEVICEhw/xen: Have legacy Xen backend inherit fromDYNAMIC_SYS_BUS_DEVICEhw/boards: Convertno_sdcardflag to OnOffAuto tri-state hw/boards: Explicit no_sdcard=false asON_OFF_AUTO_OFFhw/boards: Renameno_sdcard->auto_create_sdcardhw/boards: Do not create unusable default if=sd drives hw/arm: Remove all invalid uses of auto_create_sdcard=true hw/riscv: Remove all invalid uses of auto_create_sdcard=true hw/boards: Ensure machine settingauto_create_sdcardexpose a SD Bus tests/functional: Explicit endianness of microblaze assets tests/functional: Allow microblaze tests to take a machine name
argument
tests/functional: Removesleep()kludges from microblaze tests tests/functional: Have microblaze tests inherit common parent class hw/riscv/opentitan: Include missing 'exec/address-spaces.h' headerZhao Liu (1):
hw/core/machine: Reject thread level cacheinclude/hw/boards.h | 2 +- include/hw/sysbus.h | 2 + include/hw/xen/xen_pvdev.h | 5 +- backends/tpm/tpm_util.c | 24 ++++---- hw/arm/aspeed.c | 20 +++++++ hw/arm/bananapi_m2u.c | 1 + hw/arm/cubieboard.c | 1 + hw/arm/exynos4_boards.c | 2 + hw/arm/fby35.c | 1 + hw/arm/imx25_pdk.c | 1 + hw/arm/integratorcp.c | 1 + hw/arm/mcimx6ul-evk.c | 1 + hw/arm/mcimx7d-sabre.c | 1 + hw/arm/npcm7xx_boards.c | 5 ++ hw/arm/omap_sx1.c | 2 + hw/arm/orangepi.c | 1 + hw/arm/raspi.c | 5 ++ hw/arm/raspi4b.c | 1 + hw/arm/realview.c | 4 ++ hw/arm/sabrelite.c | 1 + hw/arm/stellaris.c | 1 + hw/arm/versatilepb.c | 2 + hw/arm/vexpress.c | 2 + hw/arm/xilinx_zynq.c | 1 - hw/arm/xlnx-versal-virt.c | 1 + hw/arm/xlnx-zcu102.c | 1 + hw/arm/xlnx-zynqmp.c | 38 ++++-------- hw/char/xilinx_uartlite.c | 27 +++++---- hw/core/machine-smp.c | 7 +++ hw/core/null-machine.c | 1 - hw/core/sysbus.c | 54 ++++++++++------- hw/display/ramfb-standalone.c | 3 +- hw/i386/amd_iommu.c | 2 - hw/i386/intel_iommu.c | 2 - hw/i386/x86-iommu.c | 2 +- hw/intc/apic.c | 3 +- hw/intc/xilinx_intc.c | 52 +++++++++++----- hw/microblaze/petalogix_ml605_mmu.c | 3 + hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 ++ hw/net/fsl_etsec/etsec.c | 4 +- hw/net/smc91c111.c | 9 +++ hw/net/xilinx_ethlite.c | 20 +++++-- hw/ppc/virtex_ml507.c | 1 + hw/riscv/microchip_pfsoc.c | 1 + hw/riscv/opentitan.c | 1 + hw/riscv/sifive_u.c | 1 + hw/s390x/s390-virtio-ccw.c | 1 - hw/ssi/xilinx_spi.c | 24 +++++--- hw/timer/xilinx_timer.c | 35 +++++++---- hw/tpm/tpm_tis_sysbus.c | 3 +- hw/usb/xen-usb.c | 6 +- hw/vfio/amd-xgbe.c | 2 - hw/vfio/calxeda-xgmac.c | 2 - hw/vfio/platform.c | 4 +- hw/xen/xen-legacy-backend.c | 9 +-- hw/xen/xen_pvdev.c | 2 +- system/vl.c | 24 ++++++-- .../functional/test_microblaze_s3adsp1800.py | 34 +++++++++-- .../test_microblazeel_s3adsp1800.py | 32 ++-------- tests/qemu-iotests/172.out | 60 ------------------- 60 files changed, 314 insertions(+), 248 deletions(-)--
2.47.1
Quoted 27 lines · Stefan Hajnoczi
Quoted 16 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/armbru into staging (2025-02-10 10:47:31 -0500)are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patchesQuoted 8 lines
- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368
Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
2025-02-11 16:24:55,525 - DEBUG: Extract
/builds/qemu-project/qemu/functional-cache/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22 format=Nonesub_dir=None member=None
which is correct:
$ sha256sum day13.tar.gz b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22 day13.tar.gz
Did you restart the job to see if it is a network issue?
Regards,
Phil.
Quoted 28 lines · Philippe Mathieu-Daudé
Quoted 27 lines · Stefan Hajnoczi
Quoted 24 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)
Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
-class MicroblazeelMachine(QemuSystemTest):
+class MicroblazeLittleEndianMachine(MicroblazeMachine):
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Quoted 15 lines
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368/artifacts/ external_file/build/tests/functional/microblazeel/ test_microblazeel_s3adsp1800.MicroblazeLittleEndianMachine.test_microblaze_s3adsp1800_legacy_le/base.log content is:
2025-02-11 16:24:55,525 - DEBUG: Extract /builds/qemu-project/qemu/functional-cache/download/
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22format=Nonesub_dir=None member=Nonewhich is correct:
$ sha256sum day13.tar.gz b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22 day13.tar.gzDid you restart the job to see if it is a network issue?
Regards,
Phil.
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé
Quoted 27 lines · Stefan Hajnoczi
Quoted 24 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):
Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Well, apparently related to network failure:
INFO:qemu-test:Downloading http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz to /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22... ERROR:qemu-test:Unable to download http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz: HTTP Error 403: Forbidden
$ curl -v http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz
Quoted 1 line
GET /2023/download/day13.tar.gz HTTP/1.1
< HTTP/1.1 301 Moved Permanently
< Location: https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz
Using:
-- >8 --
tests/functional/test_microblaze_s3adsp1800.py +1 -1
@@ -24,3 +24,3 @@ class MicroblazeMachine(QemuSystemTest): ASSET_IMAGE_LE = Asset( - ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), + ('https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
---
I still get:
INFO:qemu-test:Downloading https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz to /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22...
However:
$ curl --http1.0 -v https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz
Quoted 1 line
GET /2023/download/day13.tar.gz HTTP/1.0
< HTTP/1.0 200 OK
< Content-Length: 4752277
< Content-Type: application/gzip
So I'm confused...
Quoted 16 lines
Quoted 15 lines
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368/artifacts/ external_file/build/tests/functional/microblazeel/ test_microblazeel_s3adsp1800.MicroblazeLittleEndianMachine.test_microblaze_s3adsp1800_legacy_le/base.log content is:
2025-02-11 16:24:55,525 - DEBUG: Extract /builds/qemu-project/qemu/ functional-cache/download/ b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22 format=Nonesub_dir=None member=Nonewhich is correct:
$ sha256sum day13.tar.gz b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22 day13.tar.gzDid you restart the job to see if it is a network issue?
Regards,
Phil.
Quoted 80 lines · Philippe Mathieu-Daudé
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé
Quoted 27 lines · Stefan Hajnoczi
Quoted 24 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Well, apparently related to network failure:
INFO:qemu-test:Downloading http://www.qemu-advent-calendar.org/2023/ download/day13.tar.gz to /Users/philmd/.cache/qemu/download/
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22... ERROR:qemu-test:Unable to download http://www.qemu-advent-calendar.org/2023/ download/day13.tar.gz: HTTP Error 403: Forbidden$ curl -v http://www.qemu-advent-calendar.org/2023/download/day13.tar.gzQuoted 1 line
GET /2023/download/day13.tar.gz HTTP/1.1
< HTTP/1.1 301 Moved Permanently
< Location: https://www.qemu-advent-calendar.org/2023/download/day13.tar.gzUsing:
-- >8 --
tests/functional/test_microblaze_s3adsp1800.py +1
-1@@ -24,3 +24,3 @@ class MicroblazeMachine(QemuSystemTest): ASSET_IMAGE_LE = Asset( - ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'), + ('https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),'
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
---I still get:
INFO:qemu-test:Downloading https://www.qemu-advent-calendar.org/2023/ download/day13.tar.gz to /Users/philmd/.cache/qemu/download/
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22...However:
Quoted 7 lines
$ curl --http1.0 -v https://www.qemu-advent-calendar.org/2023/download/ day13.tar.gzQuoted 1 line
GET /2023/download/day13.tar.gz HTTP/1.0
< HTTP/1.0 200 OK
< Content-Length: 4752277
< Content-Type: application/gzipSo I'm confused...
Looks like this also happens in test runs without your patches:
https://gitlab.com/qemu-project/qemu/-/jobs/9108828196#L844
The test then silently gets skipped there (since we only fail hard for a 404 error now).
Maybe Eldon could comment why the downloads are blocked for python scripts but not for curl downloads?
I the worst case, we have to mirror the asset to another place, I guess...
Thomas
Quoted 91 lines · Thomas Huth
Quoted 80 lines · Philippe Mathieu-Daudé
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé
Quoted 27 lines · Stefan Hajnoczi
Quoted 24 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Well, apparently related to network failure:
INFO:qemu-test:Downloading http://www.qemu-advent-calendar.org/2023/ download/day13.tar.gz to /Users/philmd/.cache/qemu/download/
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22... ERROR:qemu-test:Unable to download http://www.qemu-advent- calendar.org/2023/ download/day13.tar.gz: HTTP Error 403: Forbidden$ curl -v http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz > GET /2023/download/day13.tar.gz HTTP/1.1 < HTTP/1.1 301 Moved Permanently < Location: https://www.qemu-advent-calendar.org/2023/download/day13.tar.gzUsing:
-- >8 --
tests/functional/test_microblaze_s3adsp1800.py +0
-0@@ -24,3 +24,3 @@ class MicroblazeMachine(QemuSystemTest):
ASSET_IMAGE_LE= Asset(
- ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
+ ('https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),'
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
---I still get:
INFO:qemu-test:Downloading https://www.qemu-advent-calendar.org/2023/ download/day13.tar.gz to /Users/philmd/.cache/qemu/download/
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22...However:
Quoted 7 lines
$ curl --http1.0 -v https://www.qemu-advent-calendar.org/2023/download/ day13.tar.gz > GET /2023/download/day13.tar.gz HTTP/1.0 < HTTP/1.0 200 OK < Content-Length: 4752277 < Content-Type: application/gzipSo I'm confused...
Looks like this also happens in test runs without your patches:
Quoted 7 lines
https://gitlab.com/qemu-project/qemu/-/jobs/9108828196#L844
The test then silently gets skipped there (since we only fail hard for a 404 error now).
Maybe Eldon could comment why the downloads are blocked for python scripts but not for curl downloads?
I the worst case, we have to mirror the asset to another place, I guess...
Ok, I've now also put the image here:
https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day05.tar.xz
(just had to use a different day number there since 13 was an image that I did not want to sacrifice in the best-of roaster).
So if the qemu-advent-calendar.org server keeps refusing the downloads, you should be able to use the mirrored tarball instead.
HTH,
Thomas
Quoted 116 lines · Thomas Huth
Quoted 103 lines · Thomas Huth
Quoted 89 lines · Philippe Mathieu-Daudé
Quoted 47 lines · Philippe Mathieu-Daudé
Quoted 31 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Stefan Hajnoczi
Quoted 27 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/
armbru into staging (2025-02-10 10:47:31 -0500)are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Well, apparently related to network failure:
INFO:qemu-test:Downloading http://www.qemu-advent-calendar.org/2023/
download/day13.tar.gz to /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22... ERROR:qemu-test:Unable to download http://www.qemu-advent-
calendar.org/2023/ download/day13.tar.gz: HTTP Error 403: Forbidden$ curl -v http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz > GET /2023/download/day13.tar.gz HTTP/1.1 < HTTP/1.1 301 Moved Permanently < Location: https://www.qemu-advent-calendar.org/2023/download/day13.tar.gzUsing:
-- >8 --
tests/ renamed from tests/functional/test_microblaze_s3adsp1800.py +0
-0
functional/test_microblaze_s3adsp1800.py
index177c8a685bc..949e627c84a100755tests/functional/test_microblaze_s3adsp1800.py +0
-0@@ -24,3 +24,3 @@ class MicroblazeMachine(QemuSystemTest):
ASSET_IMAGE_LE= Asset(
- ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
+ ('https://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),'
b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
---I still get:
INFO:qemu-test:Downloading https://www.qemu-advent-calendar.org/2023/
download/day13.tar.gz to /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22...However:
Quoted 8 lines
$ curl --http1.0 -v https://www.qemu-advent-calendar.org/2023/download/ day13.tar.gz > GET /2023/download/day13.tar.gz HTTP/1.0 < HTTP/1.0 200 OK < Content-Length: 4752277 < Content-Type: application/gzipSo I'm confused...
Looks like this also happens in test runs without your patches:
Quoted 7 lines
The test then silently gets skipped there (since we only fail hard for a 404 error now).
Maybe Eldon could comment why the downloads are blocked for python scripts but not for curl downloads?
I the worst case, we have to mirror the asset to another place, I guess...
Ok, I've now also put the image here:
https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day05.tar.xz
Quoted 10 lines
(just had to use a different day number there since 13 was an image that I did not want to sacrifice in the best-of roaster).
So if the qemu-advent-calendar.org server keeps refusing the downloads, you should be able to use the mirrored tarball instead.
HTH,
Thomas
Hello! I recently switched some of the underlying object storage for sites including the advent calendar, and this was a (very) unintended consequence. I have now switched to a good old apache upstream for these, so I would not expect this error to recur. Also, looking to make another attempt at a calendar for 2025 (end of 2024 was a complicated time for me). Let me know if you'd like to produce/contribute!
Thanks,
Eldon
Quoted 5 lines · Eldon Stegall
Quoted 4 lines · Thomas Huth
Quoted 3 lines · Thomas Huth
Quoted 2 lines · Philippe Mathieu-Daudé
Quoted 1 line · Philippe Mathieu-Daudé
On 11/2/25 19:48, Philippe Mathieu-Daudé wrote:
[...]
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Well, apparently related to network failure:
INFO:qemu-test:Downloading http://www.qemu-advent-calendar.org/2023/
download/day13.tar.gz to /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22... ERROR:qemu-test:Unable to download http://www.qemu-advent-
calendar.org/2023/ download/day13.tar.gz: HTTP Error 403: Forbidden
[...]
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 10 lines
However:
$ curl --http1.0 -v https://www.qemu-advent-calendar.org/2023/download/ day13.tar.gz > GET /2023/download/day13.tar.gz HTTP/1.0 < HTTP/1.0 200 OK < Content-Length: 4752277 < Content-Type: application/gzipSo I'm confused...
Looks like this also happens in test runs without your patches:
https://gitlab.com/qemu-project/qemu/-/jobs/9108828196#L844
The test then silently gets skipped there (since we only fail hard for a 404 error now).
Maybe Eldon could comment why the downloads are blocked for python scripts but not for curl downloads?
I the worst case, we have to mirror the asset to another place, I guess...
[...]
Quoted 4 lines
Hello! I recently switched some of the underlying object storage for sites including the advent calendar, and this was a (very) unintended consequence. I have now switched to a good old apache upstream for these, so I would not expect this error to recur.
Thanks a lot for the quick fix!
Quoted 3 lines
Also, looking to make
another attempt at a calendar for 2025 (end of 2024 was a complicated time for me). Let me know if you'd like to produce/contribute!
Sure, count me in for an image or two!
Thomas
Quoted 44 lines · Philippe Mathieu-Daudé
Quoted 28 lines · Philippe Mathieu-Daudé
Quoted 27 lines · Stefan Hajnoczi
Quoted 24 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)
are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):
Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
I guess you could fix it with:
tests/functional/test_microblaze_s3adsp1800.py +2 -0
@@ -57,6 +57,8 @@ def do_xmaton_le_test(self, machine): class MicroblazeBigEndianMachine(MicroblazeMachine): + ASSET_IMAGE_BE = MicroblazeMachine.ASSET_IMAGE_BE + def test_microblaze_s3adsp1800_legacy_be(self): self.do_ballerina_be_test('petalogix-s3adsp1800')
tests/functional/test_microblazeel_s3adsp1800.py +2 -0
@@ -13,6 +13,8 @@ class MicroblazeLittleEndianMachine(MicroblazeMachine): + ASSET_IMAGE_LE = MicroblazeMachine.ASSET_IMAGE_LE + def test_microblaze_s3adsp1800_legacy_le(self): self.do_xmaton_le_test('petalogix-s3adsp1800')
(this still won't help with the strange 403 error ... maybe we have to mirror the asset in another place now if the advent-calendar site does not work reliably anymore...)
Thomas
Quoted 48 lines · Philippe Mathieu-Daudé
Quoted 32 lines · Philippe Mathieu-Daudé
Quoted 31 lines · Stefan Hajnoczi
Quoted 28 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of
https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo (2025-02-10 21:30:44 +0100)
----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):
Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Yes, my code assumes all assets are on the leaf test classes. I'll look at a fix since it is easy enough to check parent classes too.
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Quoted 49 lines · Daniel P. Berrangé
Quoted 48 lines · Philippe Mathieu-Daudé
Quoted 32 lines · Philippe Mathieu-Daudé
Quoted 31 lines · Stefan Hajnoczi
Quoted 28 lines · Philippe Mathieu-Daudé
The following changes since commit
54e91d1523b412b4cff7cb36c898fa9dc133e886:Merge tag 'pull-qapi-2025-02-10-v2' of
https://repo.or.cz/qemu/ armbru into staging (2025-02-10 10:47:31 -0500)are available in the Git repository at:
https://github.com/philmd/qemu.git tags/hw-misc-20250210
for you to fetch changes up to
1078a376932cc1d1c501ee3643fef329da6a189a:hw/net/smc91c111: Ignore attempt to pop from empty RX fifo
(2025-02-10 21:30:44 +0100)----------------------------------------------------------------
Misc HW patches- Use
qemu_hexdump_line()in TPM backend (Philippe)
- Make various Xilinx devices endianness configurable (Philippe)
- Remove magic number in APIC (Phil)
- Disable thread-level cache topology (Zhao)
- Xen QOM style cleanups (Bernhard)
- IntroduceTYPE_DYNAMIC_SYS_BUS_DEVICE(Philippe)
- Invert logic of machineno_sdcardflag (Philippe)
- Housekeeping in MicroBlaze functional tests (Philippe)Quoted 6 lines
Quoted 2 lines
Please take a look at this CI failure:
https://gitlab.com/qemu-project/qemu/-/jobs/9106591368Hmm I can not reproduce locally this error:
Exception: Asset cache is invalid and downloads disabled
OK, I could reproduce by blowing my cache away.
The problem seems in the "tests/functional: Have microblaze tests inherit common parent class" patch, which does:
(quoted diff) +1
-1-class MicroblazeelMachine(QemuSystemTest): +class MicroblazeLittleEndianMachine(MicroblazeMachine):
Quoted 6 lines
Quoted 3 lines
I presume, since MicroblazeLittleEndianMachine is no more a direct child of QemuSystemTest, then the ASSET_IMAGE_* aren't automatically downloaded.
Yes, my code assumes all assets are on the leaf test classes. I'll look at a fix since it is easy enough to check parent classes too.
Actually your code works fine :) I mis-interpreted the network issue:
DEBUG:qemu-test:Extract /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22 format=Nonesub_dir=None member=None INFO:qemu-test:Downloading http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz to /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22... DEBUG:qemu-test:Unable to set xattr on /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22.download: module 'os' has no attribute 'setxattr' INFO:qemu-test:Cached http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz at /Users/philmd/.cache/qemu/download/b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22