There's no need to store the xenstore page or event channel in xen_start_info if they are locally initialized.
This also fixes PVH local xenstore initialization due to the lack of xen_start_info in that case. Signed-off-by: Boris Ostrovsky <boris.ostrov...@oracle.com> Signed-off-by: Roger Pau Monné <roger....@citrix.com> --- Cc: Boris Ostrovsky <boris.ostrov...@oracle.com> Cc: Juergen Gross <jgr...@suse.com> Cc: xen-de...@lists.xenproject.org --- drivers/xen/xenbus/xenbus_probe.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index ec9eb4fba59c..f2088838f690 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -710,7 +710,7 @@ static int __init xenstored_local_init(void) if (!page) goto out_err; - xen_store_gfn = xen_start_info->store_mfn = virt_to_gfn((void *)page); + xen_store_gfn = virt_to_gfn((void *)page); /* Next allocate a local port which xenstored can bind to */ alloc_unbound.dom = DOMID_SELF; @@ -722,8 +722,7 @@ static int __init xenstored_local_init(void) goto out_err; BUG_ON(err); - xen_store_evtchn = xen_start_info->store_evtchn = - alloc_unbound.port; + xen_store_evtchn = alloc_unbound.port; return 0; -- 2.17.0