[Qemu-devel] [PATCH 094/124] vmstate: Use VMSTATE_UINT8_2DARRAY instead of VMSTATE_BUFFER_TEST

[Juan Quintela]

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 <address@hidden>
---
 hw/display/g364fb.c | 4 ++--
 hw/net/smc91c111.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index b1a7985..4196fb1 100644
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -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),
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index e74142e..215eebb 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -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()
-- 
1.9.0