Philippe Mathieu-Daudé <phi...@redhat.com> writes: > We already define SDCardModes/SDCardStates as enums. Declare > the mode/state as enums too, this make gdb debugging sessions > friendlier: instead of numbers, the mode/state name is displayed. > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > hw/sd/sd.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index aaab15f3868..a66b3d5b45e 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -96,8 +96,8 @@ struct SDState { > BlockBackend *blk; > bool spi; > > - uint32_t mode; /* current card mode, one of SDCardModes */ > - int32_t state; /* current card state, one of SDCardStates */ > + enum SDCardModes mode; > + enum SDCardStates state; > uint32_t vhs; > bool wp_switch; > unsigned long *wp_groups; > @@ -1640,7 +1640,7 @@ static int cmd_valid_while_locked(SDState *sd, > SDRequest *req) > > int sd_do_command(SDState *sd, SDRequest *req, > uint8_t *response) { > - int last_state; > + enum SDCardStates last_state; > sd_rsp_type_t rtype; > int rsplen;
These guys are part of the migration state: static const VMStateDescription sd_vmstate = { .name = "sd-card", .version_id = 1, .minimum_version_id = 1, .pre_load = sd_vmstate_pre_load, .fields = (VMStateField[]) { VMSTATE_UINT32(mode, SDState), VMSTATE_INT32(state, SDState), [...] Juan, David, are VMSTATE_UINT32() and VMSTATE_INT32() safe to use with enums?