X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Fvirtio%2Fpci.h;h=dcf9b1464635b412a0bf4ca679da6726f515cdf0;hb=43b512cac2240cd679341a3bc01d548c573b8a85;hp=7552dd89ac2ee195cf86dc99d95d84ffc74a794d;hpb=d6c15af33f3f153e084f14484e884f3ca68dbc23;p=vpp.git

diff --git a/src/vnet/devices/virtio/pci.h b/src/vnet/devices/virtio/pci.h
index 7552dd89ac2..dcf9b146463 100644
--- a/src/vnet/devices/virtio/pci.h
+++ b/src/vnet/devices/virtio/pci.h
@@ -37,6 +37,7 @@
 					   (16, RW) */
 
 /*
+ * Vector value used to disable MSI for queue.
  * define in include/linux/virtio_pci.h
  * #define VIRTIO_MSI_NO_VECTOR 0xFFFF
  */
@@ -45,7 +46,6 @@
 #define VIRTIO_PCI_ISR_INTR   0x1
 /* The bit of the ISR which indicates a device configuration change. */
 #define VIRTIO_PCI_ISR_CONFIG 0x2
-/* Vector value used to disable MSI for queue. */
 
 /* VirtIO device IDs. */
 #define VIRTIO_ID_NETWORK  0x01
@@ -120,6 +120,27 @@ typedef enum
 
 #define VIRTIO_PCI_VRING_ALIGN 4096
 
+#define virtio_log_debug(vim, vif, f, ...)			\
+{								\
+  vlib_log(VLIB_LOG_LEVEL_DEBUG, vim->log_default, "%U: " f,	\
+           format_vlib_pci_addr, &vif->pci_addr,		\
+           ##__VA_ARGS__);					\
+};
+
+#define virtio_log_warning(vim, vif, f, ...)			\
+{								\
+  vlib_log(VLIB_LOG_LEVEL_WARNING, vim->log_default, "%U: " f,	\
+           format_vlib_pci_addr, &vif->pci_addr,		\
+           ##__VA_ARGS__);					\
+};
+
+#define virtio_log_error(vim, vif, f, ...)			\
+{								\
+  vlib_log(VLIB_LOG_LEVEL_ERR, vim->log_default, "%U: " f,	\
+           format_vlib_pci_addr, &vif->pci_addr,		\
+           ##__VA_ARGS__);					\
+};
+
 typedef enum
 {
   VIRTIO_MSIX_NONE = 0,
@@ -206,8 +227,6 @@ typedef struct
 typedef struct
 {
   u32 addr;
-  u16 rxq_size;
-  u16 txq_size;
   /* return */
   i32 rv;
   u32 sw_if_index;