diff options
| author | Stefan Hajnoczi | 2019-10-23 12:04:11 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2019-10-25 13:46:22 +0200 |
| commit | 60ce3a40fc18423d6c3ba330e60ca03fc74f9d21 (patch) | |
| tree | 93d69a8591910aa1a947f050f7533c32572c43c8 | |
| parent | tests/virtio-blk-test: read config space after feature negotiation (diff) | |
| download | qemu-60ce3a40fc18423d6c3ba330e60ca03fc74f9d21.tar.gz qemu-60ce3a40fc18423d6c3ba330e60ca03fc74f9d21.tar.xz qemu-60ce3a40fc18423d6c3ba330e60ca03fc74f9d21.zip | |
libqos: read QVIRTIO_MMIO_VERSION register
There was no real virtio-mmio ABI change between Legacy and VIRTIO 1.0
except that the Version field was incremented from 1 to 2.
However, QEMU does not allow Legacy drivers to perform VIRTIO 1.0
operations like accessing 64-bit feature bits. Since we will introduce
64-bit feature bit support we need a way to differentiate between
virtio-mmio Version 1 and 2 to avoid upsetting QEMU when we operate in
Legacy mode.
Stash away the Version field so later patches can change behavior
depending on the version.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20191023100425.12168-3-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | tests/libqos/virtio-mmio.c | 3 | ||||
| -rw-r--r-- | tests/libqos/virtio-mmio.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/libqos/virtio-mmio.c b/tests/libqos/virtio-mmio.c index d0047876a8..7154b03c1d 100644 --- a/tests/libqos/virtio-mmio.c +++ b/tests/libqos/virtio-mmio.c @@ -223,6 +223,9 @@ void qvirtio_mmio_init_device(QVirtioMMIODevice *dev, QTestState *qts, magic = qtest_readl(qts, addr + QVIRTIO_MMIO_MAGIC_VALUE); g_assert(magic == ('v' | 'i' << 8 | 'r' << 16 | 't' << 24)); + dev->version = qtest_readl(qts, addr + QVIRTIO_MMIO_VERSION); + g_assert(dev->version == 1 || dev->version == 2); + dev->qts = qts; dev->addr = addr; dev->page_size = page_size; diff --git a/tests/libqos/virtio-mmio.h b/tests/libqos/virtio-mmio.h index 17a17141c3..0e45778b07 100644 --- a/tests/libqos/virtio-mmio.h +++ b/tests/libqos/virtio-mmio.h @@ -40,6 +40,7 @@ typedef struct QVirtioMMIODevice { uint64_t addr; uint32_t page_size; uint32_t features; /* As it cannot be read later, save it */ + uint32_t version; } QVirtioMMIODevice; extern const QVirtioBus qvirtio_mmio; |