mirror of https://github.com/xemu-project/xemu.git
hw/char: Constify VMState
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20231221031652.119827-26-richard.henderson@linaro.org>
This commit is contained in:
parent
7d5dc0a367
commit
2f6cab053f
hw/char
bcm2835_aux.ccadence_uart.ccmsdk-apb-uart.cdigic-uart.cescc.cexynos4210_uart.cgoldfish_tty.cibex_uart.cimx_serial.cipoctal232.cmchp_pfsoc_mmuart.cnrf51_uart.cparallel.cpl011.crenesas_sci.csclpconsole-lm.csclpconsole.cserial-isa.cserial-pci-multi.cserial-pci.cserial.csifive_uart.cspapr_vty.cvirtio-serial-bus.c
|
@ -260,7 +260,7 @@ static const VMStateDescription vmstate_bcm2835_aux = {
|
|||
.name = TYPE_BCM2835_AUX,
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT8_ARRAY(read_fifo, BCM2835AuxState,
|
||||
BCM2835_AUX_RX_FIFO_LEN),
|
||||
VMSTATE_UINT8(read_pos, BCM2835AuxState),
|
||||
|
|
|
@ -602,7 +602,7 @@ static const VMStateDescription vmstate_cadence_uart = {
|
|||
.minimum_version_id = 2,
|
||||
.pre_load = cadence_uart_pre_load,
|
||||
.post_load = cadence_uart_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32_ARRAY(r, CadenceUARTState, CADENCE_UART_R_MAX),
|
||||
VMSTATE_UINT8_ARRAY(rx_fifo, CadenceUARTState,
|
||||
CADENCE_UART_RX_FIFO_SIZE),
|
||||
|
|
|
@ -366,7 +366,7 @@ static const VMStateDescription cmsdk_apb_uart_vmstate = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.post_load = cmsdk_apb_uart_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(state, CMSDKAPBUART),
|
||||
VMSTATE_UINT32(ctrl, CMSDKAPBUART),
|
||||
VMSTATE_UINT32(intstatus, CMSDKAPBUART),
|
||||
|
|
|
@ -165,7 +165,7 @@ static const VMStateDescription vmstate_digic_uart = {
|
|||
.name = "digic-uart",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(reg_rx, DigicUartState),
|
||||
VMSTATE_UINT32(reg_st, DigicUartState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -766,7 +766,7 @@ static const VMStateDescription vmstate_escc_chn = {
|
|||
.name = "escc_chn",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(vmstate_dummy, ESCCChannelState),
|
||||
VMSTATE_UINT32(reg, ESCCChannelState),
|
||||
VMSTATE_UINT32(rxint, ESCCChannelState),
|
||||
|
@ -785,7 +785,7 @@ static const VMStateDescription vmstate_escc = {
|
|||
.name = "escc",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT_ARRAY(chn, ESCCState, 2, 2, vmstate_escc_chn,
|
||||
ESCCChannelState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -628,7 +628,7 @@ static const VMStateDescription vmstate_exynos4210_uart_fifo = {
|
|||
.name = "exynos4210.uart.fifo",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(sp, Exynos4210UartFIFO),
|
||||
VMSTATE_UINT32(rp, Exynos4210UartFIFO),
|
||||
VMSTATE_VBUFFER_UINT32(data, Exynos4210UartFIFO, 1, NULL, size),
|
||||
|
@ -641,7 +641,7 @@ static const VMStateDescription vmstate_exynos4210_uart = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.post_load = exynos4210_uart_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT(rx, Exynos4210UartState, 1,
|
||||
vmstate_exynos4210_uart_fifo, Exynos4210UartFIFO),
|
||||
VMSTATE_UINT32_ARRAY(reg, Exynos4210UartState,
|
||||
|
|
|
@ -232,7 +232,7 @@ static const VMStateDescription vmstate_goldfish_tty = {
|
|||
.name = "goldfish_tty",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(data_len, GoldfishTTYState),
|
||||
VMSTATE_UINT64(data_ptr, GoldfishTTYState),
|
||||
VMSTATE_BOOL(int_enabled, GoldfishTTYState),
|
||||
|
|
|
@ -488,7 +488,7 @@ static const VMStateDescription vmstate_ibex_uart = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.post_load = ibex_uart_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT8_ARRAY(tx_fifo, IbexUartState,
|
||||
IBEX_UART_TX_FIFO_SIZE),
|
||||
VMSTATE_UINT32(tx_level, IbexUartState),
|
||||
|
|
|
@ -43,7 +43,7 @@ static const VMStateDescription vmstate_imx_serial = {
|
|||
.name = TYPE_IMX_SERIAL,
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32(readbuff, IMXSerialState),
|
||||
VMSTATE_UINT32(usr1, IMXSerialState),
|
||||
VMSTATE_UINT32(usr2, IMXSerialState),
|
||||
|
|
|
@ -130,7 +130,7 @@ static const VMStateDescription vmstate_scc2698_channel = {
|
|||
.name = "scc2698_channel",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_BOOL(rx_enabled, SCC2698Channel),
|
||||
VMSTATE_UINT8_ARRAY(mr, SCC2698Channel, 2),
|
||||
VMSTATE_UINT8(mr_idx, SCC2698Channel),
|
||||
|
@ -146,7 +146,7 @@ static const VMStateDescription vmstate_scc2698_block = {
|
|||
.name = "scc2698_block",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT8(imr, SCC2698Block),
|
||||
VMSTATE_UINT8(isr, SCC2698Block),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
@ -157,7 +157,7 @@ static const VMStateDescription vmstate_ipoctal = {
|
|||
.name = "ipoctal232",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_IPACK_DEVICE(parent_obj, IPOctalState),
|
||||
VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS, 1,
|
||||
vmstate_scc2698_channel, SCC2698Channel),
|
||||
|
|
|
@ -114,7 +114,7 @@ static const VMStateDescription mchp_pfsoc_mmuart_vmstate = {
|
|||
.name = "mchp.pfsoc.uart",
|
||||
.version_id = 0,
|
||||
.minimum_version_id = 0,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32_ARRAY(reg, MchpPfSoCMMUartState,
|
||||
MCHP_PFSOC_MMUART_REG_COUNT),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -291,7 +291,7 @@ static int nrf51_uart_post_load(void *opaque, int version_id)
|
|||
static const VMStateDescription nrf51_uart_vmstate = {
|
||||
.name = "nrf51_soc.uart",
|
||||
.post_load = nrf51_uart_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32_ARRAY(reg, NRF51UARTState, 0x56C),
|
||||
VMSTATE_UINT8_ARRAY(rx_fifo, NRF51UARTState, UART_FIFO_LENGTH),
|
||||
VMSTATE_UINT32(rx_fifo_pos, NRF51UARTState),
|
||||
|
|
|
@ -478,7 +478,7 @@ static const VMStateDescription vmstate_parallel_isa = {
|
|||
.name = "parallel_isa",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT8(state.dataw, ISAParallelState),
|
||||
VMSTATE_UINT8(state.datar, ISAParallelState),
|
||||
VMSTATE_UINT8(state.status, ISAParallelState),
|
||||
|
|
|
@ -398,7 +398,7 @@ static const VMStateDescription vmstate_pl011_clock = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = pl011_clock_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_CLOCK(clk, PL011State),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -433,7 +433,7 @@ static const VMStateDescription vmstate_pl011 = {
|
|||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.post_load = pl011_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(readbuff, PL011State),
|
||||
VMSTATE_UINT32(flags, PL011State),
|
||||
VMSTATE_UINT32(lcr, PL011State),
|
||||
|
@ -452,7 +452,7 @@ static const VMStateDescription vmstate_pl011 = {
|
|||
VMSTATE_INT32(read_trigger, PL011State),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
.subsections = (const VMStateDescription * []) {
|
||||
.subsections = (const VMStateDescription * const []) {
|
||||
&vmstate_pl011_clock,
|
||||
NULL
|
||||
}
|
||||
|
|
|
@ -302,7 +302,7 @@ static const VMStateDescription vmstate_rsci = {
|
|||
.name = "renesas-sci",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT64(trtime, RSCIState),
|
||||
VMSTATE_INT64(rx_next, RSCIState),
|
||||
VMSTATE_UINT8(smr, RSCIState),
|
||||
|
|
|
@ -292,7 +292,7 @@ static const VMStateDescription vmstate_sclplmconsole = {
|
|||
.name = "sclplmconsole",
|
||||
.version_id = 0,
|
||||
.minimum_version_id = 0,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_BOOL(event.event_pending, SCLPConsoleLM),
|
||||
VMSTATE_UINT32(write_errors, SCLPConsoleLM),
|
||||
VMSTATE_UINT32(length, SCLPConsoleLM),
|
||||
|
|
|
@ -206,7 +206,7 @@ static const VMStateDescription vmstate_sclpconsole = {
|
|||
.name = "sclpconsole",
|
||||
.version_id = 0,
|
||||
.minimum_version_id = 0,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_BOOL(event.event_pending, SCLPConsole),
|
||||
VMSTATE_UINT8_ARRAY(iov, SCLPConsole, SIZE_BUFFER_VT220),
|
||||
VMSTATE_UINT32(iov_sclp, SCLPConsole),
|
||||
|
|
|
@ -106,7 +106,7 @@ static const VMStateDescription vmstate_isa_serial = {
|
|||
.name = "serial",
|
||||
.version_id = 3,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT(state, ISASerialState, 0, vmstate_serial, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
|
|
@ -123,7 +123,7 @@ static const VMStateDescription vmstate_pci_multi_serial = {
|
|||
.name = "pci-serial-multi",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_PCI_DEVICE(dev, PCIMultiSerialState),
|
||||
VMSTATE_STRUCT_ARRAY(state, PCIMultiSerialState, PCI_SERIAL_MAX_PORTS,
|
||||
0, vmstate_serial, SerialState),
|
||||
|
|
|
@ -74,7 +74,7 @@ static const VMStateDescription vmstate_pci_serial = {
|
|||
.name = "pci-serial",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_PCI_DEVICE(dev, PCISerialState),
|
||||
VMSTATE_STRUCT(state, PCISerialState, 0, vmstate_serial, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -707,7 +707,7 @@ static const VMStateDescription vmstate_serial_thr_ipending = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = serial_thr_ipending_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32(thr_ipending, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -724,7 +724,7 @@ static const VMStateDescription vmstate_serial_tsr = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = serial_tsr_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT32(tsr_retry, SerialState),
|
||||
VMSTATE_UINT8(thr, SerialState),
|
||||
VMSTATE_UINT8(tsr, SerialState),
|
||||
|
@ -744,7 +744,7 @@ static const VMStateDescription vmstate_serial_recv_fifo = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = serial_recv_fifo_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT(recv_fifo, SerialState, 1, vmstate_fifo8, Fifo8),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -761,7 +761,7 @@ static const VMStateDescription vmstate_serial_xmit_fifo = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = serial_xmit_fifo_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT(xmit_fifo, SerialState, 1, vmstate_fifo8, Fifo8),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -778,7 +778,7 @@ static const VMStateDescription vmstate_serial_fifo_timeout_timer = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = serial_fifo_timeout_timer_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_TIMER_PTR(fifo_timeout_timer, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -795,7 +795,7 @@ static const VMStateDescription vmstate_serial_timeout_ipending = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = serial_timeout_ipending_needed,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32(timeout_ipending, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
@ -812,7 +812,7 @@ static const VMStateDescription vmstate_serial_poll = {
|
|||
.version_id = 1,
|
||||
.needed = serial_poll_needed,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_INT32(poll_msl, SerialState),
|
||||
VMSTATE_TIMER_PTR(modem_status_poll, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
@ -826,7 +826,7 @@ const VMStateDescription vmstate_serial = {
|
|||
.pre_save = serial_pre_save,
|
||||
.pre_load = serial_pre_load,
|
||||
.post_load = serial_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT16_V(divider, SerialState, 2),
|
||||
VMSTATE_UINT8(rbr, SerialState),
|
||||
VMSTATE_UINT8(ier, SerialState),
|
||||
|
@ -839,7 +839,7 @@ const VMStateDescription vmstate_serial = {
|
|||
VMSTATE_UINT8_V(fcr_vmstate, SerialState, 3),
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
.subsections = (const VMStateDescription*[]) {
|
||||
.subsections = (const VMStateDescription * const []) {
|
||||
&vmstate_serial_thr_ipending,
|
||||
&vmstate_serial_tsr,
|
||||
&vmstate_serial_recv_fifo,
|
||||
|
@ -1056,7 +1056,7 @@ static const VMStateDescription vmstate_serial_mm = {
|
|||
.name = "serial",
|
||||
.version_id = 3,
|
||||
.minimum_version_id = 2,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_STRUCT(serial, SerialMM, 0, vmstate_serial, SerialState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
|
|
|
@ -224,7 +224,7 @@ static const VMStateDescription vmstate_sifive_uart = {
|
|||
.name = TYPE_SIFIVE_UART,
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT8_ARRAY(rx_fifo, SiFiveUARTState,
|
||||
SIFIVE_UART_RX_FIFO_SIZE),
|
||||
VMSTATE_UINT8(rx_fifo_len, SiFiveUARTState),
|
||||
|
|
|
@ -173,7 +173,7 @@ static const VMStateDescription vmstate_spapr_vty = {
|
|||
.name = "spapr_vty",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_SPAPR_VIO(sdev, SpaprVioVty),
|
||||
|
||||
VMSTATE_UINT32(in, SpaprVioVty),
|
||||
|
|
|
@ -1148,7 +1148,7 @@ static const VMStateDescription vmstate_virtio_console = {
|
|||
.name = "virtio-console",
|
||||
.minimum_version_id = 3,
|
||||
.version_id = 3,
|
||||
.fields = (VMStateField[]) {
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_VIRTIO_DEVICE,
|
||||
VMSTATE_END_OF_LIST()
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue