| Message ID | 1358147387-8221-5-git-send-email-xiawenc@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Mon, 2013-01-14 at 15:09 +0800, Wenchao Xia wrote: > Now qemu-img call block layer function to get image info. > > Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > --- > qemu-img.c | 86 +---------------------------------------------------------- > 1 files changed, 2 insertions(+), 84 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index 9dab48f..e20551a 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -1338,6 +1257,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, > ImageInfoList *head = NULL; > ImageInfoList **last = &head; > GHashTable *filenames; > + Error *err = NULL; > > filenames = g_hash_table_new_full(g_str_hash, str_equal_func, NULL, NULL); > > @@ -1359,9 +1279,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, > goto err; > } > > - info = g_new0(ImageInfo, 1); > - collect_image_info(bs, info, filename); > - collect_snapshots(bs, info); > + info = bdrv_query_image_info(bs, &err); You are not using the 'err' variable so you should pass 'NULL' instead. info = bdrv_query_image_info(bs, NULL); > > elem = g_new0(ImageInfoList, 1); > elem->value = info;
On Mon, 14 Jan 2013 12:25:08 +0100 Pavel Hrdina <phrdina@redhat.com> wrote: > On Mon, 2013-01-14 at 15:09 +0800, Wenchao Xia wrote: > > Now qemu-img call block layer function to get image info. > > > > Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> > > Reviewed-by: Eric Blake <eblake@redhat.com> > > --- > > qemu-img.c | 86 +---------------------------------------------------------- > > 1 files changed, 2 insertions(+), 84 deletions(-) > > > > diff --git a/qemu-img.c b/qemu-img.c > > index 9dab48f..e20551a 100644 > > --- a/qemu-img.c > > +++ b/qemu-img.c > > @@ -1338,6 +1257,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, > > ImageInfoList *head = NULL; > > ImageInfoList **last = &head; > > GHashTable *filenames; > > + Error *err = NULL; > > > > filenames = g_hash_table_new_full(g_str_hash, str_equal_func, NULL, NULL); > > > > @@ -1359,9 +1279,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, > > goto err; > > } > > > > - info = g_new0(ImageInfo, 1); > > - collect_image_info(bs, info, filename); > > - collect_snapshots(bs, info); > > + info = bdrv_query_image_info(bs, &err); > > You are not using the 'err' variable so you should pass 'NULL' instead. Actually, it's necessary to check for the error. > > info = bdrv_query_image_info(bs, NULL); > > > > > elem = g_new0(ImageInfoList, 1); > > elem->value = info; > >
δΊ 2013-1-14 19:25, Pavel Hrdina ει: > On Mon, 2013-01-14 at 15:09 +0800, Wenchao Xia wrote: >> Now qemu-img call block layer function to get image info. >> >> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> >> Reviewed-by: Eric Blake <eblake@redhat.com> >> --- >> qemu-img.c | 86 +---------------------------------------------------------- >> 1 files changed, 2 insertions(+), 84 deletions(-) >> >> diff --git a/qemu-img.c b/qemu-img.c >> index 9dab48f..e20551a 100644 >> --- a/qemu-img.c >> +++ b/qemu-img.c >> @@ -1338,6 +1257,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, >> ImageInfoList *head = NULL; >> ImageInfoList **last = &head; >> GHashTable *filenames; >> + Error *err = NULL; >> >> filenames = g_hash_table_new_full(g_str_hash, str_equal_func, NULL, NULL); >> >> @@ -1359,9 +1279,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, >> goto err; >> } >> >> - info = g_new0(ImageInfo, 1); >> - collect_image_info(bs, info, filename); >> - collect_snapshots(bs, info); >> + info = bdrv_query_image_info(bs, &err); > > You are not using the 'err' variable so you should pass 'NULL' instead. > > info = bdrv_query_image_info(bs, NULL); > OK. >> >> elem = g_new0(ImageInfoList, 1); >> elem->value = info; > >
diff --git a/qemu-img.c b/qemu-img.c index 9dab48f..e20551a 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1134,39 +1134,6 @@ static void dump_json_image_info_list(ImageInfoList *list) QDECREF(str); } -static void collect_snapshots(BlockDriverState *bs , ImageInfo *info) -{ - int i, sn_count; - QEMUSnapshotInfo *sn_tab = NULL; - SnapshotInfoList *info_list, *cur_item = NULL; - sn_count = bdrv_snapshot_list(bs, &sn_tab); - - for (i = 0; i < sn_count; i++) { - info->has_snapshots = true; - info_list = g_new0(SnapshotInfoList, 1); - - info_list->value = g_new0(SnapshotInfo, 1); - info_list->value->id = g_strdup(sn_tab[i].id_str); - info_list->value->name = g_strdup(sn_tab[i].name); - info_list->value->vm_state_size = sn_tab[i].vm_state_size; - info_list->value->date_sec = sn_tab[i].date_sec; - info_list->value->date_nsec = sn_tab[i].date_nsec; - info_list->value->vm_clock_sec = sn_tab[i].vm_clock_nsec / 1000000000; - info_list->value->vm_clock_nsec = sn_tab[i].vm_clock_nsec % 1000000000; - - /* XXX: waiting for the qapi to support qemu-queue.h types */ - if (!cur_item) { - info->snapshots = cur_item = info_list; - } else { - cur_item->next = info_list; - cur_item = info_list; - } - - } - - g_free(sn_tab); -} - static void dump_json_image_info(ImageInfo *info) { Error *errp = NULL; @@ -1184,54 +1151,6 @@ static void dump_json_image_info(ImageInfo *info) QDECREF(str); } -static void collect_image_info(BlockDriverState *bs, - ImageInfo *info, - const char *filename) -{ - uint64_t total_sectors; - char backing_filename[1024]; - char backing_filename2[1024]; - BlockDriverInfo bdi; - - bdrv_get_geometry(bs, &total_sectors); - - info->filename = g_strdup(filename); - info->format = g_strdup(bdrv_get_format_name(bs)); - info->virtual_size = total_sectors * 512; - info->actual_size = bdrv_get_allocated_file_size(bs); - info->has_actual_size = info->actual_size >= 0; - if (bdrv_is_encrypted(bs)) { - info->encrypted = true; - info->has_encrypted = true; - } - if (bdrv_get_info(bs, &bdi) >= 0) { - if (bdi.cluster_size != 0) { - info->cluster_size = bdi.cluster_size; - info->has_cluster_size = true; - } - info->dirty_flag = bdi.is_dirty; - info->has_dirty_flag = true; - } - bdrv_get_backing_filename(bs, backing_filename, sizeof(backing_filename)); - if (backing_filename[0] != '\0') { - info->backing_filename = g_strdup(backing_filename); - info->has_backing_filename = true; - bdrv_get_full_backing_filename(bs, backing_filename2, - sizeof(backing_filename2)); - - if (strcmp(backing_filename, backing_filename2) != 0) { - info->full_backing_filename = - g_strdup(backing_filename2); - info->has_full_backing_filename = true; - } - - if (bs->backing_format[0]) { - info->backing_filename_format = g_strdup(bs->backing_format); - info->has_backing_filename_format = true; - } - } -} - static void dump_human_image_info(ImageInfo *info) { char size_buf[128], dsize_buf[128]; @@ -1338,6 +1257,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, ImageInfoList *head = NULL; ImageInfoList **last = &head; GHashTable *filenames; + Error *err = NULL; filenames = g_hash_table_new_full(g_str_hash, str_equal_func, NULL, NULL); @@ -1359,9 +1279,7 @@ static ImageInfoList *collect_image_info_list(const char *filename, goto err; } - info = g_new0(ImageInfo, 1); - collect_image_info(bs, info, filename); - collect_snapshots(bs, info); + info = bdrv_query_image_info(bs, &err); elem = g_new0(ImageInfoList, 1); elem->value = info;