[64/71] hw/usb: Constify all Property

Message ID	20241213193004.2515684-2-richard.henderson@linaro.org (mailing list archive)
State	New
Headers	show Return-Path: <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org> From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Cc: "Hongren (Zenithal) Zheng" <i@zenithal.me>, "Canokeys.org" <contact@canokeys.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> Subject: [PATCH 64/71] hw/usb: Constify all Property Date: Fri, 13 Dec 2024 13:29:58 -0600 Message-ID: <20241213193004.2515684-2-richard.henderson@linaro.org> In-Reply-To: <20241213193004.2515684-1-richard.henderson@linaro.org> References: <20241213190750.2513964-1-richard.henderson@linaro.org> <20241213193004.2515684-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::12d; envelope-from=richard.henderson@linaro.org; helo=mail-lf1-x12d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org
Series	whole-tree: Constify Property structures \| expand [00/71] whole-tree: Constify Property structures [PULL,1/4] tcg: Reset free_temps before tcg_optimize [02/71] target/avr: Constify all Property [PULL,3/4] include/exec: Introduce fpst alias in helper-head.h.inc [04/71] target/i386: Constify all Property [05/71] target/microblaze: Constify all Property [06/71] target/mips: Constify all Property [07/71] target/ppc: Remove empty property list [08/71] target/riscv: Constify all Property [09/71] target/s390x: Constify all Property [10/71] target/sparc: Constify all Property and PropertyInfo [11/71] cpu-target: Constify all Property [12/71] hw/9pfs: Constify all Property [13/71] hw/acpi: Constify all Property [14/71] hw/adc: Constify all Property [15/71] hw/arm: Constify all Property [16/71] hw/audio: Constify all Property [17/71] hw/avr: Constify all Property [18/71] hw/block/xen-block: Unexport PropertyInfo [19/71] hw/block: Constify all Property [20/71] hw/char: Constify all Property [21/71] hw/core: Constify all Property [22/71] hw/cpu: Constify all Property [23/71] hw/cxl: Constify all Property [24/71] hw/display: Constify all Property [25/71] hw/dma: Constify all Property [26/71] hw/gpio: Constify all Property [27/71] hw/hyperv: Constify all Property [28/71] hw/i2c: Constify all Property [29/71] hw/i386: Constify all Property [30/71] hw/ide: Constify all Property [31/71] hw/input: Constify all Property [32/71] hw/intc: Constify all Property [33/71] hw/ipack: Constify all Property [34/71] hw/ipmi: Constify all Property [35/71] hw/isa: Constify all Property [36/71] hw/m68k: Constify all Property [37/71] hw/mem: Constify all Property [38/71] hw/mips: Constify all Property [39/71] hw/misc/xlnx-versal-trng: Constify trng_props [40/71] hw/misc: Constify all Property [41/71] hw/net: Constify all Property [42/71] hw/nubus: Constify all Property [43/71] hw/nvme: Constify all Property [44/71] hw/nvram: Constify all Property [45/71] hw/pci-bridge: Constify all Property [46/71] hw/pci-host/astro: Remove empty Property list [47/71] hw/pci-host: Constify all Property [48/71] hw/pci: Constify all Property [49/71] hw/ppc: Constify all Property [50/71] hw/remote: Constify all Property [51/71] hw/riscv: Constify all Property [52/71] hw/rtc: Constify all Property [53/71] hw/rx: Constify all Property [54/71] hw/s390x: Constify all Property [55/71] hw/scsi: Constify all Property [56/71] hw/sd: Constify all Property [57/71] hw/sparc: Constify all Property [58/71] hw/sparc64: Constify all Property [59/71] hw/ssi: Constify all Property [60/71] hw/timer: Constify all Property [61/71] hw/tpm: Constify all Property [62/71] hw/tricore: Constify all Property [63/71] hw/ufs: Constify all Property [64/71] hw/usb: Constify all Property [65/71] hw/vfio: Constify all Property [66/71] hw/virtio: Constify all Property [67/71] hw/watchdog: Constify all Property [69/71] hw/xen: Use DEFINE_PROP_END_OF_LIST in xen_sysdev_properties [70/71] tests/unit: Constify all Property [71/71] docs: Constify all Property in examples

diff --git a/hw/usb/bus.c b/hw/usb/bus.c index bfab2807d7..80e6a92820 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -18,7 +18,7 @@ static char *usb_get_dev_path(DeviceState *dev); static char *usb_get_fw_dev_path(DeviceState *qdev); static void usb_qdev_unrealize(DeviceState *qdev); -static Property usb_props[] = { +static const Property usb_props[] = { DEFINE_PROP_STRING("port", USBDevice, port_path), DEFINE_PROP_STRING("serial", USBDevice, serial), DEFINE_PROP_BIT("msos-desc", USBDevice, flags, diff --git a/hw/usb/canokey.c b/hw/usb/canokey.c index b306eeb20e..7cb600e3c8 100644 --- a/hw/usb/canokey.c +++ b/hw/usb/canokey.c @@ -296,7 +296,7 @@ static void canokey_unrealize(USBDevice *base) trace_canokey_unrealize(); } -static Property canokey_properties[] = { +static const Property canokey_properties[] = { DEFINE_PROP_STRING("file", CanoKeyState, file), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 3ee9c73b87..dd58333943 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -582,7 +582,7 @@ static void emulated_unrealize(CCIDCardState *base) qemu_mutex_destroy(&card->event_list_mutex); } -static Property emulated_card_properties[] = { +static const Property emulated_card_properties[] = { DEFINE_PROP_STRING("backend", EmulatedState, backend_str), DEFINE_PROP_STRING("cert1", EmulatedState, cert1), DEFINE_PROP_STRING("cert2", EmulatedState, cert2), diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index a515703904..f97dcf767f 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -388,7 +388,7 @@ static const VMStateDescription passthru_vmstate = { } }; -static Property passthru_card_properties[] = { +static const Property passthru_card_properties[] = { DEFINE_PROP_CHR("chardev", PassthruState, cs), DEFINE_PROP_UINT8("debug", PassthruState, debug, 0), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index 1897fff9e6..6007f16d30 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -990,7 +990,7 @@ static const VMStateDescription vmstate_usb_audio = { .unmigratable = 1, }; -static Property usb_audio_properties[] = { +static const Property usb_audio_properties[] = { DEFINE_AUDIO_PROPERTIES(USBAudioState, card), DEFINE_PROP_UINT32("debug", USBAudioState, debug, 0), DEFINE_PROP_UINT32("buffer", USBAudioState, buffer_user, 0), diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 9e358c934e..d83f67b984 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -793,7 +793,7 @@ static const TypeInfo usb_hid_type_info = { .class_init = usb_hid_class_initfn, }; -static Property usb_tablet_properties[] = { +static const Property usb_tablet_properties[] = { DEFINE_PROP_UINT32("usb_version", USBHIDState, usb_version, 2), DEFINE_PROP_STRING("display", USBHIDState, display), DEFINE_PROP_UINT32("head", USBHIDState, head, 0), @@ -818,7 +818,7 @@ static const TypeInfo usb_tablet_info = { .class_init = usb_tablet_class_initfn, }; -static Property usb_mouse_properties[] = { +static const Property usb_mouse_properties[] = { DEFINE_PROP_UINT32("usb_version", USBHIDState, usb_version, 2), DEFINE_PROP_END_OF_LIST(), }; @@ -841,7 +841,7 @@ static const TypeInfo usb_mouse_info = { .class_init = usb_mouse_class_initfn, }; -static Property usb_keyboard_properties[] = { +static const Property usb_keyboard_properties[] = { DEFINE_PROP_UINT32("usb_version", USBHIDState, usb_version, 2), DEFINE_PROP_STRING("display", USBHIDState, display), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 2c3640c705..317ca0b081 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -665,7 +665,7 @@ static const VMStateDescription vmstate_usb_hub = { } }; -static Property usb_hub_properties[] = { +static const Property usb_hub_properties[] = { DEFINE_PROP_UINT32("ports", USBHubState, num_ports, 8), DEFINE_PROP_BOOL("port-power", USBHubState, port_power, false), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 554b397e88..7994727e5e 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -2078,7 +2078,7 @@ static const VMStateDescription vmstate_usb_mtp = { } }; -static Property mtp_properties[] = { +static const Property mtp_properties[] = { DEFINE_PROP_STRING("rootdir", MTPState, root), DEFINE_PROP_STRING("desc", MTPState, desc), DEFINE_PROP_BOOL("readonly", MTPState, readonly, true), diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index d00d68b21d..6c4f5776d4 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1407,7 +1407,7 @@ static const VMStateDescription vmstate_usb_net = { .unmigratable = 1, }; -static Property net_properties[] = { +static const Property net_properties[] = { DEFINE_NIC_PROPERTIES(USBNetState, conf), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 63047d79cf..0c3e9160ec 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -634,7 +634,7 @@ static const VMStateDescription vmstate_usb_serial = { .unmigratable = 1, }; -static Property serial_properties[] = { +static const Property serial_properties[] = { DEFINE_PROP_CHR("chardev", USBSerialState, cs), DEFINE_PROP_BOOL("always-plugged", USBSerialState, always_plugged, false), DEFINE_PROP_END_OF_LIST(), @@ -677,7 +677,7 @@ static const TypeInfo serial_info = { .class_init = usb_serial_class_initfn, }; -static Property braille_properties[] = { +static const Property braille_properties[] = { DEFINE_PROP_CHR("chardev", USBSerialState, cs), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index c0d63e0425..c3c02f0aad 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1171,7 +1171,7 @@ static Answer *ccid_peek_next_answer(USBCCIDState *s) : &s->pending_answers[s->pending_answers_start % PENDING_ANSWERS_NUM]; } -static Property ccid_props[] = { +static const Property ccid_props[] = { DEFINE_PROP_UINT32("slot", struct CCIDCardState, slot, 0), DEFINE_PROP_END_OF_LIST(), }; @@ -1431,7 +1431,7 @@ static const VMStateDescription ccid_vmstate = { } }; -static Property ccid_properties[] = { +static const Property ccid_properties[] = { DEFINE_PROP_UINT8("debug", USBCCIDState, debug, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c index 6147387dc6..ca037ba96f 100644 --- a/hw/usb/dev-storage-classic.c +++ b/hw/usb/dev-storage-classic.c @@ -67,7 +67,7 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp) s->scsi_dev = scsi_dev; } -static Property msd_properties[] = { +static const Property msd_properties[] = { DEFINE_BLOCK_PROPERTIES(MSDState, conf), DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf), DEFINE_PROP_BOOL("removable", MSDState, removable, false), diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 1804cb6799..57e8d20051 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -953,7 +953,7 @@ static const VMStateDescription vmstate_usb_uas = { } }; -static Property uas_properties[] = { +static const Property uas_properties[] = { DEFINE_PROP_UINT32("log-scsi-req", UASDevice, requestlog, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c index b4f0652c7d..6a10f3e9cd 100644 --- a/hw/usb/hcd-dwc2.c +++ b/hw/usb/hcd-dwc2.c @@ -1448,7 +1448,7 @@ const VMStateDescription vmstate_dwc2_state = { } }; -static Property dwc2_usb_properties[] = { +static const Property dwc2_usb_properties[] = { DEFINE_PROP_UINT32("usb_version", DWC2State, usb_version, 2), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/hcd-dwc3.c b/hw/usb/hcd-dwc3.c index e7d8c7924b..ff970bd989 100644 --- a/hw/usb/hcd-dwc3.c +++ b/hw/usb/hcd-dwc3.c @@ -656,7 +656,7 @@ static const VMStateDescription vmstate_usb_dwc3 = { } }; -static Property usb_dwc3_properties[] = { +static const Property usb_dwc3_properties[] = { DEFINE_PROP_UINT32("DWC_USB3_USERID", USBDWC3, cfg.dwc_usb3_user, 0x12345678), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index dd06451e23..374f25c5ed 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -135,7 +135,7 @@ static void usb_ehci_pci_write_config(PCIDevice *dev, uint32_t addr, i->ehci.as = busmaster ? pci_get_address_space(dev) : &address_space_memory; } -static Property ehci_pci_properties[] = { +static const Property ehci_pci_properties[] = { DEFINE_PROP_UINT32("maxframes", EHCIPCIState, ehci.maxframes, 128), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index eb7df93ac2..f4e08aab89 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -30,7 +30,7 @@ static const VMStateDescription vmstate_ehci_sysbus = { } }; -static Property ehci_sysbus_properties[] = { +static const Property ehci_sysbus_properties[] = { DEFINE_PROP_UINT32("maxframes", EHCISysBusState, ehci.maxframes, 128), DEFINE_PROP_BOOL("companion-enable", EHCISysBusState, ehci.companion_enable, false), diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c index 47fb659806..459644cc1b 100644 --- a/hw/usb/hcd-ohci-pci.c +++ b/hw/usb/hcd-ohci-pci.c @@ -109,7 +109,7 @@ static void usb_ohci_reset_pci(DeviceState *d) ohci_hard_reset(s); } -static Property ohci_pci_properties[] = { +static const Property ohci_pci_properties[] = { DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus), DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3), DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0), diff --git a/hw/usb/hcd-ohci-sysbus.c b/hw/usb/hcd-ohci-sysbus.c index 313e1e71bb..81cf2e558d 100644 --- a/hw/usb/hcd-ohci-sysbus.c +++ b/hw/usb/hcd-ohci-sysbus.c @@ -57,7 +57,7 @@ static void ohci_sysbus_reset(DeviceState *dev) ohci_hard_reset(ohci); } -static Property ohci_sysbus_properties[] = { +static const Property ohci_sysbus_properties[] = { DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus), DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3), DEFINE_PROP_UINT32("firstport", OHCISysBusState, firstport, 0), diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index 65c1f93cc9..245352c231 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -1227,14 +1227,14 @@ static void usb_uhci_exit(PCIDevice *dev) } } -static Property uhci_properties_companion[] = { +static const Property uhci_properties_companion[] = { DEFINE_PROP_STRING("masterbus", UHCIState, masterbus), DEFINE_PROP_UINT32("firstport", UHCIState, firstport, 0), DEFINE_PROP_UINT32("bandwidth", UHCIState, frame_bandwidth, 1280), DEFINE_PROP_UINT32("maxframes", UHCIState, maxframes, 128), DEFINE_PROP_END_OF_LIST(), }; -static Property uhci_properties_standalone[] = { +static const Property uhci_properties_standalone[] = { DEFINE_PROP_UINT32("bandwidth", UHCIState, frame_bandwidth, 1280), DEFINE_PROP_UINT32("maxframes", UHCIState, maxframes, 128), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/hcd-xhci-nec.c b/hw/usb/hcd-xhci-nec.c index 0c063b3697..b582cf8f8d 100644 --- a/hw/usb/hcd-xhci-nec.c +++ b/hw/usb/hcd-xhci-nec.c @@ -38,7 +38,7 @@ struct XHCINecState { uint32_t slots; }; -static Property nec_xhci_properties[] = { +static const Property nec_xhci_properties[] = { DEFINE_PROP_ON_OFF_AUTO("msi", XHCIPciState, msi, ON_OFF_AUTO_AUTO), DEFINE_PROP_ON_OFF_AUTO("msix", XHCIPciState, msix, ON_OFF_AUTO_AUTO), DEFINE_PROP_UINT32("intrs", XHCINecState, intrs, XHCI_MAXINTRS), diff --git a/hw/usb/hcd-xhci-sysbus.c b/hw/usb/hcd-xhci-sysbus.c index 59cf7fd4ab..f4dbad7cc6 100644 --- a/hw/usb/hcd-xhci-sysbus.c +++ b/hw/usb/hcd-xhci-sysbus.c @@ -82,7 +82,7 @@ void xhci_sysbus_build_aml(Aml *scope, uint32_t mmio, unsigned int irq) aml_append(scope, dev); } -static Property xhci_sysbus_props[] = { +static const Property xhci_sysbus_props[] = { DEFINE_PROP_UINT32("intrs", XHCISysbusState, xhci.numintrs, XHCI_MAXINTRS), DEFINE_PROP_UINT32("slots", XHCISysbusState, xhci.numslots, XHCI_MAXSLOTS), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index d85adaca0d..3c5006f425 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3605,7 +3605,7 @@ const VMStateDescription vmstate_xhci = { } }; -static Property xhci_properties[] = { +static const Property xhci_properties[] = { DEFINE_PROP_BIT("streams", XHCIState, flags, XHCI_FLAG_ENABLE_STREAMS, true), DEFINE_PROP_UINT32("p2", XHCIState, numports_2, 4), diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 691bc881fb..85d33b51ba 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -1758,7 +1758,7 @@ static const VMStateDescription vmstate_usb_host = { } }; -static Property usb_host_dev_properties[] = { +static const Property usb_host_dev_properties[] = { DEFINE_PROP_UINT32("hostbus", USBHostDevice, match.bus_num, 0), DEFINE_PROP_UINT32("hostaddr", USBHostDevice, match.addr, 0), DEFINE_PROP_STRING("hostport", USBHostDevice, match.port), diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 0f2dd2e504..f72a612d5a 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -2573,7 +2573,7 @@ static const VMStateDescription usbredir_vmstate = { } }; -static Property usbredir_properties[] = { +static const Property usbredir_properties[] = { DEFINE_PROP_CHR("chardev", USBRedirDevice, cs), DEFINE_PROP_UINT8("debug", USBRedirDevice, debug, usbredirparser_warning), DEFINE_PROP_STRING("filter", USBRedirDevice, filter_str), diff --git a/hw/usb/u2f-emulated.c b/hw/usb/u2f-emulated.c index 63cceaa5fc..df86ce97fc 100644 --- a/hw/usb/u2f-emulated.c +++ b/hw/usb/u2f-emulated.c @@ -369,7 +369,7 @@ static void u2f_emulated_unrealize(U2FKeyState *base) } } -static Property u2f_emulated_properties[] = { +static const Property u2f_emulated_properties[] = { DEFINE_PROP_STRING("dir", U2FEmulatedState, dir), DEFINE_PROP_STRING("cert", U2FEmulatedState, cert), DEFINE_PROP_STRING("privkey", U2FEmulatedState, privkey), diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c index c4a783d128..ec4f6165d8 100644 --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -516,7 +516,7 @@ static const VMStateDescription u2f_passthru_vmstate = { } }; -static Property u2f_passthru_properties[] = { +static const Property u2f_passthru_properties[] = { DEFINE_PROP_STRING("hidraw", U2FPassthruState, hidraw), DEFINE_PROP_END_OF_LIST(), };

[64/71] hw/usb: Constify all Property

Commit Message

Patch