From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2GnP-0006Vh-Sk for qemu-devel@nongnu.org; Fri, 08 Mar 2019 09:48:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2GnM-0005iJ-MH for qemu-devel@nongnu.org; Fri, 08 Mar 2019 09:48:23 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2GnM-0005UG-2c for qemu-devel@nongnu.org; Fri, 08 Mar 2019 09:48:20 -0500 Received: by mail-wr1-f67.google.com with SMTP id r5so21639976wrg.9 for ; Fri, 08 Mar 2019 06:48:19 -0800 (PST) References: <20190308131445.17502-1-armbru@redhat.com> <20190308131445.17502-6-armbru@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <0c4cc2b1-db87-b617-338f-54c12c581e6c@redhat.com> Date: Fri, 8 Mar 2019 15:48:15 +0100 MIME-Version: 1.0 In-Reply-To: <20190308131445.17502-6-armbru@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v3 05/12] vl: Improve legibility of BlockdevOptions queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: pbonzini@redhat.com, lersek@redhat.com, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, pkrempa@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, marcandre.lureau@redhat.com On 3/8/19 2:14 PM, Markus Armbruster wrote: > Give the queue head type a name: BlockdevOptionsQueue. > > Rename the queue entry type from BlockdevOptions_queue to > BlockdevOptionsQueueEntry. > > Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daudé > --- > vl.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/vl.c b/vl.c > index c38739e34c..3045ab0df3 100644 > --- a/vl.c > +++ b/vl.c > @@ -1193,6 +1193,14 @@ static void default_drive(int enable, int snapshot, BlockInterfaceType type, > > } > > +typedef struct BlockdevOptionsQueueEntry { > + BlockdevOptions *bdo; > + Location loc; > + QSIMPLEQ_ENTRY(BlockdevOptionsQueueEntry) entry; > +} BlockdevOptionsQueueEntry; > + > +typedef QSIMPLEQ_HEAD(, BlockdevOptionsQueueEntry) BlockdevOptionsQueue; > + > static QemuOptsList qemu_smp_opts = { > .name = "smp-opts", > .implied_opt_name = "cpus", > @@ -2973,13 +2981,7 @@ int main(int argc, char **argv, char **envp) > Error *err = NULL; > bool list_data_dirs = false; > char *dir, **dirs; > - typedef struct BlockdevOptions_queue { > - BlockdevOptions *bdo; > - Location loc; > - QSIMPLEQ_ENTRY(BlockdevOptions_queue) entry; > - } BlockdevOptions_queue; > - QSIMPLEQ_HEAD(, BlockdevOptions_queue) bdo_queue > - = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue); > + BlockdevOptionsQueue bdo_queue = QSIMPLEQ_HEAD_INITIALIZER(bdo_queue); > > module_call_init(MODULE_INIT_TRACE); > > @@ -3103,12 +3105,12 @@ int main(int argc, char **argv, char **envp) > case QEMU_OPTION_blockdev: > { > Visitor *v; > - BlockdevOptions_queue *bdo; > + BlockdevOptionsQueueEntry *bdo; > > v = qobject_input_visitor_new_str(optarg, "driver", > &error_fatal); > > - bdo = g_new(BlockdevOptions_queue, 1); > + bdo = g_new(BlockdevOptionsQueueEntry, 1); > visit_type_BlockdevOptions(v, NULL, &bdo->bdo, > &error_fatal); > visit_free(v); > @@ -4368,7 +4370,7 @@ int main(int argc, char **argv, char **envp) > > /* open the virtual block devices */ > while (!QSIMPLEQ_EMPTY(&bdo_queue)) { > - BlockdevOptions_queue *bdo = QSIMPLEQ_FIRST(&bdo_queue); > + BlockdevOptionsQueueEntry *bdo = QSIMPLEQ_FIRST(&bdo_queue); > > QSIMPLEQ_REMOVE_HEAD(&bdo_queue, entry); > loc_push_restore(&bdo->loc); >