| Message ID | 20250501183628.87479-15-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.6 and 2.7 PC machines | expand |
On 01/05/2025 19:36, Philippe Mathieu-Daudé wrote: > The VirtIOPCIProxy::ignore_backend_features boolean was only set > in the hw_compat_2_7[] array, via the 'x-ignore-backend-features=on' > property. We removed all machines using that array, lets remove > that property, simplify by only using the default version. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/hw/virtio/virtio-pci.h | 1 - > hw/virtio/virtio-pci.c | 5 +---- > 2 files changed, 1 insertion(+), 5 deletions(-) > > diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h > index f962c9116c1..9838e8650a6 100644 > --- a/include/hw/virtio/virtio-pci.h > +++ b/include/hw/virtio/virtio-pci.h > @@ -149,7 +149,6 @@ struct VirtIOPCIProxy { > int config_cap; > uint32_t flags; > bool disable_modern; > - bool ignore_backend_features; > OnOffAuto disable_legacy; > /* Transitional device id */ > uint16_t trans_devid; > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 8d68e56641a..7c965771907 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -1965,8 +1965,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) > * Virtio capabilities present without > * VIRTIO_F_VERSION_1 confuses guests > */ > - if (!proxy->ignore_backend_features && > - !virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { > + if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { > virtio_pci_disable_modern(proxy); > > if (!legacy) { > @@ -2351,8 +2350,6 @@ static const Property virtio_pci_properties[] = { > VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), > DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, > VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), > - DEFINE_PROP_BOOL("x-ignore-backend-features", VirtIOPCIProxy, > - ignore_backend_features, false), > DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, > VIRTIO_PCI_FLAG_ATS_BIT, false), > DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags, Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> ATB, Mark.
diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index f962c9116c1..9838e8650a6 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -149,7 +149,6 @@ struct VirtIOPCIProxy { int config_cap; uint32_t flags; bool disable_modern; - bool ignore_backend_features; OnOffAuto disable_legacy; /* Transitional device id */ uint16_t trans_devid; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 8d68e56641a..7c965771907 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1965,8 +1965,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp) * Virtio capabilities present without * VIRTIO_F_VERSION_1 confuses guests */ - if (!proxy->ignore_backend_features && - !virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { + if (!virtio_has_feature(vdev->host_features, VIRTIO_F_VERSION_1)) { virtio_pci_disable_modern(proxy); if (!legacy) { @@ -2351,8 +2350,6 @@ static const Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), DEFINE_PROP_BIT("page-per-vq", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, false), - DEFINE_PROP_BOOL("x-ignore-backend-features", VirtIOPCIProxy, - ignore_backend_features, false), DEFINE_PROP_BIT("ats", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_ATS_BIT, false), DEFINE_PROP_BIT("x-ats-page-aligned", VirtIOPCIProxy, flags,
The VirtIOPCIProxy::ignore_backend_features boolean was only set in the hw_compat_2_7[] array, via the 'x-ignore-backend-features=on' property. We removed all machines using that array, lets remove that property, simplify by only using the default version. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/virtio/virtio-pci.h | 1 - hw/virtio/virtio-pci.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-)