xhci: move sanity checks
authorGerd Hoffmann <kraxel@redhat.com>
Thu, 5 Nov 2020 13:41:12 +0000 (14:41 +0100)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 16 Nov 2020 08:11:21 +0000 (09:11 +0100)
The v variable goes negative for reg < 0x20.  Reorder the code
to first sanity check then calculate v and assign intr to make
sanity checkers happy.

Buglink: https://bugs.launchpad.net/qemu/+bug/1902112
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20201105134112.25119-7-kraxel@redhat.com

hw/usb/hcd-xhci.c

index d00bb0141dac550eb1cba909b9234687a78dc25a..6dfb17cbe9152c89b88f5f8988717faa0f183215 100644 (file)
@@ -3010,14 +3010,17 @@ static void xhci_runtime_write(void *ptr, hwaddr reg,
                                uint64_t val, unsigned size)
 {
     XHCIState *xhci = ptr;
-    int v = (reg - 0x20) / 0x20;
-    XHCIInterrupter *intr = &xhci->intr[v];
+    XHCIInterrupter *intr;
+    int v;
+
     trace_usb_xhci_runtime_write(reg, val);
 
     if (reg < 0x20) {
         trace_usb_xhci_unimplemented("runtime write", reg);
         return;
     }
+    v = (reg - 0x20) / 0x20;
+    intr = &xhci->intr[v];
 
     switch (reg & 0x1f) {
     case 0x00: /* IMAN */