Re: [Qemu-stable] [Qemu-devel] [PATCH 1/2] hw/virtio: fix double use of a virtio flag

[Laurent Vivier]

On 10/02/2016 13:22, Marcel Apfelbaum wrote:
> Commits 1811e64c and a6df8adf use the same virtio feature bit 4
> for different features.
> 
> Fix it by using different bits.
> 
> Reported-by: Laurent Vivier <address@hidden>
> Signed-off-by: Marcel Apfelbaum <address@hidden>
> ---
>  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)
> 
Tested-by: Laurent Vivier <address@hidden>

pc-i440fx-2.4
    migrate-extra = false
    x-disable-pcie = true

pc-i440fx-2.5
    migrate-extra = true
    x-disable-pcie = false

This is correct, now.

Thanks,
Laurent