From d45361b2ae45238fac9259d79daf32a022acdfcc Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Thu, 9 Feb 2012 18:33:30 +0000 Subject: mini-os: avoid crash if no console is provided Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell Cc: Stefano Stabellini Committed-by: Ian Jackson --- extras/mini-os/console/xencons_ring.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'extras') diff --git a/extras/mini-os/console/xencons_ring.c b/extras/mini-os/console/xencons_ring.c index 9ed37567fd..8b81dc41ae 100644 --- a/extras/mini-os/console/xencons_ring.c +++ b/extras/mini-os/console/xencons_ring.c @@ -25,7 +25,10 @@ static inline void notify_daemon(struct consfront_dev *dev) static inline struct xencons_interface *xencons_interface(void) { - return mfn_to_virt(start_info.console.domU.mfn); + if (start_info.console.domU.evtchn) + return mfn_to_virt(start_info.console.domU.mfn); + else + return NULL; } int xencons_ring_send_no_notify(struct consfront_dev *dev, const char *data, unsigned len) @@ -38,6 +41,8 @@ int xencons_ring_send_no_notify(struct consfront_dev *dev, const char *data, uns intf = xencons_interface(); else intf = dev->ring; + if (!intf) + return sent; cons = intf->out_cons; prod = intf->out_prod; -- cgit v1.2.3