diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-05-09 13:47:37 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-06-20 11:44:12 +0100 |
| commit | ee3b850a70613a9e0cedef8c79f76e9ee45cbef3 (patch) | |
| tree | 89886d0aab0f638ae133ea35f6478d836348ad9a /tests/libqos/virtio.h | |
| parent | 1373a4c2568282a8f998a778f09d9d628afcd7fd (diff) | |
| download | qemu-ee3b850a70613a9e0cedef8c79f76e9ee45cbef3.tar.gz | |
libqos: drop duplicated virtio_ring.h bit definitions
Note that virtio_ring.h defines feature bits using their bit number:
#define VIRTIO_RING_F_INDIRECT_DESC 28
On the other hand libqos virtio.h uses the bit mask:
#define QVIRTIO_F_RING_INDIRECT_DESC 0x10000000
The patch makes the necessary adjustments.
I have used "1u << BITMASK" instead of "1ULL << BITMASK" because the
64-bit feature fields are not implemented in libqos virtio.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1462798061-30382-5-git-send-email-stefanha@redhat.com
Diffstat (limited to 'tests/libqos/virtio.h')
| -rw-r--r-- | tests/libqos/virtio.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h index 993ae0efe5..2af8036285 100644 --- a/tests/libqos/virtio.h +++ b/tests/libqos/virtio.h @@ -12,22 +12,8 @@ #include "libqos/malloc.h" -#define QVIRTIO_F_RING_INDIRECT_DESC 0x10000000 -#define QVIRTIO_F_RING_EVENT_IDX 0x20000000 #define QVIRTIO_F_BAD_FEATURE 0x40000000 -#define QVRING_DESC_F_NEXT 0x1 -#define QVRING_DESC_F_WRITE 0x2 -#define QVRING_DESC_F_INDIRECT 0x4 - -#define QVIRTIO_F_RING_INDIRECT_DESC 0x10000000 -#define QVIRTIO_F_RING_EVENT_IDX 0x20000000 -#define QVIRTIO_F_BAD_FEATURE 0x40000000 - -#define QVRING_AVAIL_F_NO_INTERRUPT 1 - -#define QVRING_USED_F_NO_NOTIFY 1 - typedef struct QVirtioDevice { /* Device type */ uint16_t device_type; |