xen-bus: only set the xen device frontend state if it is missing
PATCH 1/1 xen-bus: only set the xen device frontend state if it is missing
From: Mark Syms <[email protected]>
Some toolstack implementations will set the frontend xenstore keys to Initialising which will then trigger the in guest PV drivers to begin initialising and some implementations will then set their state to Closing. If this has occurred then device realize must not overwrite the frontend keys as then the handshake will stall.
Also avoid creating the frontend area if it already exists.
---
Cc: Stefano Stabellini <[email protected]>
Cc: Anthony Perard <[email protected]>
--- hw/xen/xen-bus.c | 47 +++++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 16 deletions(-)
hw/xen/xen-bus.c +31 -16
@@ -857,6 +857,13 @@ static void xen_device_frontend_changed(void *opaque) } } +static bool xen_device_frontend_exists (XenDevice *xendev) +{ +enum xenbus_state state; + +return (xen_device_frontend_scanf (xendev,"state" ,"%u" , &state) ==1 ); +} +static void xen_device_frontend_create (XenDevice *xendev,Error **errp) {XenBus *xenbus =XEN_BUS (qdev_get_parent_bus (DEVICE (xendev)));
@@ -865,19 +872,25 @@ static void xen_device_frontend_create(XenDevice *xendev, Error **errp) xendev->frontend_path =xen_device_get_frontend_path (xendev); - perms[0 ].id = xendev->frontend_id; - perms[0 ].perms =XS_PERM_NONE ; - perms[1 ].id = xenbus->backend_id; - perms[1 ].perms =XS_PERM_READ |XS_PERM_WRITE ; +/* +* The frontend area may have already been created by a legacy +* toolstack. +*/ +if (!xen_device_frontend_exists (xendev)) { + perms[0 ].id = xendev->frontend_id; + perms[0 ].perms =XS_PERM_NONE ; + perms[1 ].id = xenbus->backend_id; + perms[1 ].perms =XS_PERM_READ |XS_PERM_WRITE ; -g_assert (xenbus->xsh); +g_assert (xenbus->xsh); -xs_node_create (xenbus->xsh,XBT_NULL , xendev->frontend_path, perms, -ARRAY_SIZE (perms), &local_err); -if (local_err) { -error_propagate_prepend (errp, local_err, -"failed to create frontend: " ); -return ; +xs_node_create (xenbus->xsh,XBT_NULL , xendev->frontend_path, perms, +ARRAY_SIZE (perms), &local_err); +if (local_err) { +error_propagate_prepend (errp, local_err, +"failed to create frontend: " ); +return ; + } } xendev->frontend_state_watch =
@@ -1290,12 +1303,14 @@ static void xen_device_realize(DeviceState *dev, Error **errp)xen_device_backend_set_online (xendev, true);xen_device_backend_set_state (xendev, XenbusStateInitWait); -xen_device_frontend_printf (xendev,"backend" ,"%s" , - xendev->backend_path); -xen_device_frontend_printf (xendev,"backend-id" ,"%u" , - xenbus->backend_id); +if (!xen_device_frontend_exists (xendev)) { +xen_device_frontend_printf (xendev,"backend" ,"%s" , + xendev->backend_path); +xen_device_frontend_printf (xendev,"backend-id" ,"%u" , + xenbus->backend_id); -xen_device_frontend_set_state (xendev, XenbusStateInitialising, true); +xen_device_frontend_set_state (xendev, XenbusStateInitialising, true); + } xendev->exit.notify = xen_device_exit;qemu_add_exit_notifier (&xendev->exit);
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 9 lines · Paul Durrant
From: Mark Syms <[email protected]>
Some toolstack implementations will set the frontend xenstore keys to Initialising which will then trigger the in guest PV drivers to begin initialising and some implementations will then set their state to Closing. If this has occurred then device realize must not overwrite the frontend keys as then the handshake will stall.
Quoted 5 lines
Signed-off-by Mark Syms <[email protected]>Also avoid creating the frontend area if it already exists.
Signed-off-by Paul Durrant <[email protected]>
Thanks,
Signature · 6 lines
Anthony PERARD _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel