On 16/01/2025 00.22, 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>
> ---
> hw/scsi/vmw_pvscsi.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
> index f07e377cb88..8c793b4188d 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);
> @@ -1298,8 +1292,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),
> };
Does this compile? I think you missed a spot that uses
PVSCSI_USE_OLD_PCI_CONFIGURATION in pvscsi_realizefn() ?
Thomas