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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 996E7C63798 for ; Fri, 27 Nov 2020 13:12:46 +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 E3DCC21D7A for ; Fri, 27 Nov 2020 13:12:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="X+nr70JR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3DCC21D7A 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]:43146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kidYK-0003Ys-L0 for qemu-devel@archiver.kernel.org; Fri, 27 Nov 2020 08:12:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kidWn-0002gO-KR for qemu-devel@nongnu.org; Fri, 27 Nov 2020 08:11:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30143) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kidWl-0002l6-Uv for qemu-devel@nongnu.org; Fri, 27 Nov 2020 08:11:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606482667; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=58SQBh87JGioP8qos070j/zGfjLozDlXq00sbkz0bTo=; b=X+nr70JRPTNQkUb/oo12JOg98Zsn+9UIbzJyd1kyH7aU1RpWJ1iME5Wj58nOrY5qN0O1Be 5pDKg8qxS/GXZoOGMqLJ/P65AqCOGz8IG+R4hBvtoeczQNGnuissiVhZr2ihuXSekaGUk+ Y7V+cCPVMf78qdtkB2lh3Dg4jGGE7Jc= 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-280-v505NvG6N-ebjJs0WSZpUA-1; Fri, 27 Nov 2020 08:11:05 -0500 X-MC-Unique: v505NvG6N-ebjJs0WSZpUA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95C1C1007466 for ; Fri, 27 Nov 2020 13:11:04 +0000 (UTC) Received: from localhost (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD73E10023BA; Fri, 27 Nov 2020 13:11:03 +0000 (UTC) Date: Fri, 27 Nov 2020 14:11:02 +0100 From: Igor Mammedov To: Paolo Bonzini Subject: Re: [PATCH 34/36] vl: remove serial_max_hds Message-ID: <20201127141102.447abade@redhat.com> In-Reply-To: <20201123141435.2726558-35-pbonzini@redhat.com> References: <20201123141435.2726558-1-pbonzini@redhat.com> <20201123141435.2726558-35-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=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-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 23 Nov 2020 09:14:33 -0500 Paolo Bonzini wrote: > serial_hd(i) is NULL if and only if i >= serial_max_hds(). Test > serial_hd(i) instead of bounding the loop at serial_max_hds(), > thus removing one more function that vl.c is expected to export. > > Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov > --- > hw/ppc/spapr.c | 6 ++---- > include/sysemu/sysemu.h | 4 ---- > softmmu/vl.c | 5 ----- > 3 files changed, 2 insertions(+), 13 deletions(-) > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 049efa0bbf..b7e0894019 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2878,10 +2878,8 @@ static void spapr_machine_init(MachineState *machine) > /* Set up VIO bus */ > spapr->vio_bus = spapr_vio_bus_init(); > > - for (i = 0; i < serial_max_hds(); i++) { > - if (serial_hd(i)) { > - spapr_vty_create(spapr->vio_bus, serial_hd(i)); > - } > + for (i = 0; serial_hd(i); i++) { > + spapr_vty_create(spapr->vio_bus, serial_hd(i)); > } > > /* We always have at least the nvram device on VIO */ > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index 3dac3229ec..0e7b405d22 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -74,10 +74,6 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict); > > /* Return the Chardev for serial port i, or NULL if none */ > Chardev *serial_hd(int i); > -/* return the number of serial ports defined by the user. serial_hd(i) > - * will always return NULL for any i which is greater than or equal to this. > - */ > -int serial_max_hds(void); > > /* parallel ports */ > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index fce15c249a..d76f87028d 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -1439,11 +1439,6 @@ Chardev *serial_hd(int i) > return NULL; > } > > -int serial_max_hds(void) > -{ > - return num_serial_hds; > -} > - > static int parallel_parse(const char *devname) > { > static int index = 0;