diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:47:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-14 10:47:33 -0500 |
| commit | 210b3a70383b0bcc4266856431491b39dcb4f14d (patch) | |
| tree | 43bca90787d6d55b78883870180611b156b8373b /block | |
| parent | bdc792d3875ee0e8c824bcd7820ab08ff2bd5e24 (diff) | |
| parent | add8d262035a0c4e3ccad26b4b4a5644f4a66185 (diff) | |
| download | qemu-210b3a70383b0bcc4266856431491b39dcb4f14d.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'block')
| -rw-r--r-- | block/qcow.c | 2 | ||||
| -rw-r--r-- | block/sheepdog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/qcow.c b/block/qcow.c index c8bfecc1cb..eba5a04c44 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -596,7 +596,7 @@ static int qcow_co_writev(BlockDriverState *bs, int64_t sector_num, if (qiov->niov > 1) { qemu_vfree(orig_buf); } - free(cluster_data); + g_free(cluster_data); return ret; } diff --git a/block/sheepdog.c b/block/sheepdog.c index c1f6e07ec1..ae857e294c 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -66,7 +66,7 @@ * 20 - 31 (12 bits): reserved data object space * 32 - 55 (24 bits): vdi object space * 56 - 59 ( 4 bits): reserved vdi object space - * 60 - 63 ( 4 bits): object type indentifier space + * 60 - 63 ( 4 bits): object type identifier space */ #define VDI_SPACE_SHIFT 32 |