qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fam Zheng <fam@euphon.net>, Laurent Vivier <lvivier@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	qemu-block@nongnu.org, slp@redhat.com,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Christophe de Dinechin <dinechin@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Richard Henderson <rth@twiddle.net>
Subject: [PATCH v4 02/16] libqos: read QVIRTIO_MMIO_VERSION register
Date: Wed, 23 Oct 2019 11:04:11 +0100	[thread overview]
Message-ID: <20191023100425.12168-3-stefanha@redhat.com> (raw)
In-Reply-To: <20191023100425.12168-1-stefanha@redhat.com>

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>
---
 tests/libqos/virtio-mmio.h | 1 +
 tests/libqos/virtio-mmio.c | 3 +++
 2 files changed, 4 insertions(+)

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;
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;
-- 
2.21.0



  parent reply	other threads:[~2019-10-23 10:14 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-23 10:04 [PATCH v4 00/16] libqos: add VIRTIO PCI 1.0 support Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 01/16] tests/virtio-blk-test: read config space after feature negotiation Stefan Hajnoczi
2019-10-23 10:04 ` Stefan Hajnoczi [this message]
2019-10-23 10:04 ` [PATCH v4 03/16] libqos: extend feature bits to 64-bit Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 04/16] virtio-scsi-test: add missing feature negotiation Stefan Hajnoczi
2019-10-23 10:19   ` Thomas Huth
2019-10-23 10:04 ` [PATCH v4 05/16] tests/virtio-blk-test: set up virtqueue after " Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 06/16] libqos: add missing virtio-9p " Stefan Hajnoczi
2019-10-23 10:20   ` Thomas Huth
2019-10-23 10:04 ` [PATCH v4 07/16] libqos: enforce Device Initialization order Stefan Hajnoczi
2019-10-23 11:23   ` Thomas Huth
2019-10-23 10:04 ` [PATCH v4 08/16] libqos: implement VIRTIO 1.0 FEATURES_OK step Stefan Hajnoczi
2019-10-23 11:04   ` Thomas Huth
2019-10-23 10:04 ` [PATCH v4 09/16] libqos: access VIRTIO 1.0 vring in little-endian Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 10/16] libqos: add iteration support to qpci_find_capability() Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 11/16] libqos: pass full QVirtQueue to set_queue_address() Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 12/16] libqos: add MSI-X callbacks to QVirtioPCIDevice Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 13/16] libqos: expose common virtqueue setup/cleanup functions Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 14/16] libqos: make the virtio-pci BAR index configurable Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 15/16] libqos: extract Legacy virtio-pci.c code Stefan Hajnoczi
2019-10-23 10:04 ` [PATCH v4 16/16] libqos: add VIRTIO PCI 1.0 support Stefan Hajnoczi
2019-10-23 11:22   ` Thomas Huth
2019-10-25 11:32 ` [PATCH v4 00/16] " Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191023100425.12168-3-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=dinechin@redhat.com \
    --cc=fam@euphon.net \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=slp@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).