xen/store: do not store local values in xen_start_info

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.ostrovsky@oracle.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Roger Pau Monne 2018-05-09 11:21:28 +01:00 committed by Juergen Gross
parent 24a94b3c12
commit 515e6541f5

View File

@ -710,7 +710,7 @@ static int __init xenstored_local_init(void)
if (!page) if (!page)
goto out_err; 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 */ /* Next allocate a local port which xenstored can bind to */
alloc_unbound.dom = DOMID_SELF; alloc_unbound.dom = DOMID_SELF;
@ -722,8 +722,7 @@ static int __init xenstored_local_init(void)
goto out_err; goto out_err;
BUG_ON(err); BUG_ON(err);
xen_store_evtchn = xen_start_info->store_evtchn = xen_store_evtchn = alloc_unbound.port;
alloc_unbound.port;
return 0; return 0;