Commit aee263df authored by Dariusz Stojaczyk's avatar Dariusz Stojaczyk Committed by Jim Harris
Browse files

rte_virtio: use linux headers where possible 



Move local copy of linux header code
to internal include/linux directory.

Change-Id: I81049ff956c72bb32c099a3087cf5f43de911ce4
Signed-off-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/381275


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent d360eddc

include/linux/virtio_config.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_VIRTIO_CONFIG_H

#define _LINUX_VIRTIO_CONFIG_H

/* This header, excluding the #ifdef __KERNEL__ part, is BSD licensed so

 * anyone can use the definitions to implement compatible drivers/servers.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. Neither the name of IBM nor the names of its contributors

 *    may be used to endorse or promote products derived from this software

 *    without specific prior written permission.

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE. */



/* Virtio devices use a standardized configuration space to define their

 * features and pass configuration information, but each implementation can

 * store and access that space differently. */

#include <linux/types.h>



/* Status byte for guest to report progress, and synchronize features. */

/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */

#define VIRTIO_CONFIG_S_ACKNOWLEDGE	1

/* We have found a driver for the device. */

#define VIRTIO_CONFIG_S_DRIVER		2

/* Driver has used its parts of the config, and is happy */

#define VIRTIO_CONFIG_S_DRIVER_OK	4

/* Driver has finished configuring features */

#define VIRTIO_CONFIG_S_FEATURES_OK	8

/* We've given up on this device. */

#define VIRTIO_CONFIG_S_FAILED		0x80



/* Some virtio feature bits (currently bits 28 through 32) are reserved for the

 * transport being used (eg. virtio_ring), the rest are per-device feature

 * bits. */

#define VIRTIO_TRANSPORT_F_START	28

#define VIRTIO_TRANSPORT_F_END		33



#ifndef VIRTIO_CONFIG_NO_LEGACY

/* Do we get callbacks when the ring is completely used, even if we've

 * suppressed them? */

#define VIRTIO_F_NOTIFY_ON_EMPTY	24



/* Can the device handle any descriptor layout? */

#define VIRTIO_F_ANY_LAYOUT		27

#endif /* VIRTIO_CONFIG_NO_LEGACY */



/* v1.0 compliant. */

#define VIRTIO_F_VERSION_1		32



#endif /* _LINUX_VIRTIO_CONFIG_H */

include/linux/virtio_pci.h

0 → 100644
+199 −0
Original line number Diff line number Diff line 
/*

 * Virtio PCI driver

 *

 * This module allows virtio devices to be used over a virtual PCI device.

 * This can be used with QEMU based VMMs like KVM or Xen.

 *

 * Copyright IBM Corp. 2007

 *

 * Authors:

 *  Anthony Liguori  <aliguori@us.ibm.com>

 *

 * This header is BSD licensed so anyone can use the definitions to implement

 * compatible drivers/servers.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. Neither the name of IBM nor the names of its contributors

 *    may be used to endorse or promote products derived from this software

 *    without specific prior written permission.

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL IBM OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 */



#ifndef _LINUX_VIRTIO_PCI_H

#define _LINUX_VIRTIO_PCI_H



#include <linux/types.h>



#ifndef VIRTIO_PCI_NO_LEGACY



/* A 32-bit r/o bitmask of the features supported by the host */

#define VIRTIO_PCI_HOST_FEATURES	0



/* A 32-bit r/w bitmask of features activated by the guest */

#define VIRTIO_PCI_GUEST_FEATURES	4



/* A 32-bit r/w PFN for the currently selected queue */

#define VIRTIO_PCI_QUEUE_PFN		8



/* A 16-bit r/o queue size for the currently selected queue */

#define VIRTIO_PCI_QUEUE_NUM		12



/* A 16-bit r/w queue selector */

#define VIRTIO_PCI_QUEUE_SEL		14



/* A 16-bit r/w queue notifier */

#define VIRTIO_PCI_QUEUE_NOTIFY		16



/* An 8-bit device status register.  */

#define VIRTIO_PCI_STATUS		18



/* An 8-bit r/o interrupt status register.  Reading the value will return the

 * current contents of the ISR and will also clear it.  This is effectively

 * a read-and-acknowledge. */

#define VIRTIO_PCI_ISR			19



/* MSI-X registers: only enabled if MSI-X is enabled. */

/* A 16-bit vector for configuration changes. */

#define VIRTIO_MSI_CONFIG_VECTOR        20

/* A 16-bit vector for selected queue notifications. */

#define VIRTIO_MSI_QUEUE_VECTOR         22



/* The remaining space is defined by each driver as the per-driver

 * configuration space */

#define VIRTIO_PCI_CONFIG_OFF(msix_enabled)	((msix_enabled) ? 24 : 20)

/* Deprecated: please use VIRTIO_PCI_CONFIG_OFF instead */

#define VIRTIO_PCI_CONFIG(dev)	VIRTIO_PCI_CONFIG_OFF((dev)->msix_enabled)



/* Virtio ABI version, this must match exactly */

#define VIRTIO_PCI_ABI_VERSION		0



/* How many bits to shift physical queue address written to QUEUE_PFN.

 * 12 is historical, and due to x86 page size. */

#define VIRTIO_PCI_QUEUE_ADDR_SHIFT	12



/* The alignment to use between consumer and producer parts of vring.

 * x86 pagesize again. */

#define VIRTIO_PCI_VRING_ALIGN		4096



#endif /* VIRTIO_PCI_NO_LEGACY */



/* 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 */

#define VIRTIO_MSI_NO_VECTOR            0xffff



#ifndef VIRTIO_PCI_NO_MODERN



/* IDs for different capabilities.  Must all exist. */



/* Common configuration */

#define VIRTIO_PCI_CAP_COMMON_CFG	1

/* Notifications */

#define VIRTIO_PCI_CAP_NOTIFY_CFG	2

/* ISR access */

#define VIRTIO_PCI_CAP_ISR_CFG		3

/* Device specific configuration */

#define VIRTIO_PCI_CAP_DEVICE_CFG	4

/* PCI configuration access */

#define VIRTIO_PCI_CAP_PCI_CFG		5



/* This is the PCI capability header: */

struct virtio_pci_cap {

	__u8 cap_vndr;		/* Generic PCI field: PCI_CAP_ID_VNDR */

	__u8 cap_next;		/* Generic PCI field: next ptr. */

	__u8 cap_len;		/* Generic PCI field: capability length */

	__u8 cfg_type;		/* Identifies the structure. */

	__u8 bar;		/* Where to find it. */

	__u8 padding[3];	/* Pad to full dword. */

	__le32 offset;		/* Offset within bar. */

	__le32 length;		/* Length of the structure, in bytes. */

};



struct virtio_pci_notify_cap {

	struct virtio_pci_cap cap;

	__le32 notify_off_multiplier;	/* Multiplier for queue_notify_off. */

};



/* Fields in VIRTIO_PCI_CAP_COMMON_CFG: */

struct virtio_pci_common_cfg {

	/* About the whole device. */

	__le32 device_feature_select;	/* read-write */

	__le32 device_feature;		/* read-only */

	__le32 guest_feature_select;	/* read-write */

	__le32 guest_feature;		/* read-write */

	__le16 msix_config;		/* read-write */

	__le16 num_queues;		/* read-only */

	__u8 device_status;		/* read-write */

	__u8 config_generation;		/* read-only */



	/* About a specific virtqueue. */

	__le16 queue_select;		/* read-write */

	__le16 queue_size;		/* read-write, power of 2. */

	__le16 queue_msix_vector;	/* read-write */

	__le16 queue_enable;		/* read-write */

	__le16 queue_notify_off;	/* read-only */

	__le32 queue_desc_lo;		/* read-write */

	__le32 queue_desc_hi;		/* read-write */

	__le32 queue_avail_lo;		/* read-write */

	__le32 queue_avail_hi;		/* read-write */

	__le32 queue_used_lo;		/* read-write */

	__le32 queue_used_hi;		/* read-write */

};



/* Fields in VIRTIO_PCI_CAP_PCI_CFG: */

struct virtio_pci_cfg_cap {

	struct virtio_pci_cap cap;

	__u8 pci_cfg_data[4]; /* Data for BAR access. */

};



/* Macro versions of offsets for the Old Timers! */

#define VIRTIO_PCI_CAP_VNDR		0

#define VIRTIO_PCI_CAP_NEXT		1

#define VIRTIO_PCI_CAP_LEN		2

#define VIRTIO_PCI_CAP_CFG_TYPE		3

#define VIRTIO_PCI_CAP_BAR		4

#define VIRTIO_PCI_CAP_OFFSET		8

#define VIRTIO_PCI_CAP_LENGTH		12



#define VIRTIO_PCI_NOTIFY_CAP_MULT	16



#define VIRTIO_PCI_COMMON_DFSELECT	0

#define VIRTIO_PCI_COMMON_DF		4

#define VIRTIO_PCI_COMMON_GFSELECT	8

#define VIRTIO_PCI_COMMON_GF		12

#define VIRTIO_PCI_COMMON_MSIX		16

#define VIRTIO_PCI_COMMON_NUMQ		18

#define VIRTIO_PCI_COMMON_STATUS	20

#define VIRTIO_PCI_COMMON_CFGGENERATION	21

#define VIRTIO_PCI_COMMON_Q_SELECT	22

#define VIRTIO_PCI_COMMON_Q_SIZE	24

#define VIRTIO_PCI_COMMON_Q_MSIX	26

#define VIRTIO_PCI_COMMON_Q_ENABLE	28

#define VIRTIO_PCI_COMMON_Q_NOFF	30

#define VIRTIO_PCI_COMMON_Q_DESCLO	32

#define VIRTIO_PCI_COMMON_Q_DESCHI	36

#define VIRTIO_PCI_COMMON_Q_AVAILLO	40

#define VIRTIO_PCI_COMMON_Q_AVAILHI	44

#define VIRTIO_PCI_COMMON_Q_USEDLO	48

#define VIRTIO_PCI_COMMON_Q_USEDHI	52



#endif /* VIRTIO_PCI_NO_MODERN */



#endif

lib/bdev/virtio/rte_virtio/virtio_dev.c

+4 −4
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ virtio_negotiate_features(struct virtio_dev *dev, uint64_t req_features) 


	PMD_INIT_LOG(DEBUG, "negotiated features = %" PRIx64, dev->negotiated_features);



	vtpci_set_status(dev, VIRTIO_CONFIG_STATUS_FEATURES_OK);

	if (!(vtpci_get_status(dev) & VIRTIO_CONFIG_STATUS_FEATURES_OK)) {

	vtpci_set_status(dev, VIRTIO_CONFIG_S_FEATURES_OK);

	if (!(vtpci_get_status(dev) & VIRTIO_CONFIG_S_FEATURES_OK)) {

		PMD_INIT_LOG(ERR,

			     "failed to set FEATURES_OK status!");

		return -1;
@@ -277,10 +277,10 @@ virtio_dev_init(struct virtio_dev *dev, uint64_t req_features) 
	vtpci_reset(dev);



	/* Tell the host we've noticed this device. */

	vtpci_set_status(dev, VIRTIO_CONFIG_STATUS_ACK);

	vtpci_set_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);



	/* Tell the host we've known how to drive the device. */

	vtpci_set_status(dev, VIRTIO_CONFIG_STATUS_DRIVER);

	vtpci_set_status(dev, VIRTIO_CONFIG_S_DRIVER);

	if (virtio_negotiate_features(dev, req_features) < 0)

		return -1;

lib/bdev/virtio/rte_virtio/virtio_pci.c

+5 −11
Original line number Diff line number Diff line
@@ -58,12 +58,6 @@ struct virtio_driver g_virtio_driver = { 
#define PCI_CAP_ID_VNDR		0x09

#define PCI_CAP_ID_MSIX		0x11



/*

 * The remaining space is defined by each driver as the per-driver

 * configuration space.

 */

#define VIRTIO_PCI_CONFIG(hw) (((hw)->use_msix) ? 24 : 20)



#define virtio_dev_get_hw(hw) \

	((struct virtio_hw *)((uintptr_t)(hw) - offsetof(struct virtio_hw, vdev)))
@@ -124,7 +118,7 @@ legacy_read_dev_config(struct virtio_dev *dev, size_t offset, 
	struct virtio_hw *hw = virtio_dev_get_hw(dev);



	rte_pci_ioport_read(vtpci_io(dev), dst, length,

		VIRTIO_PCI_CONFIG(hw) + offset);

		VIRTIO_PCI_CONFIG_OFF(hw->use_msix) + offset);

}



static void
@@ -134,7 +128,7 @@ legacy_write_dev_config(struct virtio_dev *dev, size_t offset, 
	struct virtio_hw *hw = virtio_dev_get_hw(dev);



	rte_pci_ioport_write(vtpci_io(dev), src, length,

		VIRTIO_PCI_CONFIG(hw) + offset);

		VIRTIO_PCI_CONFIG_OFF(hw->use_msix) + offset);

}



static uint64_t
@@ -497,7 +491,7 @@ vtpci_write_dev_config(struct virtio_dev *dev, size_t offset, 
void

vtpci_reset(struct virtio_dev *dev)

{

	vtpci_ops(dev)->set_status(dev, VIRTIO_CONFIG_STATUS_RESET);

	vtpci_ops(dev)->set_status(dev, VIRTIO_CONFIG_S_RESET);

	/* flush status write */

	vtpci_ops(dev)->get_status(dev);

}
@@ -505,13 +499,13 @@ vtpci_reset(struct virtio_dev *dev) 
void

vtpci_reinit_complete(struct virtio_dev *dev)

{

	vtpci_set_status(dev, VIRTIO_CONFIG_STATUS_DRIVER_OK);

	vtpci_set_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);

}



void

vtpci_set_status(struct virtio_dev *dev, uint8_t status)

{

	if (status != VIRTIO_CONFIG_STATUS_RESET)

	if (status != VIRTIO_CONFIG_S_RESET)

		status |= vtpci_ops(dev)->get_status(dev);



	vtpci_ops(dev)->set_status(dev, status);

lib/bdev/virtio/rte_virtio/virtio_pci.h

+5 −148
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ 
#define _VIRTIO_PCI_H_



#include <stdint.h>

#include <linux/virtio_config.h>

#include <linux/virtio_pci.h>



#include <rte_pci.h>
@@ -45,149 +47,13 @@ struct virtqueue; 


#define VIRTIO_MAX_DEVICES 128



/* Extra status define for readability */

#define VIRTIO_CONFIG_S_RESET 0



/* VirtIO PCI vendor/device ID. */

#define VIRTIO_PCI_VENDORID     0x1AF4

#define VIRTIO_PCI_DEVICEID_SCSI_MODERN 0x1004



/* VirtIO ABI version, this must match exactly. */

#define VIRTIO_PCI_ABI_VERSION 0



/*

 * VirtIO Header, located in BAR 0.

 */

#define VIRTIO_PCI_HOST_FEATURES  0  /* host's supported features (32bit, RO)*/

#define VIRTIO_PCI_GUEST_FEATURES 4  /* guest's supported features (32, RW) */

#define VIRTIO_PCI_QUEUE_PFN      8  /* physical address of VQ (32, RW) */

#define VIRTIO_PCI_QUEUE_NUM      12 /* number of ring entries (16, RO) */

#define VIRTIO_PCI_QUEUE_SEL      14 /* current VQ selection (16, RW) */

#define VIRTIO_PCI_QUEUE_NOTIFY   16 /* notify host regarding VQ (16, RW) */

#define VIRTIO_PCI_STATUS         18 /* device status register (8, RW) */

#define VIRTIO_PCI_ISR		  19 /* interrupt status register, reading

				      * also clears the register (8, RO) */

/* Only if MSIX is enabled: */

#define VIRTIO_MSI_CONFIG_VECTOR  20 /* configuration change vector (16, RW) */

#define VIRTIO_MSI_QUEUE_VECTOR	  22 /* vector for selected VQ notifications

				      (16, RW) */



/* The bit of the ISR which indicates a device has an interrupt. */

#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. */

#define VIRTIO_MSI_NO_VECTOR 0xFFFF



/* VirtIO device IDs. */

#define VIRTIO_ID_NETWORK  0x01

#define VIRTIO_ID_BLOCK    0x02

#define VIRTIO_ID_CONSOLE  0x03

#define VIRTIO_ID_ENTROPY  0x04

#define VIRTIO_ID_BALLOON  0x05

#define VIRTIO_ID_IOMEMORY 0x06

#define VIRTIO_ID_9P       0x09



/* Status byte for guest to report progress. */

#define VIRTIO_CONFIG_STATUS_RESET     0x00

#define VIRTIO_CONFIG_STATUS_ACK       0x01

#define VIRTIO_CONFIG_STATUS_DRIVER    0x02

#define VIRTIO_CONFIG_STATUS_DRIVER_OK 0x04

#define VIRTIO_CONFIG_STATUS_FEATURES_OK 0x08

#define VIRTIO_CONFIG_STATUS_FAILED    0x80



/*

 * Each virtqueue indirect descriptor list must be physically contiguous.

 * To allow us to malloc(9) each list individually, limit the number

 * supported to what will fit in one page. With 4KB pages, this is a limit

 * of 256 descriptors. If there is ever a need for more, we can switch to

 * contigmalloc(9) for the larger allocations, similar to what

 * bus_dmamem_alloc(9) does.

 *

 * Note the sizeof(struct vring_desc) is 16 bytes.

 */

#define VIRTIO_MAX_INDIRECT ((int) (PAGE_SIZE / 16))



#define VIRTIO_SCSI_F_INOUT		0



/* Do we get callbacks when the ring is completely used, even if we've

 * suppressed them? */

#define VIRTIO_F_NOTIFY_ON_EMPTY	24



/* Can the device handle any descriptor layout? */

#define VIRTIO_F_ANY_LAYOUT		27



/* We support indirect buffer descriptors */

#define VIRTIO_RING_F_INDIRECT_DESC	28



#define VIRTIO_F_VERSION_1		32

#define VIRTIO_F_IOMMU_PLATFORM	33



/*

 * Some VirtIO feature bits (currently bits 28 through 31) are

 * reserved for the transport being used (eg. virtio_ring), the

 * rest are per-device feature bits.

 */

#define VIRTIO_TRANSPORT_F_START 28

#define VIRTIO_TRANSPORT_F_END   34



/* The Guest publishes the used index for which it expects an interrupt

 * at the end of the avail ring. Host should ignore the avail->flags field. */

/* The Host publishes the avail index for which it expects a kick

 * at the end of the used ring. Guest should ignore the used->flags field. */

#define VIRTIO_RING_F_EVENT_IDX		29



/* Common configuration */

#define VIRTIO_PCI_CAP_COMMON_CFG	1

/* Notifications */

#define VIRTIO_PCI_CAP_NOTIFY_CFG	2

/* ISR Status */

#define VIRTIO_PCI_CAP_ISR_CFG		3

/* Device specific configuration */

#define VIRTIO_PCI_CAP_DEVICE_CFG	4

/* PCI configuration access */

#define VIRTIO_PCI_CAP_PCI_CFG		5



/* This is the PCI capability header: */

struct virtio_pci_cap {

	uint8_t cap_vndr;		/* Generic PCI field: PCI_CAP_ID_VNDR */

	uint8_t cap_next;		/* Generic PCI field: next ptr. */

	uint8_t cap_len;		/* Generic PCI field: capability length */

	uint8_t cfg_type;		/* Identifies the structure. */

	uint8_t bar;			/* Where to find it. */

	uint8_t padding[3];		/* Pad to full dword. */

	uint32_t offset;		/* Offset within bar. */

	uint32_t length;		/* Length of the structure, in bytes. */

};



struct virtio_pci_notify_cap {

	struct virtio_pci_cap cap;

	uint32_t notify_off_multiplier;	/* Multiplier for queue_notify_off. */

};



/* Fields in VIRTIO_PCI_CAP_COMMON_CFG: */

struct virtio_pci_common_cfg {

	/* About the whole device. */

	uint32_t device_feature_select;	/* read-write */

	uint32_t device_feature;	/* read-only */

	uint32_t guest_feature_select;	/* read-write */

	uint32_t guest_feature;		/* read-write */

	uint16_t msix_config;		/* read-write */

	uint16_t num_queues;		/* read-only */

	uint8_t device_status;		/* read-write */

	uint8_t config_generation;	/* read-only */



	/* About a specific virtqueue. */

	uint16_t queue_select;		/* read-write */

	uint16_t queue_size;		/* read-write, power of 2. */

	uint16_t queue_msix_vector;	/* read-write */

	uint16_t queue_enable;		/* read-write */

	uint16_t queue_notify_off;	/* read-only */

	uint32_t queue_desc_lo;		/* read-write */

	uint32_t queue_desc_hi;		/* read-write */

	uint32_t queue_avail_lo;	/* read-write */

	uint32_t queue_avail_hi;	/* read-write */

	uint32_t queue_used_lo;		/* read-write */

	uint32_t queue_used_hi;		/* read-write */

};



struct virtio_pci_ops {

	void (*read_dev_cfg)(struct virtio_dev *hw, size_t offset,

			     void *dst, int len);
@@ -262,15 +128,6 @@ struct virtio_driver { 


extern struct virtio_driver g_virtio_driver;



/*

 * How many bits to shift physical queue address written to QUEUE_PFN.

 * 12 is historical, and due to x86 page size.

 */

#define VIRTIO_PCI_QUEUE_ADDR_SHIFT 12



/* The alignment to use between consumer and producer parts of vring. */

#define VIRTIO_PCI_VRING_ALIGN 4096



static inline int

vtpci_with_feature(struct virtio_dev *dev, uint64_t bit)

{