From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1729C2D0A8 for ; Mon, 28 Sep 2020 14:32:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26B2A2075A for ; Mon, 28 Sep 2020 14:32:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="iZ6wXW91" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26B2A2075A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kMuD0-0004LX-1V for qemu-devel@archiver.kernel.org; Mon, 28 Sep 2020 10:32:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kMuBD-0003kI-2X for qemu-devel@nongnu.org; Mon, 28 Sep 2020 10:31:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25215) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kMuB9-0004ey-Kg for qemu-devel@nongnu.org; Mon, 28 Sep 2020 10:31:02 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601303458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aqndVzWYNkGOSf3ewiRX/QmEncGzU012mu3fHiPU22o=; b=iZ6wXW91NIUJSDsGBWQJA+L+85j6qN6JJ3P7cOUOEXab3li78NwpA0AQF7ilWpZkJbBPjT vStxYlWMZ1n0wTIGI8G/leWkUKm/Ez6cKjpiTw0EaryAhK0KlANtuVmpGrsK4qdChoYJgp o8C8Sytar5GfR8MOipknXp4qj1X9cCM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-jjOvtEl8MDeII9NVOh2IDA-1; Mon, 28 Sep 2020 10:30:56 -0400 X-MC-Unique: jjOvtEl8MDeII9NVOh2IDA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4636D56FDC; Mon, 28 Sep 2020 14:30:55 +0000 (UTC) Received: from linux.fritz.box (ovpn-114-193.ams2.redhat.com [10.36.114.193]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D17285C1BB; Mon, 28 Sep 2020 14:30:53 +0000 (UTC) Date: Mon, 28 Sep 2020 16:30:52 +0200 From: Kevin Wolf To: Markus Armbruster Subject: Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch() Message-ID: <20200928143052.GH5451@linux.fritz.box> References: <20200909151149.490589-1-kwolf@redhat.com> <20200909151149.490589-7-kwolf@redhat.com> <877dswo0mf.fsf@dusky.pond.sub.org> <20200925151304.GE5731@linux.fritz.box> <87ft72i0v8.fsf@dusky.pond.sub.org> MIME-Version: 1.0 In-Reply-To: <87ft72i0v8.fsf@dusky.pond.sub.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/28 03:47:08 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.687, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, marcandre.lureau@gmail.com, qemu-devel@nongnu.org, stefanha@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 28.09.2020 um 13:42 hat Markus Armbruster geschrieben: > Kevin Wolf writes: > > > Am 14.09.2020 um 17:10 hat Markus Armbruster geschrieben: > >> Kevin Wolf writes: > >> > >> > The correct way to set the current monitor for a coroutine handler will > >> > be different than for a blocking handler, so monitor_set_cur() needs to > >> > be called in qmp_dispatch(). > >> > > >> > Signed-off-by: Kevin Wolf > >> > --- > >> > include/qapi/qmp/dispatch.h | 3 ++- > >> > monitor/qmp.c | 8 +------- > >> > qapi/qmp-dispatch.c | 8 +++++++- > >> > qga/main.c | 2 +- > >> > stubs/monitor-core.c | 5 +++++ > >> > tests/test-qmp-cmds.c | 6 +++--- > >> > 6 files changed, 19 insertions(+), 13 deletions(-) > >> > > >> > diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h > >> > index 5a9cf82472..0c2f467028 100644 > >> > --- a/include/qapi/qmp/dispatch.h > >> > +++ b/include/qapi/qmp/dispatch.h > >> > @@ -14,6 +14,7 @@ > >> > #ifndef QAPI_QMP_DISPATCH_H > >> > #define QAPI_QMP_DISPATCH_H > >> > > >> > +#include "monitor/monitor.h" > >> > #include "qemu/queue.h" > >> > > >> > typedef void (QmpCommandFunc)(QDict *, QObject **, Error **); > >> > @@ -49,7 +50,7 @@ const char *qmp_command_name(const QmpCommand *cmd); > >> > bool qmp_has_success_response(const QmpCommand *cmd); > >> > QDict *qmp_error_response(Error *err); > >> > QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request, > >> > - bool allow_oob); > >> > + bool allow_oob, Monitor *cur_mon); > >> > bool qmp_is_oob(const QDict *dict); > >> > > >> > typedef void (*qmp_cmd_callback_fn)(const QmpCommand *cmd, void *opaque); > >> > diff --git a/monitor/qmp.c b/monitor/qmp.c > >> > index 8469970c69..922fdb5541 100644 > >> > --- a/monitor/qmp.c > >> > +++ b/monitor/qmp.c > >> > @@ -135,16 +135,10 @@ static void monitor_qmp_respond(MonitorQMP *mon, QDict *rsp) > >> > > >> > static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req) > >> > { > >> > - Monitor *old_mon; > >> > QDict *rsp; > >> > QDict *error; > >> > > >> > - old_mon = monitor_set_cur(&mon->common); > >> > - assert(old_mon == NULL); > >> > - > >> > - rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon)); > >> > - > >> > - monitor_set_cur(NULL); > >> > + rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon), &mon->common); > >> > >> Long line. Happy to wrap it in my tree. A few more in PATCH 08-11. > > > > It's 79 characters. Should be fine even with your local deviation from > > the coding style to require less than that for comments? > > Let me rephrase my remark. > > For me, > > rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon), > &mon->common); > > is significantly easier to read than > > rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon), &mon->common); I guess this is highly subjective. I find wrapped lines harder to read. For answering subjective questions like this, we generally use the coding style document. Anyway, I guess following an idiosyncratic coding style that is different from every other subsystem in QEMU is possible (if inconvenient) if I know what it is. My problem is more that I don't know what the exact rules are. Can they only be figured out experimentally by submitting patches and seeing whether you like them or not? > Would you mind me wrapping this line in my tree? I have no say in this subsystem and I take it that you want all code to look as if you had written it yourself, so do as you wish. But I understand that I'll have to respin anyway, so if you could explain what you're after, I might be able to apply the rules for the next version of the series. Kevin