diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2018-05-09 12:21:28 +0200 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2018-05-17 08:39:13 +0200 |
| commit | 515e6541f54e90513fe4cd91f69d737a891f1c79 (patch) | |
| tree | e43ef88bf20019effb644b3c1a8705f1631fd949 /drivers/xen | |
| parent | xen-netfront: fix xennet_start_xmit()'s return type (diff) | |
| download | linux-515e6541f54e90513fe4cd91f69d737a891f1c79.tar.xz linux-515e6541f54e90513fe4cd91f69d737a891f1c79.zip | |
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>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_probe.c | 5 |
1 files 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; |