| Message ID | 20250512083948.39294-15-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.4 and 2.5 PC machines | expand |
On 5/12/2025 4:39 PM, Philippe Mathieu-Daudé wrote: > PVSCSI_COMPAT_OLD_PCI_CONFIGURATION was only used by the > hw_compat_2_5[] array, via the 'x-old-pci-configuration=on' > property. We removed all machines using that array, lets remove > all the code around PVSCSI_COMPAT_OLD_PCI_CONFIGURATION. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Zhao Liu <zhao1.liu@intel.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> > --- > hw/scsi/vmw_pvscsi.c | 26 +++++++------------------- > 1 file changed, 7 insertions(+), 19 deletions(-) > > diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c > index d5825b67868..34de59a7cf6 100644 > --- a/hw/scsi/vmw_pvscsi.c > +++ b/hw/scsi/vmw_pvscsi.c > @@ -69,17 +69,11 @@ OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) > > > /* Compatibility flags for migration */ > -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT 0 > -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION \ > - (1 << PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT) > #define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 > #define PVSCSI_COMPAT_DISABLE_PCIE \ > (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) > > -#define PVSCSI_USE_OLD_PCI_CONFIGURATION(s) \ > - ((s)->compat_flags & PVSCSI_COMPAT_OLD_PCI_CONFIGURATION) > -#define PVSCSI_MSI_OFFSET(s) \ > - (PVSCSI_USE_OLD_PCI_CONFIGURATION(s) ? 0x50 : 0x7c) > +#define PVSCSI_MSI_OFFSET (0x7c) > #define PVSCSI_EXP_EP_OFFSET (0x40) > > typedef struct PVSCSIRingInfo { > @@ -1110,7 +1104,7 @@ pvscsi_init_msi(PVSCSIState *s) > int res; > PCIDevice *d = PCI_DEVICE(s); > > - res = msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, > + res = msi_init(d, PVSCSI_MSI_OFFSET, PVSCSI_MSIX_NUM_VECTORS, > PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, NULL); > if (res < 0) { > trace_pvscsi_init_msi_fail(res); > @@ -1158,15 +1152,11 @@ pvscsi_realizefn(PCIDevice *pci_dev, Error **errp) > trace_pvscsi_state("init"); > > /* PCI subsystem ID, subsystem vendor ID, revision */ > - if (PVSCSI_USE_OLD_PCI_CONFIGURATION(s)) { > - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, 0x1000); > - } else { > - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, > - PCI_VENDOR_ID_VMWARE); > - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, > - PCI_DEVICE_ID_VMWARE_PVSCSI); > - pci_config_set_revision(pci_dev->config, 0x2); > - } > + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, > + PCI_VENDOR_ID_VMWARE); > + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, > + PCI_DEVICE_ID_VMWARE_PVSCSI); > + pci_config_set_revision(pci_dev->config, 0x2); > > /* PCI latency timer = 255 */ > pci_dev->config[PCI_LATENCY_TIMER] = 0xff; > @@ -1298,8 +1288,6 @@ static const VMStateDescription vmstate_pvscsi = { > > static const Property pvscsi_properties[] = { > DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), > - DEFINE_PROP_BIT("x-old-pci-configuration", PVSCSIState, compat_flags, > - PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT, false), > DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, > PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), > };
diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index d5825b67868..34de59a7cf6 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -69,17 +69,11 @@ OBJECT_DECLARE_TYPE(PVSCSIState, PVSCSIClass, PVSCSI) /* Compatibility flags for migration */ -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT 0 -#define PVSCSI_COMPAT_OLD_PCI_CONFIGURATION \ - (1 << PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT) #define PVSCSI_COMPAT_DISABLE_PCIE_BIT 1 #define PVSCSI_COMPAT_DISABLE_PCIE \ (1 << PVSCSI_COMPAT_DISABLE_PCIE_BIT) -#define PVSCSI_USE_OLD_PCI_CONFIGURATION(s) \ - ((s)->compat_flags & PVSCSI_COMPAT_OLD_PCI_CONFIGURATION) -#define PVSCSI_MSI_OFFSET(s) \ - (PVSCSI_USE_OLD_PCI_CONFIGURATION(s) ? 0x50 : 0x7c) +#define PVSCSI_MSI_OFFSET (0x7c) #define PVSCSI_EXP_EP_OFFSET (0x40) typedef struct PVSCSIRingInfo { @@ -1110,7 +1104,7 @@ pvscsi_init_msi(PVSCSIState *s) int res; PCIDevice *d = PCI_DEVICE(s); - res = msi_init(d, PVSCSI_MSI_OFFSET(s), PVSCSI_MSIX_NUM_VECTORS, + res = msi_init(d, PVSCSI_MSI_OFFSET, PVSCSI_MSIX_NUM_VECTORS, PVSCSI_USE_64BIT, PVSCSI_PER_VECTOR_MASK, NULL); if (res < 0) { trace_pvscsi_init_msi_fail(res); @@ -1158,15 +1152,11 @@ pvscsi_realizefn(PCIDevice *pci_dev, Error **errp) trace_pvscsi_state("init"); /* PCI subsystem ID, subsystem vendor ID, revision */ - if (PVSCSI_USE_OLD_PCI_CONFIGURATION(s)) { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, 0x1000); - } else { - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, - PCI_VENDOR_ID_VMWARE); - pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, - PCI_DEVICE_ID_VMWARE_PVSCSI); - pci_config_set_revision(pci_dev->config, 0x2); - } + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_VENDOR_ID, + PCI_VENDOR_ID_VMWARE); + pci_set_word(pci_dev->config + PCI_SUBSYSTEM_ID, + PCI_DEVICE_ID_VMWARE_PVSCSI); + pci_config_set_revision(pci_dev->config, 0x2); /* PCI latency timer = 255 */ pci_dev->config[PCI_LATENCY_TIMER] = 0xff; @@ -1298,8 +1288,6 @@ static const VMStateDescription vmstate_pvscsi = { static const Property pvscsi_properties[] = { DEFINE_PROP_UINT8("use_msg", PVSCSIState, use_msg, 1), - DEFINE_PROP_BIT("x-old-pci-configuration", PVSCSIState, compat_flags, - PVSCSI_COMPAT_OLD_PCI_CONFIGURATION_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", PVSCSIState, compat_flags, PVSCSI_COMPAT_DISABLE_PCIE_BIT, false), };