diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-12-01 07:11:51 +0200 |
| commit | c924f36a300cbc54d3cb511116e8e2bae17f5ae6 (patch) | |
| tree | 04e57676b1db1db7d8b33934b349f8f37780fa2a /block_int.h | |
| parent | 1abeb5a65d515f8a8a9cfc4a82342f731bd9321f (diff) | |
| parent | 09fa35e5cdc7d17ed3e1528ca743893ae77a0ea2 (diff) | |
Merge remote branch 'origin/master' into pci
Conflicts:
Makefile.objs
hw/virtio.c
Diffstat (limited to 'block_int.h')
| -rw-r--r-- | block_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block_int.h b/block_int.h index 87e60b8597..3c3adb5c85 100644 --- a/block_int.h +++ b/block_int.h @@ -59,7 +59,7 @@ struct BlockDriver { const uint8_t *buf, int nb_sectors); void (*bdrv_close)(BlockDriverState *bs); int (*bdrv_create)(const char *filename, QEMUOptionParameter *options); - void (*bdrv_flush)(BlockDriverState *bs); + int (*bdrv_flush)(BlockDriverState *bs); int (*bdrv_is_allocated)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum); int (*bdrv_set_key)(BlockDriverState *bs, const char *key); |