[Qemu-devel] [PATCH] hw/pcie: fix the generic pcie root port to support migration

[Qemu-devel] [PATCH] hw/pcie: fix the generic pcie root port to support migration

[Marcel Apfelbaum]

Add msix state to pcie-root-ports's vmstate
in order to support migration.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
---
 hw/pci-bridge/gen_pcie_root_port.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
index 8ebffa8..d24aa8a 100644
--- a/hw/pci-bridge/gen_pcie_root_port.c
+++ b/hw/pci-bridge/gen_pcie_root_port.c
@@ -54,6 +54,7 @@ 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(parent_obj.parent_obj, PCIEPort),
         VMSTATE_END_OF_LIST()
     }
 };
-- 
2.9.4

Re: [Qemu-devel] [PATCH] hw/pcie: fix the generic pcie root port to support migration

[Dr. David Alan Gilbert]

* Marcel Apfelbaum (marcel@redhat.com) wrote:
> Add msix state to pcie-root-ports's vmstate
> in order to support migration.
> 
> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> ---
>  hw/pci-bridge/gen_pcie_root_port.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
> index 8ebffa8..d24aa8a 100644
> --- a/hw/pci-bridge/gen_pcie_root_port.c
> +++ b/hw/pci-bridge/gen_pcie_root_port.c
> @@ -54,6 +54,7 @@ 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(parent_obj.parent_obj, PCIEPort),

That will cause a failure of migration from/to 2.9.
Doesn't that need to be tied to the machine-type in a subsection?

Dave

>          VMSTATE_END_OF_LIST()
>      }
>  };
> -- 
> 2.9.4
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [Qemu-devel] [PATCH] hw/pcie: fix the generic pcie root port to support migration

[Marcel Apfelbaum]

On 07/06/2017 13:27, Dr. David Alan Gilbert wrote:
> * Marcel Apfelbaum (marcel@redhat.com) wrote:
>> Add msix state to pcie-root-ports's vmstate
>> in order to support migration.
>>
>> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
>> ---
>>   hw/pci-bridge/gen_pcie_root_port.c | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c
>> index 8ebffa8..d24aa8a 100644
>> --- a/hw/pci-bridge/gen_pcie_root_port.c
>> +++ b/hw/pci-bridge/gen_pcie_root_port.c
>> @@ -54,6 +54,7 @@ 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(parent_obj.parent_obj, PCIEPort),
> 
> That will cause a failure of migration from/to 2.9.
> Doesn't that need to be tied to the machine-type in a subsection?
>

Hi Dave,

Thanks for the review,
I'll repost with the fix.

Thanks,
Marcel


> Dave
> 
>>           VMSTATE_END_OF_LIST()
>>       }
>>   };
>> -- 
>> 2.9.4
>>
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>