| Message ID | 1394876123-8902-1-git-send-email-aakritty@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sat, Mar 15, 2014 at 03:05:23PM +0530, Aakriti Gupta wrote: > This patch converts fprintf() calls to error_setg() in block/qed.c:bdrv_qed_create() > (error_setg() is part of error reporting API in include/qapi/error.h) > > Signed-off-by: Aakriti Gupta <aakritty@gmail.com> > --- > block/qed.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Acked-by: Stefan Hajnoczi <stefanha@redhat.com> > if (!qed_is_cluster_size_valid(cluster_size)) { > - fprintf(stderr, "QED cluster size must be within range [%u, %u] and power of 2\n", > + error_setg(errp, "QED cluster size must be within range [%u, %u] and power of 2", > QED_MIN_CLUSTER_SIZE, QED_MAX_CLUSTER_SIZE); Kevin: Do you want to fix up the indentation of the next line when merging?
Am 17.03.2014 um 15:59 hat Stefan Hajnoczi geschrieben: > On Sat, Mar 15, 2014 at 03:05:23PM +0530, Aakriti Gupta wrote: > > This patch converts fprintf() calls to error_setg() in block/qed.c:bdrv_qed_create() > > (error_setg() is part of error reporting API in include/qapi/error.h) > > > > Signed-off-by: Aakriti Gupta <aakritty@gmail.com> > > --- > > block/qed.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Thanks, applied to the block-next branch for qemu 2.1. > > if (!qed_is_cluster_size_valid(cluster_size)) { > > - fprintf(stderr, "QED cluster size must be within range [%u, %u] and power of 2\n", > > + error_setg(errp, "QED cluster size must be within range [%u, %u] and power of 2", > > QED_MIN_CLUSTER_SIZE, QED_MAX_CLUSTER_SIZE); > > Kevin: Do you want to fix up the indentation of the next line when > merging? Sure, I did that, and wrapped the line at 80 characters, too. Kevin
diff --git a/block/qed.c b/block/qed.c index 837accd..01fa91b 100644 --- a/block/qed.c +++ b/block/qed.c @@ -650,18 +650,18 @@ static int bdrv_qed_create(const char *filename, QEMUOptionParameter *options, } if (!qed_is_cluster_size_valid(cluster_size)) { - fprintf(stderr, "QED cluster size must be within range [%u, %u] and power of 2\n", + error_setg(errp, "QED cluster size must be within range [%u, %u] and power of 2", QED_MIN_CLUSTER_SIZE, QED_MAX_CLUSTER_SIZE); return -EINVAL; } if (!qed_is_table_size_valid(table_size)) { - fprintf(stderr, "QED table size must be within range [%u, %u] and power of 2\n", + error_setg(errp, "QED table size must be within range [%u, %u] and power of 2", QED_MIN_TABLE_SIZE, QED_MAX_TABLE_SIZE); return -EINVAL; } if (!qed_is_image_size_valid(image_size, cluster_size, table_size)) { - fprintf(stderr, "QED image size must be a non-zero multiple of " - "cluster size and less than %" PRIu64 " bytes\n", + error_setg(errp, "QED image size must be a non-zero multiple of " + "cluster size and less than %" PRIu64 " bytes", qed_max_image_size(cluster_size, table_size)); return -EINVAL; }
This patch converts fprintf() calls to error_setg() in block/qed.c:bdrv_qed_create() (error_setg() is part of error reporting API in include/qapi/error.h) Signed-off-by: Aakriti Gupta <aakritty@gmail.com> --- block/qed.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)