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 173E9C33C99 for ; Tue, 7 Jan 2020 09:16:27 +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 D40422073D for ; Tue, 7 Jan 2020 09:16:26 +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="UpfYl1S5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D40422073D 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]:45050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iokpO-0000rr-F9 for qemu-devel@archiver.kernel.org; Tue, 07 Jan 2020 04:07:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52582) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iojSU-0003ok-6i for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:39:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iojSS-0001lH-UL for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:39:21 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:53585 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 1iojSS-0001kz-Pp for qemu-devel@nongnu.org; Tue, 07 Jan 2020 02:39:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578382760; 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=XP6X6jfo2D1Ntt4i7WREXuOToJDDJqraHYyom/OfMhg=; b=UpfYl1S5vTSmBqf8aiiRXymLWlyeBA7LDvf1TkHUlTap9tGYz5qwxb9pTaMAATMAOrU43Z v+M6Jx3AmeYE5FvaXcWZ4lEf52bVWvoV0OyUrOe+NR562YyAjvtZmBMtzyfvNqoLom2t4E tU6rFlntlITgXrZwtvkkio08SDIK6bE= 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-323-r5ygW_KtMd6V1DRyzLNExQ-1; Tue, 07 Jan 2020 02:39:19 -0500 X-MC-Unique: r5ygW_KtMd6V1DRyzLNExQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E214800D4C; Tue, 7 Jan 2020 07:39:17 +0000 (UTC) Received: from thuth.remote.csb (ovpn-116-116.ams2.redhat.com [10.36.116.116]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 074FB84672; Tue, 7 Jan 2020 07:39:11 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH 14/16] 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: <20191216140235.10751-1-eric.auger@redhat.com> <20191216140235.10751-15-eric.auger@redhat.com> From: Thomas Huth Openpgp: preference=signencrypt Message-ID: <9b03fb14-008b-549b-9336-d5e91208a54f@redhat.com> Date: Tue, 7 Jan 2020 08:39:10 +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: <20191216140235.10751-15-eric.auger@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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 16/12/2019 15.02, 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 > --- > arm/Makefile.common | 2 +- > arm/run | 2 +- > lib/arm/io.c | 13 +++++++++++++ > 3 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/arm/Makefile.common b/arm/Makefile.common > index 7cc0f04..327f112 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..aa9e1b5 100644 > --- a/lib/arm/io.c > +++ b/lib/arm/io.c > @@ -87,6 +87,19 @@ void puts(const char *s) > spin_unlock(&uart_lock); > } > > +/* > + * Minimalist implementation for migration completion detection. > + * Needs to be improved for more advanced Rx cases > + */ > +int __getchar(void) > +{ > + int ret; > + > + ret = readb(uart0_base); Duplicated space before "readb"... > + if (!ret) > + return -1; > + return ret; > +} > > /* > * Defining halt to take 'code' as an argument guarantees that it will > ... but apart from that nit: Reviewed-by: Thomas Huth