From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWoUe-0000lv-8o for qemu-devel@nongnu.org; Wed, 24 Sep 2014 11:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWoUZ-0006qp-71 for qemu-devel@nongnu.org; Wed, 24 Sep 2014 11:28:36 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:56215 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWoUY-0006oi-T1 for qemu-devel@nongnu.org; Wed, 24 Sep 2014 11:28:31 -0400 Date: Wed, 24 Sep 2014 17:26:15 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140924152614.GA18261@irqsave.net> References: <1411569989-5517-1-git-send-email-kwolf@redhat.com> <1411569989-5517-2-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1411569989-5517-2-git-send-email-kwolf@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/2] block: Specify -drive legacy option aliases in array List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, stefanha@redhat.com, armbru@redhat.com The Wednesday 24 Sep 2014 =E0 16:46:28 (+0200), Kevin Wolf wrote : > Instead of a series of qemu_opt_rename() calls, use an array that > contains all of the renames and call qemu_opt_rename() in a loop. This > will keep the code readable even when we add an error return to > qemu_opt_rename(). >=20 > Signed-off-by: Kevin Wolf > --- > blockdev.c | 39 ++++++++++++++++++++++++--------------- > 1 file changed, 24 insertions(+), 15 deletions(-) >=20 > diff --git a/blockdev.c b/blockdev.c > index a194d04..6a33fd2 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -641,28 +641,37 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInt= erfaceType block_default_type) > const char *serial; > const char *filename; > Error *local_err =3D NULL; > + int i; > =20 > /* Change legacy command line options into QMP ones */ > - qemu_opt_rename(all_opts, "iops", "throttling.iops-total"); > - qemu_opt_rename(all_opts, "iops_rd", "throttling.iops-read"); > - qemu_opt_rename(all_opts, "iops_wr", "throttling.iops-write"); > + static const struct { > + const char *from; > + const char *to; > + } opt_renames[] =3D { > + { "iops", "throttling.iops-total" }, > + { "iops_rd", "throttling.iops-read" }, > + { "iops_wr", "throttling.iops-write" }, > =20 > - qemu_opt_rename(all_opts, "bps", "throttling.bps-total"); > - qemu_opt_rename(all_opts, "bps_rd", "throttling.bps-read"); > - qemu_opt_rename(all_opts, "bps_wr", "throttling.bps-write"); > + { "bps", "throttling.bps-total" }, > + { "bps_rd", "throttling.bps-read" }, > + { "bps_wr", "throttling.bps-write" }, > =20 > - qemu_opt_rename(all_opts, "iops_max", "throttling.iops-total-max")= ; > - qemu_opt_rename(all_opts, "iops_rd_max", "throttling.iops-read-max= "); > - qemu_opt_rename(all_opts, "iops_wr_max", "throttling.iops-write-ma= x"); > + { "iops_max", "throttling.iops-total-max" }, > + { "iops_rd_max", "throttling.iops-read-max" }, > + { "iops_wr_max", "throttling.iops-write-max" }, > =20 > - qemu_opt_rename(all_opts, "bps_max", "throttling.bps-total-max"); > - qemu_opt_rename(all_opts, "bps_rd_max", "throttling.bps-read-max")= ; > - qemu_opt_rename(all_opts, "bps_wr_max", "throttling.bps-write-max"= ); > + { "bps_max", "throttling.bps-total-max" }, > + { "bps_rd_max", "throttling.bps-read-max" }, > + { "bps_wr_max", "throttling.bps-write-max" }, > =20 > - qemu_opt_rename(all_opts, > - "iops_size", "throttling.iops-size"); > + { "iops_size", "throttling.iops-size" }, > =20 > - qemu_opt_rename(all_opts, "readonly", "read-only"); > + { "readonly", "read-only" }, > + }; > + > + for (i =3D 0; i < ARRAY_SIZE(opt_renames); i++) { > + qemu_opt_rename(all_opts, opt_renames[i].from, opt_renames[i].= to); > + } > =20 > value =3D qemu_opt_get(all_opts, "cache"); > if (value) { > --=20 > 1.8.3.1 >=20 >=20 Reviewed-by: Beno=EEt Canet