Re: [PATCH 10/21] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_DISABLE_PCIE definition

[Philippe Mathieu-Daudé]

On 17/1/25 10:08, Thomas Huth wrote:
> On 16/01/2025 00.22, Philippe Mathieu-Daudé wrote:
> > VIRTIO_PCI_FLAG_DISABLE_PCIE was only used by the
> > hw_compat_2_4[] array, via the 'x-disable-pcie=false'
> > property. We removed all machines using that array,
> > lets remove all the code around VIRTIO_PCI_FLAG_DISABLE_PCIE.
> >
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > ---
> >   include/hw/virtio/virtio-pci.h | 4 ----
> >   hw/virtio/virtio-pci.c         | 5 +----
> >   2 files changed, 1 insertion(+), 8 deletions(-)
> >
> > diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/ 
> > virtio-pci.h
> > index dd6eb9a4fc7..1ca7419cd43 100644
> > --- a/include/hw/virtio/virtio-pci.h
> > +++ b/include/hw/virtio/virtio-pci.h
> > @@ -33,7 +33,6 @@ enum {
> >       VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT,
> >       VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT,
> >       VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT,
> > -    VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT,
> >       VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT,
> >       VIRTIO_PCI_FLAG_ATS_BIT,
> >       VIRTIO_PCI_FLAG_INIT_DEVERR_BIT,
>
> I assume it's ok that the other following bits change their value here?

I followed previous commit 9a4c0e220d8 ("hw/virtio-pci:
fix virtio behaviour"):

diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index e4548c2f970..25fbf8a375d 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -61,8 +61,6 @@ typedef struct VirtioBusClass VirtioPCIBusClass;
 enum {
     VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT,
     VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT,
-    VIRTIO_PCI_FLAG_DISABLE_LEGACY_BIT,
-    VIRTIO_PCI_FLAG_DISABLE_MODERN_BIT,
     VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT,
     VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT,
     VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT,

> If so:
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Thanks!