On 21/05/2019 17:15, Li Qiang wrote:
> It's recommended that VMStateDescription names are decoupled from QOM
> type names as the latter may freely change without consideration of
> migration compatibility.
>
> Link: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg02175.html
>
> CC: qemu-trivial@nongnu.org
> Signed-off-by: Li Qiang <liq3ea@163.com>
> ---
> hw/vfio/amd-xgbe.c | 2 +-
> hw/vfio/ap.c | 2 +-
> hw/vfio/calxeda-xgmac.c | 2 +-
> hw/vfio/ccw.c | 2 +-
> hw/vfio/platform.c | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c
> index ee64a3b4a2..1b06c0f3ea 100644
> --- a/hw/vfio/amd-xgbe.c
> +++ b/hw/vfio/amd-xgbe.c
> @@ -26,7 +26,7 @@ static void amd_xgbe_realize(DeviceState *dev, Error **errp)
> }
>
> static const VMStateDescription vfio_platform_amd_xgbe_vmstate = {
> - .name = TYPE_VFIO_AMD_XGBE,
> + .name = "vfio-amd-xgbe",
> .unmigratable = 1,
> };
>
> diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
> index d8b79ebe53..564751650f 100644
> --- a/hw/vfio/ap.c
> +++ b/hw/vfio/ap.c
> @@ -155,7 +155,7 @@ static void vfio_ap_reset(DeviceState *dev)
> }
>
> static const VMStateDescription vfio_ap_vmstate = {
> - .name = VFIO_AP_DEVICE_TYPE,
> + .name = "vfio-ap",
> .unmigratable = 1,
> };
>
> diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c
> index e7767c4b02..6cc608b6ca 100644
> --- a/hw/vfio/calxeda-xgmac.c
> +++ b/hw/vfio/calxeda-xgmac.c
> @@ -26,7 +26,7 @@ static void calxeda_xgmac_realize(DeviceState *dev, Error **errp)
> }
>
> static const VMStateDescription vfio_platform_calxeda_xgmac_vmstate = {
> - .name = TYPE_VFIO_CALXEDA_XGMAC,
> + .name = "vfio-calxeda-xgmac",
> .unmigratable = 1,
> };
>
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index 31dd3a2a87..d9e39552e2 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -468,7 +468,7 @@ static Property vfio_ccw_properties[] = {
> };
>
> static const VMStateDescription vfio_ccw_vmstate = {
> - .name = TYPE_VFIO_CCW,
> + .name = "vfio-ccw",
> .unmigratable = 1,
> };
>
> diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
> index 398db38f14..e59a0234dd 100644
> --- a/hw/vfio/platform.c
> +++ b/hw/vfio/platform.c
> @@ -697,7 +697,7 @@ out:
> }
>
> static const VMStateDescription vfio_platform_vmstate = {
> - .name = TYPE_VFIO_PLATFORM,
> + .name = "vfio-platform",
> .unmigratable = 1,
> };
>
>
Applied to my trivial-patches branch.
Thanks,
Laurent