From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVe8f-0000xO-8u for qemu-devel@nongnu.org; Fri, 05 Aug 2016 08:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVe8a-0003O6-6i for qemu-devel@nongnu.org; Fri, 05 Aug 2016 08:22:08 -0400 Received: from mx3-phx2.redhat.com ([209.132.183.24]:52262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVe8Z-0003NM-UX for qemu-devel@nongnu.org; Fri, 05 Aug 2016 08:22:04 -0400 Date: Fri, 5 Aug 2016 08:22:02 -0400 (EDT) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <657311512.1340576.1470399722491.JavaMail.zimbra@redhat.com> In-Reply-To: <87vazfwgtt.fsf@dusky.pond.sub.org> References: <20160721140030.28383-1-marcandre.lureau@redhat.com> <20160721140030.28383-5-marcandre.lureau@redhat.com> <87vazfwgtt.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 04/12] monitor: remove usage of generated marshal functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: marcandre lureau , qemu-devel@nongnu.org Hi ----- Original Message ----- > marcandre.lureau@redhat.com writes: >=20 > > From: Marc-Andr=C3=A9 Lureau > > > > Once the middle mode is removed, the generated marshal functions will n= o > > longer be exported. > > > > Signed-off-by: Marc-Andr=C3=A9 Lureau > > Reviewed-by: Eric Blake > > --- > > monitor.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/monitor.c b/monitor.c > > index c9191e5..3a28b43 100644 > > --- a/monitor.c > > +++ b/monitor.c > > @@ -3659,21 +3659,21 @@ static int monitor_can_read(void *opaque) > > return (mon->suspend_cnt =3D=3D 0) ? 1 : 0; > > } > > =20 > > -static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd, > > +static bool invalid_qmp_mode(const Monitor *mon, const char *cmd, > > Error **errp) > > { > > - bool is_cap =3D cmd->mhandler.cmd_new =3D=3D qmp_marshal_qmp_capab= ilities; > > + bool is_cap =3D !g_strcmp0(cmd, "qmp_capabilities"); >=20 > What's wrong with strcmp()? >=20 g_strcmp0() is a slightly safer version, it's just an habit, I guess it doe= sn't matter here, would you like to change it? > > =20 > > if (is_cap && mon->qmp.in_command_mode) { > > error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, > > "Capabilities negotiation is already complete, comma= nd " > > - "'%s' ignored", cmd->name); > > + "'%s' ignored", cmd); > > return true; > > } > > if (!is_cap && !mon->qmp.in_command_mode) { > > error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND, > > "Expecting capabilities negotiation with " > > - "'qmp_capabilities' before command '%s'", cmd->name)= ; > > + "'qmp_capabilities' before command '%s'", cmd); > > return true; > > } > > return false; > > @@ -3964,7 +3964,7 @@ static void handle_qmp_command(JSONMessageParser > > *parser, GQueue *tokens) > > "The command %s has not been found", cmd_name); > > goto err_out; > > } > > - if (invalid_qmp_mode(mon, cmd, &local_err)) { > > + if (invalid_qmp_mode(mon, cmd_name, &local_err)) { > > goto err_out; > > } >=20