From: Mohsin Kazmi <sykazmi@cisco.com>
Date: Wed, 30 Jan 2019 13:36:57 +0000 (+0000)
Subject: virtio: fix the device order (legacy or modern)
X-Git-Tag: v19.04-rc1~563
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=0e2bc63ba99b1ea62dc6f316491fad0b5c206cfa;p=vpp.git

virtio: fix the device order (legacy or modern)

Change-Id: I60f88d50f062b004e6dea487bd627d303d0a5e75
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
---

diff --git a/src/vnet/devices/virtio/pci.c b/src/vnet/devices/virtio/pci.c
index 0ff453eb204..a90dca47218 100644
--- a/src/vnet/devices/virtio/pci.c
+++ b/src/vnet/devices/virtio/pci.c
@@ -646,15 +646,15 @@ virtio_pci_read_caps (vlib_main_t * vm, virtio_if_t * vif)
       pos = cap.cap_next;
     }
 
-  if (!pci_cfg)
-    clib_error_return (error, "modern virtio pci device found");
-
   if (common_cfg == 0 || notify_base == 0 || dev_cfg == 0 || isr == 0)
     {
       virtio_log_debug (vim, vif, "legacy virtio pci device found");
       return error;
     }
 
+  if (!pci_cfg)
+    clib_error_return (error, "modern virtio pci device found");
+
   virtio_log_debug (vim, vif, "transitional virtio pci device found");
   return error;
 }