@@ -462,8 +462,8 @@ static const VMStateDescription vmstate_g364fb = {
.post_load = g364fb_post_load,
.fields = (VMStateField[]) {
VMSTATE_VBUFFER_UINT32(vram, G364State, vram_size),
- VMSTATE_BUFFER_UNSAFE(color_palette, G364State, 256 * 3),
- VMSTATE_BUFFER_UNSAFE(cursor_palette, G364State, 9),
+ VMSTATE_UINT8_2DARRAY(color_palette, G364State, 256, 3),
+ VMSTATE_UINT8_2DARRAY(cursor_palette, G364State, 3, 3),
VMSTATE_UINT16_ARRAY(cursor, G364State, 512),
VMSTATE_UINT32(cursor_position, G364State),
VMSTATE_UINT32(ctla, G364State),
@@ -72,7 +72,7 @@ static const VMStateDescription vmstate_smc91c111 = {
VMSTATE_INT32_ARRAY(rx_fifo, smc91c111_state, NUM_PACKETS),
VMSTATE_INT32(tx_fifo_done_len, smc91c111_state),
VMSTATE_INT32_ARRAY(tx_fifo_done, smc91c111_state, NUM_PACKETS),
- VMSTATE_BUFFER_UNSAFE(data, smc91c111_state, NUM_PACKETS * 2048),
+ VMSTATE_UINT8_2DARRAY(data, smc91c111_state, NUM_PACKETS, 2048),
VMSTATE_UINT8(int_level, smc91c111_state),
VMSTATE_UINT8(int_mask, smc91c111_state),
VMSTATE_END_OF_LIST()
In this two cases we have a 2D array, result is exactly the same, and one typechecks and the other don't, so change it. Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/display/g364fb.c | 4 ++-- hw/net/smc91c111.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)