From c18a1c88059bd546a198d95a10e9e17b11d062d1 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 18 Oct 2011 21:18:22 +0400 Subject: vmdk: remove unneeded variable assignment Spotted by Clang Analyzer Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- block/vmdk.c | 1 - 1 file changed, 1 deletion(-) (limited to 'block') diff --git a/block/vmdk.c b/block/vmdk.c index 5d16ec4..3969131 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1387,7 +1387,6 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) bdrv_delete(bs); return -EINVAL; } - filesize = bdrv_getlength(bs); parent_cid = vmdk_read_cid(bs, 0); bdrv_delete(bs); relative_path(parent_filename, sizeof(parent_filename), -- cgit v1.1 From 8379e46d1fd681b8aa4714382e2cdab05e5d0575 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 18 Oct 2011 21:19:03 +0400 Subject: vmdk: vmdk_read_cid returns garbage if p_name is NULL Spotted by Clang Analyzer Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- block/vmdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'block') diff --git a/block/vmdk.c b/block/vmdk.c index 3969131..a75dcc2 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -207,7 +207,7 @@ static void vmdk_free_last_extent(BlockDriverState *bs) static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent) { char desc[DESC_SIZE]; - uint32_t cid; + uint32_t cid = 0xffffffff; const char *p_name, *cid_str; size_t cid_str_size; BDRVVmdkState *s = bs->opaque; -- cgit v1.1 From feba23b14340965b9dad9251ec9a7a47313fbf69 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 18 Oct 2011 21:17:35 +0400 Subject: qed: don't pass NULL to memcpy Spotted by Clang Analyzer [Note this memcpy call has always been safe because the length will be 0 when the pointer is NULL] Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- block/qed.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'block') diff --git a/block/qed.c b/block/qed.c index e87dc4d..7fab155 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1425,8 +1425,10 @@ static int bdrv_qed_change_backing_file(BlockDriverState *bs, memcpy(buffer, &le_header, sizeof(le_header)); buffer_len = sizeof(le_header); - memcpy(buffer + buffer_len, backing_file, backing_file_len); - buffer_len += backing_file_len; + if (backing_file) { + memcpy(buffer + buffer_len, backing_file, backing_file_len); + buffer_len += backing_file_len; + } /* Write new header */ ret = bdrv_pwrite_sync(bs->file, 0, buffer, buffer_len); -- cgit v1.1 From 512a2cf8e9c52ac72cace5572eed16f9003cd11c Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 18 Oct 2011 21:17:56 +0400 Subject: qed: remove unneeded variable assignment 'ret' is unconditionally overwitten by qed_read_l1_table_sync() Spotted by Clang Analyzer Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- block/qed.c | 1 - 1 file changed, 1 deletion(-) (limited to 'block') diff --git a/block/qed.c b/block/qed.c index 7fab155..e6720db 100644 --- a/block/qed.c +++ b/block/qed.c @@ -388,7 +388,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) if (ret < 0) { return ret; } - ret = 0; /* ret should always be 0 or -errno */ qed_header_le_to_cpu(&le_header, &s->header); if (s->header.magic != QED_MAGIC) { -- cgit v1.1