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=-7.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 AC519C433E0 for ; Wed, 5 Aug 2020 07:21:03 +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 72CF1206B6 for ; Wed, 5 Aug 2020 07:21:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I4y5jG4c" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72CF1206B6 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]:42688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3DjS-00075b-Kn for qemu-devel@archiver.kernel.org; Wed, 05 Aug 2020 03:21:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3DiY-0006US-KM for qemu-devel@nongnu.org; Wed, 05 Aug 2020 03:20:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50796 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3DiW-00071u-3z for qemu-devel@nongnu.org; Wed, 05 Aug 2020 03:20:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596612002; 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=e7on/hsA/QEt7BciFE/Rx3LG2ytr/hto7O9pDI9+uH0=; b=I4y5jG4cBBi4+N8SJtxklTPWUHQUj84spPJNAnufpkzRUOA/E8dtOlR/BWsCQvbpRkOnyo QzsSf4DM8C9iNbJk+NJEX19NLyzmyIOlDnA0Tgfetk2JtZcVsMJXDZXnaL4h2aokodD+pD tvk+Wj6YFgk74MTLaXcWHOqVdsBs6Ic= 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-440-7xAFdMWkOiCz8zN0oyNgLw-1; Wed, 05 Aug 2020 03:20:00 -0400 X-MC-Unique: 7xAFdMWkOiCz8zN0oyNgLw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 990F779EC0; Wed, 5 Aug 2020 07:19:59 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3995660BF3; Wed, 5 Aug 2020 07:19:59 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C0B951141D60; Wed, 5 Aug 2020 09:19:57 +0200 (CEST) From: Markus Armbruster To: Kevin Wolf Subject: Re: [PATCH v6 02/12] monitor: Use getter/setter functions for cur_mon References: <20200528153742.274164-1-kwolf@redhat.com> <20200528153742.274164-3-kwolf@redhat.com> <87lfiubmu3.fsf@dusky.pond.sub.org> <20200804161634.GC4860@linux.fritz.box> Date: Wed, 05 Aug 2020 09:19:57 +0200 In-Reply-To: <20200804161634.GC4860@linux.fritz.box> (Kevin Wolf's message of "Tue, 4 Aug 2020 18:16:34 +0200") Message-ID: <87wo2d5zky.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/05 00:45:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: marcandre.lureau@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Kevin Wolf writes: > Am 04.08.2020 um 14:46 hat Markus Armbruster geschrieben: >> > diff --git a/monitor/hmp.c b/monitor/hmp.c >> > index d598dd02bb..f609fcf75b 100644 >> > --- a/monitor/hmp.c >> > +++ b/monitor/hmp.c >> > @@ -1301,11 +1301,11 @@ cleanup: >> > static void monitor_read(void *opaque, const uint8_t *buf, int size) >> > { >> > MonitorHMP *mon; >> > - Monitor *old_mon = cur_mon; >> > + Monitor *old_mon = monitor_cur(); >> > int i; >> > >> > - cur_mon = opaque; >> > - mon = container_of(cur_mon, MonitorHMP, common); >> > + monitor_set_cur(opaque); >> > + mon = container_of(monitor_cur(), MonitorHMP, common); >> >> Simpler: >> >> MonitorHMP *mon = container_of(opaque, MonitorHMP, common); > > opaque is void*, so it doesn't have a field 'common'. I actually compile-tested before I sent this. For once ;) Here's container_of(): #define container_of(ptr, type, member) ({ \ const typeof(((type *) 0)->member) *__mptr = (ptr); \ (type *) ((char *) __mptr - offsetof(type, member));}) Its first argument's only use is as an initializer for a pointer variable. Both type * and void * work fine there. >> > diff --git a/monitor/monitor.c b/monitor/monitor.c >> > index 125494410a..182ba136b4 100644 >> > --- a/monitor/monitor.c >> > +++ b/monitor/monitor.c >> > @@ -66,13 +66,24 @@ MonitorList mon_list; >> > int mon_refcount; >> > static bool monitor_destroyed; >> > >> > -__thread Monitor *cur_mon; >> > +static __thread Monitor *cur_monitor; >> > + >> > +Monitor *monitor_cur(void) >> > +{ >> > + return cur_monitor; >> > +} >> > + >> > +void monitor_set_cur(Monitor *mon) >> > +{ >> > + cur_monitor = mon; >> > +} >> >> All uses of monitor_set_cur() look like this: >> >> old_mon = monitor_cur(); >> monitor_set_cur(new_mon); >> ... >> monitor_set_cur(old_mon); >> >> If we let monitor_set_cur() return the old value, this becomes >> >> old_mon = monitor_set_cur(new_mon); >> ... >> monitor_set_cur(old_mon); >> >> I like this better. > > Fine with me. > >> > diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c >> > index 6cff1c4e1d..0cd2d864b2 100644 >> > --- a/stubs/monitor-core.c >> > +++ b/stubs/monitor-core.c >> > @@ -3,7 +3,10 @@ >> > #include "qemu-common.h" >> > #include "qapi/qapi-emit-events.h" >> > >> > -__thread Monitor *cur_mon; >> > +Monitor *monitor_cur(void) >> > +{ >> > + return NULL; >> > +} >> >> Is this meant to be called? If not, abort(). > > error_report() and friends are supposed to be called pretty much > everywhere, so I'd say yes. Okay.