From patchwork Sun Mar 15 23:57:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11439511 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BE00292A for ; Mon, 16 Mar 2020 00:26:05 +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 9429D205ED for ; Mon, 16 Mar 2020 00:26:05 +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="D8GHKdbJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9429D205ED 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDda0-0004yS-CX for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:26:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44173) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8s-0003TG-Lk for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8r-00010S-IH for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:02 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:56668 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 1jDd8r-0000z0-Dq for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316681; 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=HrqXLxTQz0mEYrpZdea1ftAFgDjw4GVpWcXSJKx0Kfk=; b=D8GHKdbJHO8oaPe6Mz3ax3pHuQLa0gl1huNvbSoWBEIPpTdeKxi7DwCO30cy0FuVdS+Zt8 HopybHBXBd7y9pqBiWYDCv14zXqTszYcsMK8GDE3o6yaSYhUohvQWqEuECPr7HMcuHGxo4 /lyVeVlSoZaS0ZqRRk04xNRFYNBkUnA= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-a__Osr8gN9ybrFFtkJwyLw-1; Sun, 15 Mar 2020 19:57:59 -0400 X-MC-Unique: a__Osr8gN9ybrFFtkJwyLw-1 Received: by mail-wr1-f69.google.com with SMTP id u12so5688147wrw.10 for ; Sun, 15 Mar 2020 16:57:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pZnziEWWIqS/GPOcov+nb6Dnv8MFQCtODqZczgbWweM=; b=GUuWAAEi9Vhrju+CUVszUTctRqm9gid+xhitrEI2WqGg3tMheT8k1hnfR7NtdVWKn7 NK6euQR4KK83tIqwS287oXunz3sXVqn8dfl1DD8tmoEjiny68lhyTf0XrL4RJhdA2Y4o 5ySuC1JHBKEO+9ckNlNuY7VSlRbGbD8H0YTngRpmkpY3cBJSiHQNgpWsdw1dW+rxi7J3 1HxUv5d15YMRq4VQ403GmIyPTP65PB7jvhS0QIha3GklGJKhraoV2x31cCpOaj4n5rSR C55arusJiNHYEaHdcBTVEZ1Nib6VVfgGzFyzfpmojqd9Hmkjw1QHEkOIEAIrHufc8XkF aNlQ== X-Gm-Message-State: ANhLgQ1ypkYQ+4678tMizjy1tTzJk1J0k1EV0szvTyG+sOmfkhjFiYJ/ thB/M1JQPCtpGserDLfNroIfcaS0JljH45dC+4p9LwQ9cEh29eRlrRsy6PwAoDFSrucaftoYXkG xyULVxHJCHv0eW9c= X-Received: by 2002:a5d:4b82:: with SMTP id b2mr31959725wrt.102.1584316678139; Sun, 15 Mar 2020 16:57:58 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvvFt9gU4znEJ4H91Jd+cteS6sghn/vl4FgyB2z0OHcVOS/QTpXxbRNQNhQnyf400OsrgpbWA== X-Received: by 2002:a5d:4b82:: with SMTP id b2mr31959706wrt.102.1584316677988; Sun, 15 Mar 2020 16:57:57 -0700 (PDT) Received: from localhost.localdomain (191.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.191]) by smtp.gmail.com with ESMTPSA id j39sm12580913wre.11.2020.03.15.16.57.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:57 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/12] target/riscv/cpu: Restrict CPU migration to system-mode Date: Mon, 16 Mar 2020 00:57:11 +0100 Message-Id: <20200315235716.28448-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200315235716.28448-1-philmd@redhat.com> References: <20200315235716.28448-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: "open list:RISC-V TCG CPUs" , Eduardo Habkost , Sagar Karandikar , Bastian Koppelmann , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/riscv/cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index c0b7023100..b59e09209e 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -475,10 +475,12 @@ static void riscv_cpu_init(Object *obj) cpu_set_cpustate_pointers(cpu); } +#ifndef CONFIG_USER_ONLY static const VMStateDescription vmstate_riscv_cpu = { .name = "cpu", .unmigratable = 1, }; +#endif static Property riscv_cpu_properties[] = { DEFINE_PROP_BOOL("i", RISCVCPU, cfg.ext_i, true), @@ -534,13 +536,13 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->do_transaction_failed = riscv_cpu_do_transaction_failed; cc->do_unaligned_access = riscv_cpu_do_unaligned_access; cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug; + /* For now, mark unmigratable: */ + cc->vmsd = &vmstate_riscv_cpu; #endif #ifdef CONFIG_TCG cc->tcg_initialize = riscv_translate_init; cc->tlb_fill = riscv_cpu_tlb_fill; #endif - /* For now, mark unmigratable: */ - cc->vmsd = &vmstate_riscv_cpu; device_class_set_props(dc, riscv_cpu_properties); }