mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'pull-prop-20241215' of https://gitlab.com/rth7680/qemu into staging
Constify almost all struct Property # -----BEGIN PGP SIGNATURE----- # # iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmdfJ5wdHHJpY2hhcmQu # aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV9KYAf+Lu4rFaJ99LVVDPXJ # A3e9eIciGS1qS8RYACiaMZvpteYJeSPJriPSw7d5LY0H6rr7Az3dRVX5x3xI5C3u # tz7VvNu8agxkCqab6k5xWH1FyNaFi+3u8Yqnbtm5fcAEkf6QdbEPONEZbKeGQuDH # bxQ3EJvj+fmc5/Fdcp/SoFnDNcM65PVgi5PUKiAFEE1dxvtUfYQx5DjokyehyhsS # 4O6UEcLWOW+50CYy7X256ifSPaDz6HXBIIJVgCk9+347mKOLsZ3HbNalxXLdj+N0 # a148b+7ans8A88NZ6m5bezhlj0x9lEuK+6AocZmntYuFqOYcJVuzC40dEd9mj93J # 8W8E7A== # =EA7k # -----END PGP SIGNATURE----- # gpg: Signature made Sun 15 Dec 2024 14:01:48 EST # gpg: using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F # gpg: issuer "richard.henderson@linaro.org" # gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full] # Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F * tag 'pull-prop-20241215' of https://gitlab.com/rth7680/qemu: (67 commits) docs: Constify all Property in examples tests/unit: Constify all Property hw/xen: Constify all Property hw/watchdog: Constify all Property hw/virtio: Constify all Property hw/vfio: Constify all Property hw/usb: Constify all Property hw/ufs: Constify all Property hw/tpm: Constify all Property hw/timer: Constify all Property hw/ssi: Constify all Property hw/sparc64: Constify all Property hw/sparc: Constify all Property hw/sd: Constify all Property hw/scsi: Constify all Property hw/s390x: Constify all Property hw/rx: Constify all Property hw/rtc: Constify all Property hw/riscv: Constify all Property hw/remote: Constify all Property ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
+1
-1
@@ -183,7 +183,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)
|
||||
* This can't go in hw/core/cpu.c because that file is compiled only
|
||||
* once for both user-mode and system builds.
|
||||
*/
|
||||
static Property cpu_common_props[] = {
|
||||
static const Property cpu_common_props[] = {
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
/*
|
||||
* Create a property for the user-only object, so users can
|
||||
|
||||
@@ -198,7 +198,7 @@ was done::
|
||||
|
||||
The relevant parts for migration are::
|
||||
|
||||
@@ -1281,7 +1284,8 @@ static Property virtio_blk_properties[] = {
|
||||
@@ -1281,7 +1284,8 @@ static const Property virtio_blk_properties[] = {
|
||||
#endif
|
||||
DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,
|
||||
true),
|
||||
@@ -395,7 +395,7 @@ the old behaviour or the new behaviour::
|
||||
index 8a87ccc8b0..5153ad63d6 100644
|
||||
--- a/hw/pci/pci.c
|
||||
+++ b/hw/pci/pci.c
|
||||
@@ -79,6 +79,8 @@ static Property pci_props[] = {
|
||||
@@ -79,6 +79,8 @@ static const Property pci_props[] = {
|
||||
DEFINE_PROP_STRING("failover_pair_id", PCIDevice,
|
||||
failover_pair_id),
|
||||
DEFINE_PROP_UINT32("acpi-index", PCIDevice, acpi_index, 0),
|
||||
|
||||
@@ -101,7 +101,7 @@ manually instantiated:
|
||||
VirtIOBlock vdev;
|
||||
};
|
||||
|
||||
static Property virtio_blk_pci_properties[] = {
|
||||
static const Property virtio_blk_pci_properties[] = {
|
||||
DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
|
||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||
|
||||
@@ -243,7 +243,7 @@ static const VMStateDescription vmstate_virtio_9p = {
|
||||
},
|
||||
};
|
||||
|
||||
static Property virtio_9p_properties[] = {
|
||||
static const Property virtio_9p_properties[] = {
|
||||
DEFINE_PROP_STRING("mount_tag", V9fsVirtioState, state.fsconf.tag),
|
||||
DEFINE_PROP_STRING("fsdev", V9fsVirtioState, state.fsconf.fsdev_id),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
||||
+1
-1
@@ -1011,7 +1011,7 @@ static void erst_reset(DeviceState *dev)
|
||||
trace_acpi_erst_reset_out(le32_to_cpu(s->header->record_count));
|
||||
}
|
||||
|
||||
static Property erst_properties[] = {
|
||||
static const Property erst_properties[] = {
|
||||
DEFINE_PROP_LINK(ACPI_ERST_MEMDEV_PROP, ERSTDeviceState, hostmem,
|
||||
TYPE_MEMORY_BACKEND, HostMemoryBackend *),
|
||||
DEFINE_PROP_UINT32(ACPI_ERST_RECORD_SIZE_PROP, ERSTDeviceState,
|
||||
|
||||
@@ -316,7 +316,7 @@ static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
|
||||
qemu_irq_pulse(s->irq);
|
||||
}
|
||||
|
||||
static Property acpi_ged_properties[] = {
|
||||
static const Property acpi_ged_properties[] = {
|
||||
DEFINE_PROP_UINT32("ged-event", AcpiGedState, ged_event_bitmap, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
+1
-1
@@ -602,7 +602,7 @@ static void piix4_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
|
||||
acpi_send_gpe_event(&s->ar, s->irq, ev);
|
||||
}
|
||||
|
||||
static Property piix4_pm_properties[] = {
|
||||
static const Property piix4_pm_properties[] = {
|
||||
DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),
|
||||
DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 0),
|
||||
DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 0),
|
||||
|
||||
+1
-1
@@ -214,7 +214,7 @@ static void vmgenid_realize(DeviceState *dev, Error **errp)
|
||||
vmgenid_update_guest(vms);
|
||||
}
|
||||
|
||||
static Property vmgenid_device_properties[] = {
|
||||
static const Property vmgenid_device_properties[] = {
|
||||
DEFINE_PROP_UUID(VMGENID_GUID, VmGenIdState, guid),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
+1
-1
@@ -286,7 +286,7 @@ static const VMStateDescription vmstate_aspeed_adc_engine = {
|
||||
}
|
||||
};
|
||||
|
||||
static Property aspeed_adc_engine_properties[] = {
|
||||
static const Property aspeed_adc_engine_properties[] = {
|
||||
DEFINE_PROP_UINT32("engine-id", AspeedADCEngineState, engine_id, 0),
|
||||
DEFINE_PROP_UINT32("nr-channels", AspeedADCEngineState, nr_channels, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
|
||||
@@ -267,7 +267,7 @@ static const VMStateDescription vmstate_npcm7xx_adc = {
|
||||
},
|
||||
};
|
||||
|
||||
static Property npcm7xx_timer_properties[] = {
|
||||
static const Property npcm7xx_timer_properties[] = {
|
||||
DEFINE_PROP_UINT32("iref", NPCM7xxADCState, iref, NPCM7XX_ADC_DEFAULT_IREF),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
+4
-4
@@ -72,12 +72,12 @@ struct ARMSSEInfo {
|
||||
bool has_cpu_pwrctrl;
|
||||
bool has_sse_counter;
|
||||
bool has_tcms;
|
||||
Property *props;
|
||||
const Property *props;
|
||||
const ARMSSEDeviceInfo *devinfo;
|
||||
const bool *irq_is_common;
|
||||
};
|
||||
|
||||
static Property iotkit_properties[] = {
|
||||
static const Property iotkit_properties[] = {
|
||||
DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
|
||||
MemoryRegion *),
|
||||
DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
|
||||
@@ -90,7 +90,7 @@ static Property iotkit_properties[] = {
|
||||
DEFINE_PROP_END_OF_LIST()
|
||||
};
|
||||
|
||||
static Property sse200_properties[] = {
|
||||
static const Property sse200_properties[] = {
|
||||
DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
|
||||
MemoryRegion *),
|
||||
DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
|
||||
@@ -107,7 +107,7 @@ static Property sse200_properties[] = {
|
||||
DEFINE_PROP_END_OF_LIST()
|
||||
};
|
||||
|
||||
static Property sse300_properties[] = {
|
||||
static const Property sse300_properties[] = {
|
||||
DEFINE_PROP_LINK("memory", ARMSSE, board_memory, TYPE_MEMORY_REGION,
|
||||
MemoryRegion *),
|
||||
DEFINE_PROP_UINT32("EXP_NUMIRQ", ARMSSE, exp_numirq, 64),
|
||||
|
||||
+2
-2
@@ -538,7 +538,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
|
||||
}
|
||||
}
|
||||
|
||||
static Property armv7m_properties[] = {
|
||||
static const Property armv7m_properties[] = {
|
||||
DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type),
|
||||
DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
|
||||
MemoryRegion *),
|
||||
@@ -631,7 +631,7 @@ void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename,
|
||||
qemu_register_reset(armv7m_reset, cpu);
|
||||
}
|
||||
|
||||
static Property bitband_properties[] = {
|
||||
static const Property bitband_properties[] = {
|
||||
DEFINE_PROP_UINT32("base", BitBandState, base, 0),
|
||||
DEFINE_PROP_LINK("source-memory", BitBandState, source_memory,
|
||||
TYPE_MEMORY_REGION, MemoryRegion *),
|
||||
|
||||
@@ -139,7 +139,7 @@ static bool aspeed_soc_boot_from_emmc(AspeedSoCState *s)
|
||||
return false;
|
||||
}
|
||||
|
||||
static Property aspeed_soc_properties[] = {
|
||||
static const Property aspeed_soc_properties[] = {
|
||||
DEFINE_PROP_LINK("dram", AspeedSoCState, dram_mr, TYPE_MEMORY_REGION,
|
||||
MemoryRegion *),
|
||||
DEFINE_PROP_LINK("memory", AspeedSoCState, memory, TYPE_MEMORY_REGION,
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include "target/arm/cpu-qom.h"
|
||||
#include "target/arm/gtimer.h"
|
||||
|
||||
static Property bcm2836_enabled_cores_property =
|
||||
static const Property bcm2836_enabled_cores_property =
|
||||
DEFINE_PROP_UINT32("enabled-cpus", BCM283XBaseState, enabled_cpus, 0);
|
||||
|
||||
static void bcm283x_base_init(Object *obj)
|
||||
|
||||
+1
-1
@@ -309,7 +309,7 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
|
||||
&s->iram_alias);
|
||||
}
|
||||
|
||||
static Property fsl_imx25_properties[] = {
|
||||
static const Property fsl_imx25_properties[] = {
|
||||
DEFINE_PROP_UINT32("fec-phy-num", FslIMX25State, phy_num, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
+1
-1
@@ -481,7 +481,7 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
|
||||
&s->ocram_alias);
|
||||
}
|
||||
|
||||
static Property fsl_imx6_properties[] = {
|
||||
static const Property fsl_imx6_properties[] = {
|
||||
DEFINE_PROP_UINT32("fec-phy-num", FslIMX6State, phy_num, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
+1
-1
@@ -718,7 +718,7 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error **errp)
|
||||
FSL_IMX6UL_OCRAM_ALIAS_ADDR, &s->ocram_alias);
|
||||
}
|
||||
|
||||
static Property fsl_imx6ul_properties[] = {
|
||||
static const Property fsl_imx6ul_properties[] = {
|
||||
DEFINE_PROP_UINT32("fec1-phy-num", FslIMX6ULState, phy_num[0], 0),
|
||||
DEFINE_PROP_UINT32("fec2-phy-num", FslIMX6ULState, phy_num[1], 1),
|
||||
DEFINE_PROP_BOOL("fec1-phy-connected", FslIMX6ULState, phy_connected[0],
|
||||
|
||||
+1
-1
@@ -736,7 +736,7 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
|
||||
&s->caam);
|
||||
}
|
||||
|
||||
static Property fsl_imx7_properties[] = {
|
||||
static const Property fsl_imx7_properties[] = {
|
||||
DEFINE_PROP_UINT32("fec1-phy-num", FslIMX7State, phy_num[0], 0),
|
||||
DEFINE_PROP_UINT32("fec2-phy-num", FslIMX7State, phy_num[1], 1),
|
||||
DEFINE_PROP_BOOL("fec1-phy-connected", FslIMX7State, phy_connected[0],
|
||||
|
||||
@@ -694,7 +694,7 @@ static void integratorcp_machine_init(MachineClass *mc)
|
||||
|
||||
DEFINE_MACHINE("integratorcp", integratorcp_machine_init)
|
||||
|
||||
static Property core_properties[] = {
|
||||
static const Property core_properties[] = {
|
||||
DEFINE_PROP_UINT32("memsz", IntegratorCMState, memsz, 0),
|
||||
DEFINE_PROP_END_OF_LIST(),
|
||||
};
|
||||
|
||||
+1
-1
@@ -222,7 +222,7 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
|
||||
create_unimplemented_device("usb", 0x40043000, 0x1000);
|
||||
}
|
||||
|
||||
static Property m2sxxx_soc_properties[] = {
|
||||
static const Property m2sxxx_soc_properties[] = {
|
||||
/*
|
||||
* part name specifies the type of SmartFusion2 device variant(this
|
||||
* property is for information purpose only.
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user