diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:13:27 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-09 13:13:27 -0500 |
| commit | 282c355b174755ae53e2feeaf624c418ea009dc6 (patch) | |
| tree | a63ec276e67b033ffd9b636eeda262e02b67307f /hw/xen_console.c | |
| parent | da5391edd18a1d75d4ca13f2dffe70e02f851110 (diff) | |
| parent | 56c119e52ca229869912b22a5bec283487b0cf9b (diff) | |
| download | focaccia-qemu-282c355b174755ae53e2feeaf624c418ea009dc6.tar.gz focaccia-qemu-282c355b174755ae53e2feeaf624c418ea009dc6.zip | |
Merge remote-tracking branch 'sstabellini/xen-next' into staging
Diffstat (limited to 'hw/xen_console.c')
| -rw-r--r-- | hw/xen_console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xen_console.c b/hw/xen_console.c index 5789bd09a5..edcb31ce66 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -212,7 +212,7 @@ out: return ret; } -static int con_connect(struct XenDevice *xendev) +static int con_initialise(struct XenDevice *xendev) { struct XenConsole *con = container_of(xendev, struct XenConsole, xendev); int limit; @@ -273,7 +273,7 @@ struct XenDevOps xen_console_ops = { .size = sizeof(struct XenConsole), .flags = DEVOPS_FLAG_IGNORE_STATE, .init = con_init, - .connect = con_connect, + .initialise = con_initialise, .event = con_event, .disconnect = con_disconnect, }; |