| Message ID | 20250501210456.89071-18-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/i386/pc: Remove deprecated 2.8 and 2.9 PC machines | expand |
On Thu, 1 May 2025 23:04:55 +0200 Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > The GenPCIERootPort::migrate_msix boolean was only set in > the hw_compat_2_9[] array, via the 'x-migrate-msix=false' > property. We removed all machines using that array, lets > remove that property and all the code around it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/pci-bridge/gen_pcie_root_port.c | 16 ++-------------- > 1 file changed, 2 insertions(+), 14 deletions(-) > > diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c > index d9078e783bf..831d21225e9 100644 > --- a/hw/pci-bridge/gen_pcie_root_port.c > +++ b/hw/pci-bridge/gen_pcie_root_port.c > @@ -35,8 +35,6 @@ struct GenPCIERootPort { > PCIESlot parent_obj; > /*< public >*/ > > - bool migrate_msix; > - > /* additional resources to reserve */ > PCIResReserve res_reserve; > }; > @@ -66,13 +64,6 @@ static void gen_rp_interrupts_uninit(PCIDevice *d) > msix_uninit_exclusive_bar(d); > } > > -static bool gen_rp_test_migrate_msix(void *opaque, int version_id) > -{ > - GenPCIERootPort *rp = opaque; > - > - return rp->migrate_msix; > -} > - > static void gen_rp_realize(DeviceState *dev, Error **errp) > { > PCIDevice *d = PCI_DEVICE(dev); > @@ -121,16 +112,13 @@ static const VMStateDescription vmstate_rp_dev = { > VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), > VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, > PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), > - VMSTATE_MSIX_TEST(parent_obj.parent_obj.parent_obj.parent_obj, > - GenPCIERootPort, > - gen_rp_test_migrate_msix), > + VMSTATE_MSIX(parent_obj.parent_obj.parent_obj.parent_obj, > + GenPCIERootPort), > VMSTATE_END_OF_LIST() > } > }; > > static const Property gen_rp_props[] = { > - DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, > - migrate_msix, true), > DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort, > res_reserve.bus, -1), > DEFINE_PROP_SIZE("io-reserve", GenPCIERootPort,
diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index d9078e783bf..831d21225e9 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -35,8 +35,6 @@ struct GenPCIERootPort { PCIESlot parent_obj; /*< public >*/ - bool migrate_msix; - /* additional resources to reserve */ PCIResReserve res_reserve; }; @@ -66,13 +64,6 @@ static void gen_rp_interrupts_uninit(PCIDevice *d) msix_uninit_exclusive_bar(d); } -static bool gen_rp_test_migrate_msix(void *opaque, int version_id) -{ - GenPCIERootPort *rp = opaque; - - return rp->migrate_msix; -} - static void gen_rp_realize(DeviceState *dev, Error **errp) { PCIDevice *d = PCI_DEVICE(dev); @@ -121,16 +112,13 @@ static const VMStateDescription vmstate_rp_dev = { VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), - VMSTATE_MSIX_TEST(parent_obj.parent_obj.parent_obj.parent_obj, - GenPCIERootPort, - gen_rp_test_migrate_msix), + VMSTATE_MSIX(parent_obj.parent_obj.parent_obj.parent_obj, + GenPCIERootPort), VMSTATE_END_OF_LIST() } }; static const Property gen_rp_props[] = { - DEFINE_PROP_BOOL("x-migrate-msix", GenPCIERootPort, - migrate_msix, true), DEFINE_PROP_UINT32("bus-reserve", GenPCIERootPort, res_reserve.bus, -1), DEFINE_PROP_SIZE("io-reserve", GenPCIERootPort,
The GenPCIERootPort::migrate_msix boolean was only set in the hw_compat_2_9[] array, via the 'x-migrate-msix=false' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/pci-bridge/gen_pcie_root_port.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)