commit e2dec2eab04db00ad718353b77adfd59dd5ee3db
author Philippe Mathieu-Daudé <philmd@linaro.org> Sun Jun 16 12:39:18 2024 +0200
committer Philippe Mathieu-Daudé <philmd@linaro.org> Fri Jul 05 23:54:46 2024 +0200
tree 4843097df17e4d8779a41560a08f74a3262f476a
parent 48741580a8e4b7e18406962425ce608e2ef0c6f4

hw/sd/sdcard: Remove default case in read/write on DAT lines

All read/write on DAT lines are explicitly handled.
Reaching this point would be a programming error:
replace by an assertion.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-79-philmd@linaro.org>

hw/sd/sd.c

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index bc1a574..3f495f9 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1949,7 +1949,6 @@
         /* Valid command, we can update the 'state before command' bits.
          * (Do this now so they appear in r1 responses.)
          */
-        sd->current_cmd = req->cmd;
         sd->card_status = FIELD_DP32(sd->card_status, CSR,
                                      CURRENT_STATE, last_state);
     }
@@ -2014,6 +2013,8 @@
     qemu_hexdump(stderr, "Response", response, rsplen);
 #endif
 
+    sd->current_cmd = rtype == sd_illegal ? 0 : req->cmd;
+
     return rsplen;
 }
 
@@ -2167,8 +2168,7 @@
         break;
 
     default:
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: unknown command\n", __func__);
-        break;
+        g_assert_not_reached();
     }
 }
 
@@ -2234,8 +2234,7 @@
         break;
 
     default:
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: unknown command\n", __func__);
-        return 0x00;
+        g_assert_not_reached();
     }
 
     return ret;