Skip to content

Commit

Permalink
virtio: console as a config option
Browse files Browse the repository at this point in the history
I also added a small Kconfig change that allows the user to specify the
virtio console in menuconfig.

(Fixes to export symbols from Stephen Rothwell <sfr@canb.auug.org.au>)
(Fixes for CONFIG_VIRTIO_CONSOLE=y vs CONFIG_VIRTIO=m from Christian himself)

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
  • Loading branch information
Christian Borntraeger authored and Rusty Russell committed Jul 25, 2008
1 parent 91fcad1 commit 7721c49
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/char/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -624,8 +624,12 @@ config HVC_XEN
Xen virtual console device driver

config VIRTIO_CONSOLE
bool
tristate "Virtio console"
depends on VIRTIO
select HVC_DRIVER
help
Virtio console for use with lguest and other hypervisors.


config HVCS
tristate "IBM Hypervisor Virtual Console Server support"
Expand Down
4 changes: 4 additions & 0 deletions drivers/char/hvc_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,15 @@ int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)

return 0;
}
EXPORT_SYMBOL_GPL(hvc_instantiate);

/* Wake the sleeping khvcd */
void hvc_kick(void)
{
hvc_kicked = 1;
wake_up_process(hvc_task);
}
EXPORT_SYMBOL_GPL(hvc_kick);

static void hvc_unthrottle(struct tty_struct *tty)
{
Expand Down Expand Up @@ -629,6 +631,7 @@ int hvc_poll(struct hvc_struct *hp)

return poll_mask;
}
EXPORT_SYMBOL_GPL(hvc_poll);

/*
* This kthread is either polling or interrupt driven. This is determined by
Expand Down Expand Up @@ -739,6 +742,7 @@ struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,

return hp;
}
EXPORT_SYMBOL_GPL(hvc_alloc);

int __devexit hvc_remove(struct hvc_struct *hp)
{
Expand Down

0 comments on commit 7721c49

Please sign in to comment.