xhci: add xhci_get_flag
authorGerd Hoffmann <kraxel@redhat.com>
Thu, 15 May 2014 10:31:46 +0000 (12:31 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 26 May 2014 06:41:07 +0000 (08:41 +0200)
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
hw/usb/hcd-xhci.c

index a203bc6b41089bbad204269e32f33eb9bbc82942..54dea16009660f228fb1913e8446509b0d6ec42b 100644 (file)
@@ -621,6 +621,11 @@ static const char *ep_state_name(uint32_t state)
                        ARRAY_SIZE(ep_state_names));
 }
 
+static bool xhci_get_flag(XHCIState *xhci, enum xhci_flags bit)
+{
+    return xhci->flags & (1 << bit);
+}
+
 static uint64_t xhci_mfindex_get(XHCIState *xhci)
 {
     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
@@ -3599,10 +3604,10 @@ static int usb_xhci_initfn(struct PCIDevice *dev)
         assert(ret >= 0);
     }
 
-    if (xhci->flags & (1 << XHCI_FLAG_USE_MSI)) {
+    if (xhci_get_flag(xhci, XHCI_FLAG_USE_MSI)) {
         msi_init(dev, 0x70, xhci->numintrs, true, false);
     }
-    if (xhci->flags & (1 << XHCI_FLAG_USE_MSI_X)) {
+    if (xhci_get_flag(xhci, XHCI_FLAG_USE_MSI_X)) {
         msix_init(dev, xhci->numintrs,
                   &xhci->mem, 0, OFF_MSIX_TABLE,
                   &xhci->mem, 0, OFF_MSIX_PBA,