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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 8B5A2C33CB2 for ; Wed, 29 Jan 2020 08:08:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F7D2207FD for ; Wed, 29 Jan 2020 08:08:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IM5cepCX" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726262AbgA2IIP (ORCPT ); Wed, 29 Jan 2020 03:08:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46750 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726128AbgA2IIP (ORCPT ); Wed, 29 Jan 2020 03:08:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580285293; 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:openpgp:openpgp; bh=6B1BQTixM1hGZ6QDPNmwN5NO9M03YJBxtfjfLjgPORU=; b=IM5cepCXXlBpC+bjopM1+tF0UFR16ucNZDYW5rR8v0PMxdislUJ/TdzmsLjn7Etjs7daYL K5vv3vPLzEYyTsmfOiRsfnT69vIsEEF6sNVGsrfIJkaimQpp8eXpgUTegtlKedgGiOdrsc Fn86xMTSRyzlCcet/6LGvGi9bvCnV1w= 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-276-ulYYoQhVNkGxvnZqYnfM7w-1; Wed, 29 Jan 2020 03:08:04 -0500 X-MC-Unique: ulYYoQhVNkGxvnZqYnfM7w-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 09ACD18A6EC1; Wed, 29 Jan 2020 08:08:02 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EB6460C05; Wed, 29 Jan 2020 08:07:55 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v3 12/14] arm/run: Allow Migration tests To: Eric Auger , eric.auger.pro@gmail.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: drjones@redhat.com, andre.przywara@arm.com, peter.maydell@linaro.org, yuzenghui@huawei.com, alexandru.elisei@arm.com References: <20200128103459.19413-1-eric.auger@redhat.com> <20200128103459.19413-13-eric.auger@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: <3962373a-0e03-5ab9-30cc-3b385fc55702@redhat.com> Date: Wed, 29 Jan 2020 09:07:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200128103459.19413-13-eric.auger@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 28/01/2020 11.34, Eric Auger wrote: > Let's link getchar.o to use puts and getchar from the > tests. >=20 > Then allow tests belonging to the migration group to > trigger the migration from the test code by putting > "migrate" into the uart. Then the code can wait for the > migration completion by using getchar(). >=20 > The __getchar implement is minimalist as it just reads the > data register. It is just meant to read the single character > emitted at the end of the migration by the runner script. >=20 > It is not meant to read more data (FIFOs are not enabled). >=20 > Signed-off-by: Eric Auger >=20 > --- >=20 > v2 -> v3: > - take the lock > - assert if more than 16 chars > - removed Thomas' R-b > --- > arm/Makefile.common | 2 +- > arm/run | 2 +- > lib/arm/io.c | 28 ++++++++++++++++++++++++++++ > 3 files changed, 30 insertions(+), 2 deletions(-) >=20 > diff --git a/arm/Makefile.common b/arm/Makefile.common > index b8988f2..a123e85 100644 > --- a/arm/Makefile.common > +++ b/arm/Makefile.common > @@ -32,7 +32,7 @@ CFLAGS +=3D -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt = -I lib > asm-offsets =3D lib/$(ARCH)/asm-offsets.h > include $(SRCDIR)/scripts/asm-offsets.mak > =20 > -cflatobjs +=3D lib/util.o > +cflatobjs +=3D lib/util.o lib/getchar.o > cflatobjs +=3D lib/alloc_phys.o > cflatobjs +=3D lib/alloc_page.o > cflatobjs +=3D lib/vmalloc.o > diff --git a/arm/run b/arm/run > index 277db9b..a390ca5 100755 > --- a/arm/run > +++ b/arm/run > @@ -61,6 +61,6 @@ fi > M+=3D",accel=3D$ACCEL" > command=3D"$qemu -nodefaults $M -cpu $processor $chr_testdev $pci_test= dev" > command+=3D" -display none -serial stdio -kernel" > -command=3D"$(timeout_cmd) $command" > +command=3D"$(migration_cmd) $(timeout_cmd) $command" > =20 > run_qemu $command "$@" > diff --git a/lib/arm/io.c b/lib/arm/io.c > index 99fd315..d8e7745 100644 > --- a/lib/arm/io.c > +++ b/lib/arm/io.c > @@ -87,6 +87,34 @@ void puts(const char *s) > spin_unlock(&uart_lock); > } > =20 > +static int ____getchar(void) Three underscores? ... that's quite a lot already. I'd maybe rather name the function "do_getchar" or something similar instead. Or simply merge the code into the __getchar function below - it's just three lines. > +{ > + int c; > + > + spin_lock(&uart_lock); > + c =3D readb(uart0_base); > + spin_unlock(&uart_lock); > + > + return c ? : -1; Just a matter of taste, but I prefer the elvis operator without space in between. > +} > + > +/* > + * Minimalist implementation for migration completion detection. > + * Without FIFOs enabled on the QEMU UART device we just read > + * the data register: we cannot read more than 16 characters. Where are the 16 bytes buffered if FIFOs are disabled? > + */ > +int __getchar(void) > +{ > + int c =3D ____getchar(); > + static int count; > + > + if (c !=3D -1) > + ++count; > + > + assert(count < 16); > + > + return c; > +} The above comments were only nits ... feel free to ignore them if you don't want to respin the series just because of this. Thomas 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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 03453C33CB2 for ; Wed, 29 Jan 2020 08:08:54 +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 C2C8120716 for ; Wed, 29 Jan 2020 08:08:53 +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="IM5cepCX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2C8120716 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]:42550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwiP7-0005ht-1k for qemu-devel@archiver.kernel.org; Wed, 29 Jan 2020 03:08:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47408) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwiOV-00059P-8i for qemu-devel@nongnu.org; Wed, 29 Jan 2020 03:08:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwiOU-0001Bv-2o for qemu-devel@nongnu.org; Wed, 29 Jan 2020 03:08:15 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56494 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwiOT-0001BH-VN for qemu-devel@nongnu.org; Wed, 29 Jan 2020 03:08:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580285293; 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:openpgp:openpgp; bh=6B1BQTixM1hGZ6QDPNmwN5NO9M03YJBxtfjfLjgPORU=; b=IM5cepCXXlBpC+bjopM1+tF0UFR16ucNZDYW5rR8v0PMxdislUJ/TdzmsLjn7Etjs7daYL K5vv3vPLzEYyTsmfOiRsfnT69vIsEEF6sNVGsrfIJkaimQpp8eXpgUTegtlKedgGiOdrsc Fn86xMTSRyzlCcet/6LGvGi9bvCnV1w= 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-276-ulYYoQhVNkGxvnZqYnfM7w-1; Wed, 29 Jan 2020 03:08:04 -0500 X-MC-Unique: ulYYoQhVNkGxvnZqYnfM7w-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 09ACD18A6EC1; Wed, 29 Jan 2020 08:08:02 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EB6460C05; Wed, 29 Jan 2020 08:07:55 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v3 12/14] arm/run: Allow Migration tests To: Eric Auger , eric.auger.pro@gmail.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org References: <20200128103459.19413-1-eric.auger@redhat.com> <20200128103459.19413-13-eric.auger@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: <3962373a-0e03-5ab9-30cc-3b385fc55702@redhat.com> Date: Wed, 29 Jan 2020 09:07:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200128103459.19413-13-eric.auger@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: yuzenghui@huawei.com, andre.przywara@arm.com, drjones@redhat.com, alexandru.elisei@arm.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 28/01/2020 11.34, Eric Auger wrote: > Let's link getchar.o to use puts and getchar from the > tests. >=20 > Then allow tests belonging to the migration group to > trigger the migration from the test code by putting > "migrate" into the uart. Then the code can wait for the > migration completion by using getchar(). >=20 > The __getchar implement is minimalist as it just reads the > data register. It is just meant to read the single character > emitted at the end of the migration by the runner script. >=20 > It is not meant to read more data (FIFOs are not enabled). >=20 > Signed-off-by: Eric Auger >=20 > --- >=20 > v2 -> v3: > - take the lock > - assert if more than 16 chars > - removed Thomas' R-b > --- > arm/Makefile.common | 2 +- > arm/run | 2 +- > lib/arm/io.c | 28 ++++++++++++++++++++++++++++ > 3 files changed, 30 insertions(+), 2 deletions(-) >=20 > diff --git a/arm/Makefile.common b/arm/Makefile.common > index b8988f2..a123e85 100644 > --- a/arm/Makefile.common > +++ b/arm/Makefile.common > @@ -32,7 +32,7 @@ CFLAGS +=3D -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt = -I lib > asm-offsets =3D lib/$(ARCH)/asm-offsets.h > include $(SRCDIR)/scripts/asm-offsets.mak > =20 > -cflatobjs +=3D lib/util.o > +cflatobjs +=3D lib/util.o lib/getchar.o > cflatobjs +=3D lib/alloc_phys.o > cflatobjs +=3D lib/alloc_page.o > cflatobjs +=3D lib/vmalloc.o > diff --git a/arm/run b/arm/run > index 277db9b..a390ca5 100755 > --- a/arm/run > +++ b/arm/run > @@ -61,6 +61,6 @@ fi > M+=3D",accel=3D$ACCEL" > command=3D"$qemu -nodefaults $M -cpu $processor $chr_testdev $pci_test= dev" > command+=3D" -display none -serial stdio -kernel" > -command=3D"$(timeout_cmd) $command" > +command=3D"$(migration_cmd) $(timeout_cmd) $command" > =20 > run_qemu $command "$@" > diff --git a/lib/arm/io.c b/lib/arm/io.c > index 99fd315..d8e7745 100644 > --- a/lib/arm/io.c > +++ b/lib/arm/io.c > @@ -87,6 +87,34 @@ void puts(const char *s) > spin_unlock(&uart_lock); > } > =20 > +static int ____getchar(void) Three underscores? ... that's quite a lot already. I'd maybe rather name the function "do_getchar" or something similar instead. Or simply merge the code into the __getchar function below - it's just three lines. > +{ > + int c; > + > + spin_lock(&uart_lock); > + c =3D readb(uart0_base); > + spin_unlock(&uart_lock); > + > + return c ? : -1; Just a matter of taste, but I prefer the elvis operator without space in between. > +} > + > +/* > + * Minimalist implementation for migration completion detection. > + * Without FIFOs enabled on the QEMU UART device we just read > + * the data register: we cannot read more than 16 characters. Where are the 16 bytes buffered if FIFOs are disabled? > + */ > +int __getchar(void) > +{ > + int c =3D ____getchar(); > + static int count; > + > + if (c !=3D -1) > + ++count; > + > + assert(count < 16); > + > + return c; > +} The above comments were only nits ... feel free to ignore them if you don't want to respin the series just because of this. Thomas 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=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 D04D5C33CB7 for ; Wed, 29 Jan 2020 08:08:18 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 5011820716 for ; Wed, 29 Jan 2020 08:08:18 +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="IM5cepCX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5011820716 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 80B544AC86; Wed, 29 Jan 2020 03:08:17 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jPWC-Rw5vTmE; Wed, 29 Jan 2020 03:08:16 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 57AA74A591; Wed, 29 Jan 2020 03:08:16 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 022954A591 for ; Wed, 29 Jan 2020 03:08:15 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WL-cnMHFV7x5 for ; Wed, 29 Jan 2020 03:08:13 -0500 (EST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mm01.cs.columbia.edu (Postfix) with ESMTP id D4C1D4A522 for ; Wed, 29 Jan 2020 03:08:13 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580285293; 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:openpgp:openpgp; bh=6B1BQTixM1hGZ6QDPNmwN5NO9M03YJBxtfjfLjgPORU=; b=IM5cepCXXlBpC+bjopM1+tF0UFR16ucNZDYW5rR8v0PMxdislUJ/TdzmsLjn7Etjs7daYL K5vv3vPLzEYyTsmfOiRsfnT69vIsEEF6sNVGsrfIJkaimQpp8eXpgUTegtlKedgGiOdrsc Fn86xMTSRyzlCcet/6LGvGi9bvCnV1w= 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-276-ulYYoQhVNkGxvnZqYnfM7w-1; Wed, 29 Jan 2020 03:08:04 -0500 X-MC-Unique: ulYYoQhVNkGxvnZqYnfM7w-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 09ACD18A6EC1; Wed, 29 Jan 2020 08:08:02 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0EB6460C05; Wed, 29 Jan 2020 08:07:55 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v3 12/14] arm/run: Allow Migration tests To: Eric Auger , eric.auger.pro@gmail.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org References: <20200128103459.19413-1-eric.auger@redhat.com> <20200128103459.19413-13-eric.auger@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: <3962373a-0e03-5ab9-30cc-3b385fc55702@redhat.com> Date: Wed, 29 Jan 2020 09:07:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20200128103459.19413-13-eric.auger@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Cc: andre.przywara@arm.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On 28/01/2020 11.34, Eric Auger wrote: > Let's link getchar.o to use puts and getchar from the > tests. > > Then allow tests belonging to the migration group to > trigger the migration from the test code by putting > "migrate" into the uart. Then the code can wait for the > migration completion by using getchar(). > > The __getchar implement is minimalist as it just reads the > data register. It is just meant to read the single character > emitted at the end of the migration by the runner script. > > It is not meant to read more data (FIFOs are not enabled). > > Signed-off-by: Eric Auger > > --- > > v2 -> v3: > - take the lock > - assert if more than 16 chars > - removed Thomas' R-b > --- > arm/Makefile.common | 2 +- > arm/run | 2 +- > lib/arm/io.c | 28 ++++++++++++++++++++++++++++ > 3 files changed, 30 insertions(+), 2 deletions(-) > > diff --git a/arm/Makefile.common b/arm/Makefile.common > index b8988f2..a123e85 100644 > --- a/arm/Makefile.common > +++ b/arm/Makefile.common > @@ -32,7 +32,7 @@ CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib > asm-offsets = lib/$(ARCH)/asm-offsets.h > include $(SRCDIR)/scripts/asm-offsets.mak > > -cflatobjs += lib/util.o > +cflatobjs += lib/util.o lib/getchar.o > cflatobjs += lib/alloc_phys.o > cflatobjs += lib/alloc_page.o > cflatobjs += lib/vmalloc.o > diff --git a/arm/run b/arm/run > index 277db9b..a390ca5 100755 > --- a/arm/run > +++ b/arm/run > @@ -61,6 +61,6 @@ fi > M+=",accel=$ACCEL" > command="$qemu -nodefaults $M -cpu $processor $chr_testdev $pci_testdev" > command+=" -display none -serial stdio -kernel" > -command="$(timeout_cmd) $command" > +command="$(migration_cmd) $(timeout_cmd) $command" > > run_qemu $command "$@" > diff --git a/lib/arm/io.c b/lib/arm/io.c > index 99fd315..d8e7745 100644 > --- a/lib/arm/io.c > +++ b/lib/arm/io.c > @@ -87,6 +87,34 @@ void puts(const char *s) > spin_unlock(&uart_lock); > } > > +static int ____getchar(void) Three underscores? ... that's quite a lot already. I'd maybe rather name the function "do_getchar" or something similar instead. Or simply merge the code into the __getchar function below - it's just three lines. > +{ > + int c; > + > + spin_lock(&uart_lock); > + c = readb(uart0_base); > + spin_unlock(&uart_lock); > + > + return c ? : -1; Just a matter of taste, but I prefer the elvis operator without space in between. > +} > + > +/* > + * Minimalist implementation for migration completion detection. > + * Without FIFOs enabled on the QEMU UART device we just read > + * the data register: we cannot read more than 16 characters. Where are the 16 bytes buffered if FIFOs are disabled? > + */ > +int __getchar(void) > +{ > + int c = ____getchar(); > + static int count; > + > + if (c != -1) > + ++count; > + > + assert(count < 16); > + > + return c; > +} The above comments were only nits ... feel free to ignore them if you don't want to respin the series just because of this. Thomas _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm