From: Marcel Apfelbaum <marcel@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcel@redhat.com, lvivier@redhat.com, jasowang@redhat.com,
qemu-stable@nongnu.org, mst@redhat.com
Subject: [Qemu-devel] [PATCH 1/2] hw/virtio: fix double use of a virtio flag
Date: Wed, 10 Feb 2016 14:22:20 +0200 [thread overview]
Message-ID: <1455106941-2934-2-git-send-email-marcel@redhat.com> (raw)
In-Reply-To: <1455106941-2934-1-git-send-email-marcel@redhat.com>
Commits 1811e64c and a6df8adf use the same virtio feature bit 4
for different features.
Fix it by using different bits.
Reported-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
---
hw/virtio/virtio-pci.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index e096e98..6686b10 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -71,7 +71,7 @@ typedef struct VirtioBusClass VirtioPCIBusClass;
/* virtio version flags */
#define VIRTIO_PCI_FLAG_DISABLE_LEGACY_BIT 2
#define VIRTIO_PCI_FLAG_DISABLE_MODERN_BIT 3
-#define VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT 4
+#define VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT 6
#define VIRTIO_PCI_FLAG_DISABLE_LEGACY (1 << VIRTIO_PCI_FLAG_DISABLE_LEGACY_BIT)
#define VIRTIO_PCI_FLAG_DISABLE_MODERN (1 << VIRTIO_PCI_FLAG_DISABLE_MODERN_BIT)
#define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT)
--
2.4.3
next prev parent reply other threads:[~2016-02-10 12:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 12:22 [Qemu-devel] [PATCH 0/2] hw/virtio: fix double use of a virtio flag Marcel Apfelbaum
2016-02-10 12:22 ` Marcel Apfelbaum [this message]
2016-02-10 12:57 ` [Qemu-devel] [PATCH 1/2] " Laurent Vivier
2016-02-10 13:19 ` Laurent Vivier
2016-02-23 3:34 ` Jason Wang
2016-02-10 12:22 ` [Qemu-devel] [PATCH 2/2] hw/virtio: group virtio flags into an enum Marcel Apfelbaum
2016-02-10 13:07 ` Laurent Vivier
2016-02-10 13:24 ` Marcel Apfelbaum
2016-02-23 3:39 ` Jason Wang
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=1455106941-2934-2-git-send-email-marcel@redhat.com \
--to=marcel@redhat.com \
--cc=jasowang@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/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).