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_disk.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_disk.c')
| -rw-r--r-- | hw/xen_disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen_disk.c b/hw/xen_disk.c index da531a67dd..8a9fac499b 100644 --- a/hw/xen_disk.c +++ b/hw/xen_disk.c @@ -852,7 +852,7 @@ struct XenDevOps xen_blkdev_ops = { .flags = DEVOPS_FLAG_NEED_GNTDEV, .alloc = blk_alloc, .init = blk_init, - .connect = blk_connect, + .initialise = blk_connect, .disconnect = blk_disconnect, .event = blk_event, .free = blk_free, |