X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-console.c;h=ab66d5aac61ee8bbc9ec7d6a06454037799de41a;hb=95b1b11f48e19834fca26e87f594d6794f1c6d55;hp=9e1354673e033c87b7f63c9029cd3c14457ca69b;hpb=ef34565873989f5b0240f7f9911c3666a69587c9;p=palacios.git diff --git a/linux_module/iface-console.c b/linux_module/iface-console.c index 9e13546..ab66d5a 100644 --- a/linux_module/iface-console.c +++ b/linux_module/iface-console.c @@ -209,6 +209,7 @@ static int console_connect(struct v3_guest * guest, unsigned int cmd, struct palacios_console * cons = priv_data; int cons_fd = 0; unsigned long flags; + int acquired = 0; if (cons->open == 0) { printk("Attempted to connect to unopened console\n"); @@ -216,6 +217,16 @@ static int console_connect(struct v3_guest * guest, unsigned int cmd, } spin_lock_irqsave(&(cons->lock), flags); + if (cons->connected == 0) { + cons->connected = 1; + acquired = 1; + } + spin_unlock_irqrestore(&(cons->lock), flags); + + if (acquired == 0) { + printk("Console already connected\n"); + return -1; + } cons_fd = anon_inode_getfd("v3-cons", &cons_fops, cons, O_RDWR); @@ -224,10 +235,8 @@ static int console_connect(struct v3_guest * guest, unsigned int cmd, return cons_fd; } - cons->connected = 1; - v3_deliver_console_event(guest->v3_ctx, NULL); - spin_unlock_irqrestore(&(cons->lock), flags); + printk("Console connected\n");