qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Marcel Apfelbaum <marcel@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Jason Wang <jasowang@redhat.com>,
	Laurent Vivier <lvivier@redhat.com>
Subject: [Qemu-devel] [PULL 06/16] hw/virtio: fix double use of a virtio flag
Date: Fri, 4 Mar 2016 09:49:29 +0200	[thread overview]
Message-ID: <1457077710-17678-7-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1457077710-17678-1-git-send-email-mst@redhat.com>

From: Marcel Apfelbaum <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>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@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)
-- 
MST

  parent reply	other threads:[~2016-03-04  7:49 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-04  7:49 [Qemu-devel] [PULL 00/16] vhost, virtio, pci, pc, acpi Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 01/16] acpi: add aml_create_field() Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 02/16] acpi: add aml_concatenate() Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 03/16] acpi: allow using object as offset for OperationRegion Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 04/16] acpi: add build_append_named_dword, returning an offset in buffer Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 05/16] balloon: fix segfault and harden the stats queue Michael S. Tsirkin
2016-03-04  7:49 ` Michael S. Tsirkin [this message]
2016-03-04  7:49 ` [Qemu-devel] [PULL 07/16] hw/virtio: group virtio flags into an enum Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 08/16] virtio-balloon: export all balloon statistics Michael S. Tsirkin
2016-03-16 10:33   ` Denis V. Lunev
2016-03-16 10:37     ` Michael S. Tsirkin
2016-05-14 10:49       ` Denis V. Lunev
2016-03-04  7:49 ` [Qemu-devel] [PULL 09/16] virtio-balloon: add 'available' counter Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 10/16] vhost-user: verify that number of queues is less than MAX_QUEUE_NUM Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 11/16] pc-dimm: fix error handling in pc_dimm_check_memdev_is_busy() Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 12/16] i386/acpi: make floppy controller object dynamic Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 13/16] i386: expose floppy drive CMOS type Michael S. Tsirkin
2016-03-04  7:49 ` [Qemu-devel] [PULL 14/16] fdc: add function to determine drive chs limits Michael S. Tsirkin
2016-03-04  7:50 ` [Qemu-devel] [PULL 15/16] i386: populate floppy drive information in DSDT Michael S. Tsirkin
2016-03-04  7:50 ` [Qemu-devel] [PULL 16/16] i386: update expected DSDT Michael S. Tsirkin
2016-03-04  8:49 ` [Qemu-devel] [PULL 00/16] vhost, virtio, pci, pc, acpi Fam Zheng
2016-03-04  8:52   ` 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=1457077710-17678-7-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=marcel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@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).