From patchwork Sun Mar 15 23:57:05 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: 11439501 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 35BA092A for ; Mon, 16 Mar 2020 00:14:34 +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 0ABAD205ED for ; Mon, 16 Mar 2020 00:14:34 +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="MN0Z5ELc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ABAD205ED 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]:60620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdOp-0000jN-Sz for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:14:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43234) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8L-0003CW-Jc for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8K-0007tM-KW for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:29 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:37346 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 1jDd8K-0007sX-DO for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316648; 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=mc73kkkbOR6YMvJfnjUOW/p+/YyXlGafTx0fi06KcgA=; b=MN0Z5ELcZ5P6ZL6cSHqTCGlpeCpulmimb5mj/u/MDOLhA8UTwl2DYVztq4CNl+6T9dgsf7 x5V21lh8awiTmK2PnjSaOaJilZvjaFOGCqZxHTaYIcm4y72PuB0hlWd+vXs9BW3pYKs6oZ KooVVWexjKXOmpQPBb3rDz1gLdhXus4= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-105-KonpXpMvNhWbm0uvXz_Vlw-1; Sun, 15 Mar 2020 19:57:26 -0400 X-MC-Unique: KonpXpMvNhWbm0uvXz_Vlw-1 Received: by mail-wr1-f72.google.com with SMTP id s4so2715993wrb.19 for ; Sun, 15 Mar 2020 16:57:26 -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=fn55PSBk8YLuKq9+Y8DFn9L+hED9pijxFTNzc+2l8xw=; b=bwAXRvIgGqczTuajGszzUgVtCc/qAIypklngYJCn91cYLsGIkAPxy/Uqq3LuVQZ8ie egN3XRU/CDzkgeywjmUb5I64v/en5YdzhP3BFNpa6ltbXi1cunJLW07IffJsXpkYNjt7 RCcBi/cnBnOO/VSW0CPCU95t3zNmZXVN7kIpX9Ugd4FzevXGeybQS3esanhYIAvWDRmS H8wf5BepbStRPRMa0B0K6OEczkfVrEhUlO810g2djSyhbVZhoLcz7Rsq/pNL6L6Ysmeb 1+2b8Y9KSVU71Q3vJAfg3OwqoFt5ftKbz2hSLcSK41OgwwfRleVmdBkvBhofCkKPjpZP 0F8g== X-Gm-Message-State: ANhLgQ3pnAITkFif7JjN9szjAptPqFiEle+DZar8G814QoMiN5AjlQAS rok9JSKb6yA1aBBoj6lVbKA72+ZQyEbGTE76nVBMNzdV1IfylzmItAoVb+IDR7C7LddcNDrUHu9 5HY+3K+xzUTYJCws= X-Received: by 2002:a1c:b4d4:: with SMTP id d203mr24570793wmf.85.1584316645415; Sun, 15 Mar 2020 16:57:25 -0700 (PDT) X-Google-Smtp-Source: ADFU+vueXWUSDZtIM4Etl4SleWf0BKqRnitJJvE3PHI2uA30HEbdSpVd4uREFq+3MJHyxFaV5N5GPw== X-Received: by 2002:a1c:b4d4:: with SMTP id d203mr24570765wmf.85.1584316645210; Sun, 15 Mar 2020 16:57:25 -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 d15sm89647978wrp.37.2020.03.15.16.57.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/12] Makefile: Only build virtiofsd if system-mode is enabled Date: Mon, 16 Mar 2020 00:57:05 +0100 Message-Id: <20200315235716.28448-2-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] [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: Eduardo Habkost , Cornelia Huck , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Do not build the virtiofsd helper when configured with --disable-system. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- v2: Use single line with ifeq='yyyy' (lvivier, rth) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7df22fcc5d..7d27941803 100644 --- a/Makefile +++ b/Makefile @@ -345,7 +345,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) +ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy) HELPERS-y += virtiofsd$(EXESUF) vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json endif From patchwork Sun Mar 15 23:57:06 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: 11439509 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 43D1592A for ; Mon, 16 Mar 2020 00:25: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 1962720674 for ; Mon, 16 Mar 2020 00:25:46 +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="elqbiP6i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1962720674 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]:60698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdZg-0004jM-Qs for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43414) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8U-0003GO-6i for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8S-0008BF-0o for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:37 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:10863) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDd8Q-00088z-E7 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316654; 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=VaQNKAOJWCJ0TkYGshllA/zY5mZPUlKZJvjUMpmytUk=; b=elqbiP6ilWRoxlq1zuTq6upkxOSyJq+7Kg+yjgdM2CPGI8hIKy0MBJmWJ4/STaMNsSk+et eN1MeG67dr7SXktzANdxHLqiKBoHaCjhtmqeJ/ah7fV8mv4bWazyiRQBUbXB1CH4RV8n91 GXH9Yi0BkgEBGrsS08h5f1r2cwdFia4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-11-OQyMRfJ7Pn-xEhkBlekfXw-1; Sun, 15 Mar 2020 19:57:32 -0400 X-MC-Unique: OQyMRfJ7Pn-xEhkBlekfXw-1 Received: by mail-wm1-f72.google.com with SMTP id s20so4194937wmj.2 for ; Sun, 15 Mar 2020 16:57:31 -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=z6xOhiDttpNha3dcUNHLkv4u9IpM4hzHtavFC7DQxi8=; b=lu5VcnCW5hivzEZkMdUDuTzfn/uVrwZiL9lvz4nEPAmSUC+NodM7aTxwoGqXMrsAE2 V13fgw8BoRGCMr9kfo0QseqLFZgbOFFKTEx8vj64DAoLKaRWVVji3nwVMTpXKJDsJPy+ hqDYlq8u03So5ShNfYugXHa8/+kcqE8b7htZxTGENdMjRMHPgndNLXo2e0BjF4Bx1pYA Ag9/5OPY37b+alDujZCzXp2bGus34sIC74WgBtTXanRoHQEBG5UVr7AKksWVtsnTmwfO 6C30AZCPCsFrEqdXuxPuzzoN9GZf60BbXjFXd4cJhMHhMxgHg+MAi8kBULIVmCSi/2Bp z5rA== X-Gm-Message-State: ANhLgQ2c1FOiLgtAN+RYrKv1/xTA4H/gvhL3w5ctHIXHnwy+CAFXMY39 tcL09DO1YXZ7szV1wJ7QxMXa5M7Ere3rVSOT3FlhpwLtAqkbXcKJ6O7ch33Pp/M3MkJ8hhCsMp7 iGEHcc20/6p0Bm/g= X-Received: by 2002:a7b:c0cf:: with SMTP id s15mr25059324wmh.106.1584316650777; Sun, 15 Mar 2020 16:57:30 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuqRHWoAzOfYRO1fI8H2/AB2Sep6HlNfQBtYtXFopxl51PHRuFJr6DrmgyBFP6Gzt30RYb3dw== X-Received: by 2002:a7b:c0cf:: with SMTP id s15mr25059297wmh.106.1584316650562; Sun, 15 Mar 2020 16:57:30 -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 u25sm27118389wml.17.2020.03.15.16.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/12] configure: Avoid building TCG when not needed Date: Mon, 16 Mar 2020 00:57:06 +0100 Message-Id: <20200315235716.28448-3-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] [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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid building TCG when building only tools: ./configure --enable-tools --disable-system --disable-user This saves us from running the soft-float tests enabled since commit 76170102508. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- configure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure b/configure index eb49bb6680..c2ffcb0431 100755 --- a/configure +++ b/configure @@ -1650,6 +1650,10 @@ if [ "$ARCH" = "unknown" ]; then linux_user="no" fi +if [ "$bsd_user" = "no" -a "$linux_user" = "no" -a "$softmmu" = "no" ] ; then + tcg="no" +fi + default_target_list="" mak_wilds="" From patchwork Sun Mar 15 23:57:07 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: 11439493 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 A96781392 for ; Mon, 16 Mar 2020 00:03:41 +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 7F33E2051A for ; Mon, 16 Mar 2020 00:03:41 +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="RyuDFkTW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F33E2051A 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]:60506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdEK-0005HE-F7 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:03:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43483) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8X-0003H0-TZ for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8W-0008J6-8x for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:41 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:31652 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 1jDd8W-0008Gt-5a for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316659; 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=UoMB8bAs+BncojjHOENLqWi5wv0KsLpWCZpM5Av+CV4=; b=RyuDFkTWuUNxoT+MX5Ex7iNy4OAJ94fCyBrtMHS5fDczkoY4QltWjgezES/Ovmjw9jtv0N N8Ps10DhodUHWffid4b/CcNIg+4Vi/7HWem1zVsj95ydJEWvsXktZPd3N80gl79YtQDsWG iWmwNJKcApBJ804cf8rq669Y8YeSv9E= 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-372-oBWu5dj3MwKJMwPNUgrs4Q-1; Sun, 15 Mar 2020 19:57:37 -0400 X-MC-Unique: oBWu5dj3MwKJMwPNUgrs4Q-1 Received: by mail-wr1-f69.google.com with SMTP id o9so8138660wrw.14 for ; Sun, 15 Mar 2020 16:57:37 -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=GFbiob2Atl72mu88AerDnyLW7Ta1dRxhgYxkqDYaKSk=; b=uJtbMJpi+n21V6ASnrDafa2pTKMwLpGTtnzgsUEnknYea6mTAFFeydeNBJTLVQGQj2 J4HoWo8whXtmCX3WJLedDwNj5W8sJV2qsY0gYPtFOKAElapb28eSv8x92kBmnV9YgEf5 0H3rCunwzVmcVzmze/UJSSmMYsYrjdroRKuS44QNSR0uxNH9THge9nMio4zUXekIlX4/ Se6CNZcEv+PdLVoXVGywrw2W9GOcVc9qtNzIKOZzBeXy3pqUsxg/rPYw1+Z9yo0lvBhc MLuze/j6HI1b92hExdLsOYjPYrR2cVgc1ClYwplejaUB+zWcBC7/O18XjscsKxJFYVln pBtg== X-Gm-Message-State: ANhLgQ0joN+C4ETEszEnsAVwJmmq6yrH5s6WrnA5mUZTRHiGwmzeM5E1 ngIADGTIDfwOk14DZBaNAzFq+GanjfnAqpUKK4/we2zUt1wJe/MFq2wBcDV/Odiu1FO5JEb4nvH rtYtYfdEfWfLX6SI= X-Received: by 2002:adf:a547:: with SMTP id j7mr9469928wrb.323.1584316656144; Sun, 15 Mar 2020 16:57:36 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuNuI6y9YupTJFQCEULH5aq2IZZu851yo2rOhRx9U7Sp7HVlLf0nVrF6OjHe7ObL1R1IgOoAQ== X-Received: by 2002:adf:a547:: with SMTP id j7mr9469900wrb.323.1584316655986; Sun, 15 Mar 2020 16:57:35 -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 w81sm27421808wmg.19.2020.03.15.16.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/12] tests/Makefile: Only display TCG-related tests when TCG is available Date: Mon, 16 Mar 2020 00:57:07 +0100 Message-Id: <20200315235716.28448-4-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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , 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é --- tests/Makefile.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/Makefile.include b/tests/Makefile.include index 67e8fcddda..99db5eb3e0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -12,8 +12,10 @@ check-help: @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" +ifeq ($(CONFIG_TCG),y) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" +endif @echo " $(MAKE) check-acceptance Run all acceptance (functional) tests" @echo @echo " $(MAKE) check-report.tap Generates an aggregated TAP test report" From patchwork Sun Mar 15 23:57:08 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: 11439495 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 7036B921 for ; Mon, 16 Mar 2020 00:03:45 +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 4648C2051A for ; Mon, 16 Mar 2020 00:03:45 +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="DZFmEfKK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4648C2051A 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]:60508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdEO-0005KN-62 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:03:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43710) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8e-0003MA-Vr for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8d-0000BV-EN for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:48 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21089 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 1jDd8d-0000AV-9x for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316666; 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=+85pNdNS2ACd1b/ahv2/xRPbenAuCnFj1mWy2sqhNg4=; b=DZFmEfKKZwvrZicvWvCmAl5a6ug6IFgUyFn8dHu59UI6rqPlYK/wgw/HNRWd/NFMBv7rGs bUNrVcTKCQVLpn434vSmZVTb7wHRZ50sSbPllDCcxta7LrEfZYBrcoN9oSmuTlp1T0T1sE 83WDMnf6pvttUTiEaMhOLycZipjWzdk= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-rSIELIh6NeKkdlh73rg9KQ-1; Sun, 15 Mar 2020 19:57:43 -0400 X-MC-Unique: rSIELIh6NeKkdlh73rg9KQ-1 Received: by mail-wm1-f72.google.com with SMTP id n188so5032926wmf.0 for ; Sun, 15 Mar 2020 16:57:42 -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=QHg0gH7YOmiivXKZ+h01PKcYSRdBeclAYPnPb4d1J/o=; b=ch67MvR22lJbFJ0f9x13ja5Rdr4pHOs8+8cL8eFk3qgoHRou/jkypwD4I1uIC1MBqG UQzgyQ1vAfGJTR7ioLrjTlXRHkG/tsk7lK68y6OS9CsweeTm9dTJVPhrTdKe6cC0lV8b bilepD46VAOtCfV9eLSqfGKeWWHmuE3gTe2dbrvHDB/nh8wroptlV6nzyNlukeR62+Nu YXZuCw2i1vXY78Hmsv/seDR95UTe54mST3u1v0XFA43S82UpM5XlGgE5dv+LgEE2t7Ui IbLPdiPyUeCKcR0vtBIrH0IIrBOsUBKrMUMwklsXj/letgKXmqhAI9D7EPi4dx2fru9U 822w== X-Gm-Message-State: ANhLgQ2Aa0Rbn5Qkj8XHiuZZSKlLMFL74rcbkziVVQ97qNUoibCeBQ2j Y/C0Kz2iW1eP1p0Kf68epZV4cO2E4KaBXENNfLpKGI/v9MTxYJUYSiPsNlpL/6rYBlGm6xzktlo Tp8psmFwW6UWyfug= X-Received: by 2002:a7b:c92e:: with SMTP id h14mr24981317wml.90.1584316661646; Sun, 15 Mar 2020 16:57:41 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuxyZIeSOBRYumkwzQVsm+eHc6g/N28xo5mo4zn/La6UX2hWWzU6Hw5LS+cGMy2lzexFvzNHw== X-Received: by 2002:a7b:c92e:: with SMTP id h14mr24981286wml.90.1584316661372; Sun, 15 Mar 2020 16:57:41 -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 i8sm11013422wrw.55.2020.03.15.16.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/12] tests/Makefile: Restrict some softmmu-only tests Date: Mon, 16 Mar 2020 00:57:08 +0100 Message-Id: <20200315235716.28448-5-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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" In the next commit we are going to remove some objects from the util-obj-y variable (objects which are not used by user-mode, when configured with --disable-system). Then some system-mode tests are going to fail, due to the missing objects: $ make check-unit -k LINK tests/test-iov /usr/bin/ld: tests/test-iov.o: in function `iov_from_buf': include/qemu/iov.h:49: undefined reference to `iov_from_buf_full' make: *** [rules.mak:124: tests/test-iov] Error 1 LINK tests/test-timed-average /usr/bin/ld: tests/test-timed-average.o: in function `account': tests/test-timed-average.c:27: undefined reference to `timed_average_account' make: *** [rules.mak:124: tests/test-timed-average] Error 1 LINK tests/test-util-filemonitor /usr/bin/ld: tests/test-util-filemonitor.o: in function `qemu_file_monitor_test_event_loop': tests/test-util-filemonitor.c:83: undefined reference to `main_loop_wait' make: *** [rules.mak:124: tests/test-util-filemonitor] Error 1 LINK tests/test-util-sockets /usr/bin/ld: tests/test-util-sockets.o: in function `test_socket_fd_pass_name_good': tests/test-util-sockets.c:91: undefined reference to `socket_connect' make: *** [rules.mak:124: tests/test-util-sockets] Error 1 LINK tests/test-base64 /usr/bin/ld: tests/test-base64.o: in function `test_base64_good': tests/test-base64.c:35: undefined reference to `qbase64_decode' collect2: error: ld returned 1 exit status make: *** [rules.mak:124: tests/test-base64] Error 1 LINK tests/test-bufferiszero /usr/bin/ld: tests/test-bufferiszero.o: in function `test_1': tests/test-bufferiszero.c:31: undefined reference to `buffer_is_zero' make: *** [rules.mak:124: tests/test-bufferiszero] Error 1 make: Target 'check-unit' not remade because of errors. Instead, restrict these tests to system-mode, by using the $(CONFIG_SOFTMMU) variable. Reviewed-by: Richard Henderson Tested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- v2: Reworded description with example (rth) --- tests/Makefile.include | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 99db5eb3e0..bf11f765c3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -64,14 +64,14 @@ check-unit-y += tests/check-qlit$(EXESUF) check-unit-y += tests/test-qobject-output-visitor$(EXESUF) check-unit-y += tests/test-clone-visitor$(EXESUF) check-unit-y += tests/test-qobject-input-visitor$(EXESUF) -check-unit-y += tests/test-qmp-cmds$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-qmp-cmds$(EXESUF) check-unit-y += tests/test-string-input-visitor$(EXESUF) check-unit-y += tests/test-string-output-visitor$(EXESUF) check-unit-y += tests/test-qmp-event$(EXESUF) check-unit-y += tests/test-opts-visitor$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-coroutine$(EXESUF) check-unit-y += tests/test-visitor-serialization$(EXESUF) -check-unit-y += tests/test-iov$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-iov$(EXESUF) check-unit-y += tests/test-bitmap$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-aio$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-aio-multithread$(EXESUF) @@ -106,7 +106,7 @@ check-unit-y += tests/test-qht$(EXESUF) check-unit-y += tests/test-qht-par$(EXESUF) check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-bitcnt$(EXESUF) -check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-qdev-global-props$(EXESUF) check-unit-y += tests/check-qom-interface$(EXESUF) check-unit-y += tests/check-qom-proplist$(EXESUF) check-unit-y += tests/test-qemu-opts$(EXESUF) @@ -124,9 +124,9 @@ check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-crypto-tl ifneq (,$(findstring qemu-ga,$(TOOLS))) check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) += tests/test-qga$(EXESUF) endif -check-unit-y += tests/test-timed-average$(EXESUF) -check-unit-$(CONFIG_INOTIFY1) += tests/test-util-filemonitor$(EXESUF) -check-unit-y += tests/test-util-sockets$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-timed-average$(EXESUF) +check-unit-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_INOTIFY1)) += tests/test-util-filemonitor$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-util-sockets$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-authz-simple$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-authz-list$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-authz-listfile$(EXESUF) @@ -137,7 +137,7 @@ check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-file$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) += tests/test-io-channel-tls$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-command$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-io-channel-buffer$(EXESUF) -check-unit-y += tests/test-base64$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-base64$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GCRYPT))) += tests/test-crypto-pbkdf$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-ivgen$(EXESUF) check-unit-$(CONFIG_BLOCK) += tests/test-crypto-afsplit$(EXESUF) @@ -145,7 +145,7 @@ check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) += tests/test check-unit-$(CONFIG_BLOCK) += tests/test-crypto-block$(EXESUF) check-unit-y += tests/test-logging$(EXESUF) check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_REPLICATION)) += tests/test-replication$(EXESUF) -check-unit-y += tests/test-bufferiszero$(EXESUF) +check-unit-$(CONFIG_SOFTMMU) += tests/test-bufferiszero$(EXESUF) check-unit-y += tests/test-uuid$(EXESUF) check-unit-y += tests/ptimer-test$(EXESUF) check-unit-y += tests/test-qapi-util$(EXESUF) From patchwork Sun Mar 15 23:57:09 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: 11439503 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 5B7FE92A for ; Mon, 16 Mar 2020 00:14:47 +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 314B2205ED for ; Mon, 16 Mar 2020 00:14:47 +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="BMhBrk+2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 314B2205ED 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]:60622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdP1-0000nm-3Y for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43813) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8i-0003Ns-25 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8g-0000Ma-NJ for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34484 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDd8g-0000LB-Ju for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316670; 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=q2WbGUxRvcpHQ7gMdexAnGhsQEHFWTP/K6vD/RQgKno=; b=BMhBrk+2jX+sUTLSkb/EIzw8VHojFXrbXkm33xgd29nqbmpS3SsPQBrxjmNbBsj1XwR66E ulYIVGeR47endoits+2WYqQ3LeG9m9Iy8eYk+yY9mNhhK9KjVMwjyj6VVJ+YN400J5YKfu QqW3WYtXFfheBQ1lxLxS0AZ9LH/by68= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-bcfQ-LX-NwmXn3xohXuGAg-1; Sun, 15 Mar 2020 19:57:48 -0400 X-MC-Unique: bcfQ-LX-NwmXn3xohXuGAg-1 Received: by mail-wm1-f72.google.com with SMTP id f207so5013084wme.6 for ; Sun, 15 Mar 2020 16:57:48 -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=w//Vgnp6ot9C/jYoheowrZSLqS+aLSpvExQpDN5q96c=; b=fAqRGnjzf+Kx6MpdLKLI9wOg3YzxV7RLVcYBAAvSabPNDOhYHlGg8EyAq77/Bjn5sC k8uZMFmbu3m4TGVDO7Y3V+wo93mDUMJZUGvdRQu3P24jsoCdHqjJrVLTQpS396DAoKVp 1Oj3syekTnhnb0htcxX62NsyKmbF/iyie8ryxgVcH9Zj1N9Y87AUOA4nWc2L/UR6mpW+ 0f8qWM5xtowRuVxoeZSbi7baDejdASjZbZ6rwkxXnOnvmYuVB7yfsDxvI/1ZrP//34Fl +w39B9QuPsQ5qebdjpyEU+0Hk+sLXQ1iH7nhsZEnxbUu2FU7UwCTObpdM+jC0dxEuqAZ 3NiQ== X-Gm-Message-State: ANhLgQ29LCsweQwmNQoViFWMWHQ4Ip0hPdyPoMMuJ0FKT2KCk+XQts2w Cp47Wt72rk9tgUN+RGE04RzN/RGrrfSGs0C7OOkZXFLvKnEP09GOxwOF+86N2OmlLTY8KDGEV4C 1PP7KhaLSHWW0pS4= X-Received: by 2002:adf:91c3:: with SMTP id 61mr18894554wri.384.1584316667104; Sun, 15 Mar 2020 16:57:47 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvozUgBYnYHdagK1VgGh48/vEWTckr80zH5kHcohGGDAgJWU35TijOqYgylyCPjp9jlDmji6g== X-Received: by 2002:adf:91c3:: with SMTP id 61mr18894524wri.384.1584316666855; Sun, 15 Mar 2020 16:57:46 -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 p10sm26805399wru.4.2020.03.15.16.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/12] util/Makefile: Reduce the user-mode object list Date: Mon, 16 Mar 2020 00:57:09 +0100 Message-Id: <20200315235716.28448-6-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.120 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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" These objects are not required when configured with --disable-system. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- util/Makefile.objs | 59 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/util/Makefile.objs b/util/Makefile.objs index 6718a38b61..24ae2e4dfa 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -1,8 +1,4 @@ util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o -util-obj-y += bufferiszero.o -util-obj-y += lockcnt.o -util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y += main-loop.o util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o util-obj-$(CONFIG_POSIX) += aio-posix.o util-obj-$(CONFIG_POSIX) += fdmon-poll.o @@ -21,31 +17,20 @@ util-obj-$(CONFIG_WIN32) += oslib-win32.o util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o util-obj-y += envlist.o path.o module.o util-obj-y += host-utils.o -util-obj-y += bitmap.o bitops.o hbitmap.o +util-obj-y += bitmap.o bitops.o util-obj-y += fifo8.o -util-obj-y += nvdimm-utils.o util-obj-y += cacheinfo.o util-obj-y += error.o qemu-error.o util-obj-y += qemu-print.o util-obj-y += id.o -util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o +util-obj-y += qemu-config.o notify.o util-obj-y += qemu-option.o qemu-progress.o util-obj-y += keyval.o -util-obj-y += hexdump.o util-obj-y += crc32c.o util-obj-y += uuid.o -util-obj-y += throttle.o util-obj-y += getauxval.o -util-obj-y += readline.o util-obj-y += rcu.o util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o -util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -util-obj-y += qemu-coroutine-sleep.o -util-obj-y += qemu-co-shared-resource.o -util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o -util-obj-y += buffer.o -util-obj-y += timed-average.o -util-obj-y += base64.o util-obj-y += log.o util-obj-y += pagesize.o util-obj-y += qdist.o @@ -54,12 +39,44 @@ util-obj-y += qsp.o util-obj-y += range.o util-obj-y += stats64.o util-obj-y += systemd.o -util-obj-y += iova-tree.o -util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o -util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o -util-obj-$(CONFIG_LINUX) += vfio-helpers.o util-obj-$(CONFIG_POSIX) += drm.o util-obj-y += guest-random.o util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) dbus.o-libs = $(GIO_LIBS) + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +util-obj-y += aio-wait.o +util-obj-y += aiocb.o +util-obj-y += async.o +util-obj-y += base64.o +util-obj-y += buffer.o +util-obj-y += bufferiszero.o +util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o +util-obj-y += hexdump.o +util-obj-y += lockcnt.o +util-obj-y += iov.o +util-obj-y += iova-tree.o +util-obj-y += hbitmap.o +util-obj-y += main-loop.o +util-obj-y += nvdimm-utils.o +util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +util-obj-y += qemu-coroutine-sleep.o +util-obj-y += qemu-co-shared-resource.o +util-obj-y += qemu-sockets.o +util-obj-y += qemu-timer.o +util-obj-y += thread-pool.o +util-obj-y += throttle.o +util-obj-y += timed-average.o +util-obj-y += uri.o + +util-obj-$(CONFIG_LINUX) += vfio-helpers.o +util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o +util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o +util-obj-$(CONFIG_BLOCK) += readline.o + +endif # CONFIG_SOFTMMU || CONFIG_TOOLS From patchwork Sun Mar 15 23:57:10 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: 11439505 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 02AB31667 for ; Mon, 16 Mar 2020 00:15:08 +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 CA8D0205ED for ; Mon, 16 Mar 2020 00:15:07 +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="gGG5lCrf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CA8D0205ED 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]:60624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdPN-0000ym-ID for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44044) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8p-0003RO-5Z for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8n-0000ov-UN for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:59 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:45398 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 1jDd8n-0000nN-Qc for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316677; 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=l17us6jq1pYPOTfaYknNGXyL5N8ZYJP1n+BYX9B9Fwo=; b=gGG5lCrfg5/qlNEjwZVVeGvAUCZvk+OjiBEjHm9bKVWZbjPtymSV2yOVxzg40ludaLdKjJ CTswWZQoynJD5XDqudSnB1vvpm0QogHedxasv4tgUVf8kRgPMuNPTN3ld7E/50aBvqBV9S bbuZ0VUUQdNAJjmsv7S0RST0r/rVxkE= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-358-pFw_e8jXM5aqj2t32iDm3Q-1; Sun, 15 Mar 2020 19:57:53 -0400 X-MC-Unique: pFw_e8jXM5aqj2t32iDm3Q-1 Received: by mail-wr1-f70.google.com with SMTP id 94so3445674wrr.3 for ; Sun, 15 Mar 2020 16:57:53 -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=YcKpL0Ym79XPzehk7z5gkhNURpeUg+HAgROgl8wu0Aw=; b=iUHEu6Ju2g+zgxKnr3aTe8a6UW5XO/uVzhxohtfznLr3xDkAqK3ccrv65K5C2MYJrh sYX/bk4c15B2Q2Vnqli0um3l6JqKuRd/vmRY8J8Py15vi5Gr+rGIS4XGCxgCA+8DkXe3 HSO5F5aHKF+nneFgnajky2pC9soEguQAn8Wvw49o9di5J7MXZnzi2Sxu6EgYmrJggEjp Mz1+dLH7awzl6ubiUjIdoYPulqZ5ajQIdoLdDwj5vxXuw1A9Vu5nWQaRKwpVHgR0wE35 dCN43C0XtO0TU4RQXo0mvYX1QhVxxp/BgiCcTG499BgSeC9rVZe0iN3Vcx+E3rS1GnEX 96JA== X-Gm-Message-State: ANhLgQ2zHIMjQ+OovVHuPg+1KlvcZxVUeeMs1R/NX9R8HWlTCQbp46T5 Doo+tfPBIPmEybAWgJi0iuG4bAsX8h5izpfQledrVAw0QFn3wfBAPetUbUag9LWAzv1DBuSWLtV fnBM3jdtysaM2Zk0= X-Received: by 2002:a7b:c148:: with SMTP id z8mr23479613wmi.174.1584316672441; Sun, 15 Mar 2020 16:57:52 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu/11BS5Cv2KcCOfYg2Ppwwqj08Jgrf72nj8l1kJ3EXjBhC5oI7MoQ+pDxloAapX5wQaweKLA== X-Received: by 2002:a7b:c148:: with SMTP id z8mr23479596wmi.174.1584316672266; Sun, 15 Mar 2020 16:57:52 -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 s22sm25921427wmc.16.2020.03.15.16.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/12] stubs/Makefile: Reduce the user-mode object list Date: Mon, 16 Mar 2020 00:57:10 +0100 Message-Id: <20200315235716.28448-7-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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" These stubs are not required when configured with --disable-system. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- stubs/Makefile.objs | 52 ++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 45be5dc0ed..5ffa085c67 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -1,46 +1,54 @@ -stub-obj-y += arch_type.o -stub-obj-y += bdrv-next-monitor-owned.o stub-obj-y += blk-commit-all.o -stub-obj-y += blockdev-close-all-bdrv-states.o -stub-obj-y += clock-warp.o stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o stub-obj-y += dump.o stub-obj-y += error-printf.o stub-obj-y += fdset.o stub-obj-y += gdbstub.o -stub-obj-y += get-vm-name.o -stub-obj-y += iothread.o stub-obj-y += iothread-lock.o stub-obj-y += is-daemonized.o stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o stub-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o -stub-obj-y += machine-init-done.o -stub-obj-y += migr-blocker.o -stub-obj-y += change-state-handler.o -stub-obj-y += monitor.o stub-obj-y += monitor-core.o stub-obj-y += notify-event.o +stub-obj-y += qmp_memory_device.o stub-obj-y += qtest.o +stub-obj-y += ramfb.o stub-obj-y += replay.o -stub-obj-y += replay-user.o stub-obj-y += runstate-check.o +stub-obj-$(CONFIG_SOFTMMU) += semihost.o stub-obj-y += set-fd-handler.o +stub-obj-y += vmgenid.o stub-obj-y += sysbus.o stub-obj-y += tpm.o stub-obj-y += trace-control.o -stub-obj-y += uuid.o -stub-obj-y += vm-stop.o stub-obj-y += vmstate.o + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +stub-obj-y += arch_type.o +stub-obj-y += bdrv-next-monitor-owned.o +stub-obj-y += blockdev-close-all-bdrv-states.o +stub-obj-y += change-state-handler.o +stub-obj-y += clock-warp.o stub-obj-y += fd-register.o -stub-obj-y += qmp_memory_device.o -stub-obj-y += target-monitor-defs.o -stub-obj-y += target-get-monitor-def.o -stub-obj-y += vmgenid.o -stub-obj-y += xen-common.o -stub-obj-y += xen-hvm.o +stub-obj-y += fw_cfg.o +stub-obj-y += get-vm-name.o +stub-obj-y += iothread.o +stub-obj-y += machine-init-done.o +stub-obj-y += migr-blocker.o +stub-obj-y += monitor.o stub-obj-y += pci-host-piix.o stub-obj-y += ram-block.o -stub-obj-y += ramfb.o -stub-obj-y += fw_cfg.o -stub-obj-$(CONFIG_SOFTMMU) += semihost.o +stub-obj-y += replay-user.o +stub-obj-y += target-get-monitor-def.o +stub-obj-y += target-monitor-defs.o +stub-obj-y += uuid.o +stub-obj-y += vm-stop.o +stub-obj-y += xen-common.o +stub-obj-y += xen-hvm.o + +endif # CONFIG_SOFTMMU || CONFIG_TOOLS 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); } From patchwork Sun Mar 15 23:57:12 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: 11439513 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 C0A731667 for ; Mon, 16 Mar 2020 00:26:33 +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 9612F205ED for ; Mon, 16 Mar 2020 00:26:33 +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="Jjwx1BcU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9612F205ED 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]:60714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdaP-00055U-KI for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44345) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd91-0003Ve-L8 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8z-0001I8-Nq for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:11 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32794 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 1jDd8z-0001Gy-60 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316688; 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=IoFwUUdQ5j1EQcvi/TMETwZCa5YeqTdP32DVGkKl6I8=; b=Jjwx1BcUceJBbKGWK7suEk/X8b2RnOq0NT6kBBcMihhIMl6IzCed5ckd7Iwv1iWdSQcF9g ysj5Nt63IN9e2GRy2lQnIyzF5sT2Md7DEzScruqo7VpGDNwq6zYU66lg5U7SEYxnNl0NV/ UZmrCCAEfKoEFh2f24y7WMUlb1tqTOc= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-99-XS3mKewBMySfgAv9DQP1eg-1; Sun, 15 Mar 2020 19:58:04 -0400 X-MC-Unique: XS3mKewBMySfgAv9DQP1eg-1 Received: by mail-wm1-f70.google.com with SMTP id s20so4195462wmj.2 for ; Sun, 15 Mar 2020 16:58:04 -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=vu4EsyWe31R7f19y4Eac1OzPvJ4o6ShFaBpa7vf8bFI=; b=BEkF2EoIVGX2xquzDmORFX3Ha8HeR5FXo9pf0x8vePBAmEbN/MWfQ/QaPYvQuXn4k6 GZ/DxeCVjuhOmB1wYBE5BDhUFZ0q5FJsMENTxERyy7kMFHNeenY1BFFnCjDTRZ4FmsAk f09ucpoeLCqZofyn5PpjmCxeD5TJjVBzMTtoTTanm7kJ+e9f0c8QdSyXD5v8RJSoezjk oCDHOfnQJxgk9Ema7GhZ9qNUABoXRgDWIrQdUu8gL3o3fOoSj2bJBHdec/qPTrMLD767 ZuVhjn7ziGRsWjfB9W0gr75fOMtiIA0UDwlWfMmBUcbP5TzWxiny9TmzioRQ52mcpMSG RBeA== X-Gm-Message-State: ANhLgQ1RJGF1IrLvM0rpQTfiG3RyOULadYDkkrgiu2dCgXM/inNEi2/X AIlcsXZTez5RZWpIkugnAN0cvgiABelOrzk/SZnoRgxCHbVBd6c3ZRcwcFwWXqBiBc2EDoa2OUA M/LE1l2jSdeBjQYE= X-Received: by 2002:a5d:60c2:: with SMTP id x2mr31545187wrt.123.1584316683643; Sun, 15 Mar 2020 16:58:03 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtXRGt3aM+Dv6XbBe5xG74x7acjtCAtR575/jcNCYjcRNQfT7deqHlwP1il4DXLJBrdmO2kTg== X-Received: by 2002:a5d:60c2:: with SMTP id x2mr31545172wrt.123.1584316683507; Sun, 15 Mar 2020 16:58:03 -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 v10sm18018481wmh.17.2020.03.15.16.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:58:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/12] exec: Assert CPU migration is not used on user-only build Date: Mon, 16 Mar 2020 00:57:12 +0100 Message-Id: <20200315235716.28448-9-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] [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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- exec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index 0cc500d53a..7bc9828c5b 100644 --- a/exec.c +++ b/exec.c @@ -946,7 +946,9 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) qemu_plugin_vcpu_init_hook(cpu); -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + assert(cc->vmsd == NULL); +#else /* !CONFIG_USER_ONLY */ if (qdev_get_vmsd(DEVICE(cpu)) == NULL) { vmstate_register(NULL, cpu->cpu_index, &vmstate_cpu_common, cpu); } From patchwork Sun Mar 15 23:57:13 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: 11439519 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 6730F92A for ; Mon, 16 Mar 2020 00:36:37 +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 3D62320674 for ; Mon, 16 Mar 2020 00:36:37 +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="YyBVsGjg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D62320674 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]:60794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdkC-0000iS-5h for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44419) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd95-0003WW-8N for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd94-0001O6-9z for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52967 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDd93-0001Mh-3T for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316692; 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=VEnP2IFRb3mCM1tNR7tauzbmbG9nebhnPEsn2Tpezpg=; b=YyBVsGjgy/cMqsjxpX1UQFDoKkTxg73nBXJrw949kVIlnsRmxj1cEt8dRaFUYO8gXXla+e BnVzIC01FPw2FISHbFOCgKRACDjd8URkXgo2jHjMzxDNtwwRM4bWnJA/+AFF6RlVlM/MIg 5zC9vGhm8mV2DOjmUK6kVdiJE6NS+fc= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-70-Z9B4jUr-Os2TtgLe2wyiLg-1; Sun, 15 Mar 2020 19:58:10 -0400 X-MC-Unique: Z9B4jUr-Os2TtgLe2wyiLg-1 Received: by mail-wr1-f72.google.com with SMTP id g4so474645wrv.12 for ; Sun, 15 Mar 2020 16:58:10 -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=OTAkvp+UIu0li7JE8XuABf9SXmqEcQOx5Vqcp1Jmo2A=; b=MLMr4gnQ2KK9njmG8z2bgUCaCdH1S+6pSbx6xfW/C4BmkXd6W9VASmI3ADw7IpEqZh fJwpbJAfjAVMKpsq1IQiTMcgav/ePU/971CmUsDgd8s6Ogcc4mJh2tgpO/oL4KE4cmT/ VcsoOLvhuTOhEzWvttrG1xWi14ERs3zm6bekmJv0B/pxTc5vFHU3tQaN5uWjvJS/30VV MkpAaQ/+jxE6LcSqBmpAzGfhJ4H/5MDJ6ULPZsFLxn5pvF58juBCSXYjFL08oRgM0lP7 6daZfIu1MKBIwht2M1hWH+9aO4BWMwJG/eIG8inea2RNiTPWiZsMlhxSWGM14zwOAydC EeZg== X-Gm-Message-State: ANhLgQ0JWhSEoLnsk3ZDlM/qvyMf7xyT/wnR8gThNN5FZPb2dNo8opF1 MZ44lDk/1tA6rw/aF1im0Tt+lu6ZNVA4wxMa8kjAvyBYIMbc9fdtdsTH+3Cwxxr0EmbXJFu8MPm XDnao0LD4YLKk/pI= X-Received: by 2002:a7b:cd13:: with SMTP id f19mr25137796wmj.10.1584316689384; Sun, 15 Mar 2020 16:58:09 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu0f1L96zFMffMbFE774ZSJEzFMM9nUowdLFwMr3G3FVbBDk7Pl/gXiOUgxXlp3/SqIGadvww== X-Received: by 2002:a7b:cd13:: with SMTP id f19mr25137782wmj.10.1584316689224; Sun, 15 Mar 2020 16:58:09 -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 b82sm21472374wmb.46.2020.03.15.16.58.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:58:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/12] arch_init: Remove unused 'qapi-commands-misc.h' include Date: Mon, 16 Mar 2020 00:57:13 +0100 Message-Id: <20200315235716.28448-10-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.120 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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Commit ffaee83bcb2 moved qmp_query_target but forgot to remove this include. Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- arch_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 705d0b94ad..074fa621b6 100644 --- a/arch_init.c +++ b/arch_init.c @@ -27,7 +27,6 @@ #include "sysemu/arch_init.h" #include "hw/pci/pci.h" #include "hw/audio/soundhw.h" -#include "qapi/qapi-commands-misc.h" #include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" From patchwork Sun Mar 15 23:57:14 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: 11439517 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 8409C92A for ; Mon, 16 Mar 2020 00:36:33 +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 5384520674 for ; Mon, 16 Mar 2020 00:36:33 +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="CPX7e0nw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5384520674 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]:60792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdk8-0000gT-5A for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44554) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd99-0003Yc-Ag for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd98-0001Yv-7C for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:19 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24304 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDd98-0001XM-33 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316697; 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=rlwvTfWdlege7GScVPmVC823d5hwqV7V8ZFGgb3kNWU=; b=CPX7e0nw4luZQV3/DU88h2cVhsOhTV8jVYnHc7Gb+QnR6V6VPr7dLRWHZkVoX0nlLHot0U RRY0Cskx9I/kNcTEfdLuToqT4xlaF2uRZVyyna0VbtTV5MOKyv02tNzuDVM63fuolrwH0f Kw6gDXpwHFLxtq93B5Z879FzbKO2T4E= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-FWaZqvtVNQaFWOtcLlxFlA-1; Sun, 15 Mar 2020 19:58:16 -0400 X-MC-Unique: FWaZqvtVNQaFWOtcLlxFlA-1 Received: by mail-wr1-f70.google.com with SMTP id o9so8139312wrw.14 for ; Sun, 15 Mar 2020 16:58:16 -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=LM2hbE7ibTJgNB7j2Une2S4sO88fnFzm04CEg7ESeAA=; b=RX5mZORo47QZA4GnlwEY4K7ZKPj4aG61+Q1h4Kdbn44MivdPxML/KWessOr/4B1789 ar9MrN7LhOwLQapHzRzWC6/8bIJof+7c0S3hm3sLkR9yjkj8+c2EbuPleISk6pH8l6Bv jshD7PzxbB3Vkoaq8xcUbQ78wN9EfT5Ky0Ld8j3OjP3Fe/1d+cenq+CVNzY1yI2XOr1s dIN0O6cax9Tlyaz7CnSwA2xFCisy2EIlbCekv37re7g2AVP3ZdRNhsLhvrS0iN4PbXCd mq1qd+SnfnxZC0BS81eRcGlvRVesgPnFwly2J8BmX6rSwVPQwmM50L4fFP9vEZ1h60y/ cgow== X-Gm-Message-State: ANhLgQ0lwHshEiKAiMLn0jDRESxsH5XXJ5GFYHmRPpKhsxPESPDrnZya 5l16p5e5zqN0V6BmRcNK0sZM9B2ppmlVGhpO/ebK7YEezBF3+HT03VFb+cffHI8QNneiOqUMASs K6IWuLI/s4bW51Vc= X-Received: by 2002:a1c:9658:: with SMTP id y85mr15033361wmd.63.1584316694981; Sun, 15 Mar 2020 16:58:14 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvF+IgZfR7MEY3aZqP73j5Vu/iWzP7jnsDEv7kURy9sfgCgbdaobwONGaF31LtfOgY9OJtv5Q== X-Received: by 2002:a1c:9658:: with SMTP id y85mr15033342wmd.63.1584316694832; Sun, 15 Mar 2020 16:58:14 -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 s7sm16458227wri.61.2020.03.15.16.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:58:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/12] target/i386: Restrict CpuClass::get_crash_info() to system-mode Date: Mon, 16 Mar 2020 00:57:14 +0100 Message-Id: <20200315235716.28448-11-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.120 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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/i386/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 92fafa2659..a84553e50c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6778,6 +6778,7 @@ static void x86_cpu_register_feature_bit_props(X86CPU *cpu, x86_cpu_register_bit_prop(cpu, name, w, bitnr); } +#if !defined(CONFIG_USER_ONLY) static GuestPanicInformation *x86_cpu_get_crash_info(CPUState *cs) { X86CPU *cpu = X86_CPU(cs); @@ -6821,6 +6822,7 @@ static void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v, errp); qapi_free_GuestPanicInformation(panic_info); } +#endif /* !CONFIG_USER_ONLY */ static void x86_cpu_initfn(Object *obj) { @@ -6866,8 +6868,10 @@ static void x86_cpu_initfn(Object *obj) x86_cpu_get_unavailable_features, NULL, NULL, NULL, &error_abort); +#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "crash-information", "GuestPanicInformation", x86_cpu_get_crash_info_qom, NULL, NULL, NULL, NULL); +#endif for (w = 0; w < FEATURE_WORDS; w++) { int bitnr; @@ -7180,7 +7184,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->cpu_exec_interrupt = x86_cpu_exec_interrupt; #endif cc->dump_state = x86_cpu_dump_state; - cc->get_crash_info = x86_cpu_get_crash_info; cc->set_pc = x86_cpu_set_pc; cc->synchronize_from_tb = x86_cpu_synchronize_from_tb; cc->gdb_read_register = x86_cpu_gdb_read_register; @@ -7191,6 +7194,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) cc->asidx_from_attrs = x86_asidx_from_attrs; cc->get_memory_mapping = x86_cpu_get_memory_mapping; cc->get_phys_page_attrs_debug = x86_cpu_get_phys_page_attrs_debug; + cc->get_crash_info = x86_cpu_get_crash_info; cc->write_elf64_note = x86_cpu_write_elf64_note; cc->write_elf64_qemunote = x86_cpu_write_elf64_qemunote; cc->write_elf32_note = x86_cpu_write_elf32_note; From patchwork Sun Mar 15 23:57:15 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: 11439525 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 BD4E7921 for ; Mon, 16 Mar 2020 00:45: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 8EFD3205C9 for ; Mon, 16 Mar 2020 00:45:03 +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="fwk83lO/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EFD3205C9 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]:60844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdsM-0004Z4-E8 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:45:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44751) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd9G-0003by-6v for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd9E-0001rc-QB for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54783 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDd9E-0001mF-MD for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316703; 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=3JmRVORiwtSJYoBeVoEmrby0Y//1T3rIJ9u2/7gHdTQ=; b=fwk83lO/KArHGu4feF0n0mX1Ygrf1lGxYD6jYvpEjWkI7xQlo7QWkO/ymB7BCQyAHS+yba /cpCvzcv7tzElVsmd6l5n4a4rQ3oLBU/2fVl8h1d8nYYrySdJLZuLYAm1DtFJz9KEPYhnD zq9LvfDt32u3B7z6yLp3vJV/rKwuiJ8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-235-YwJyPUERPmSiKtGhWkRfrQ-1; Sun, 15 Mar 2020 19:58:21 -0400 X-MC-Unique: YwJyPUERPmSiKtGhWkRfrQ-1 Received: by mail-wr1-f71.google.com with SMTP id t4so3827391wrr.1 for ; Sun, 15 Mar 2020 16:58:21 -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=VzAQhG80aIS2pHeqGJ8SUFQpAwQC6Y9ca6wH6S2kkG8=; b=ZFpCdATelIIj8HY6cx4KQHI1fvoVePVBFNWBmQoW1RQhcOKb2TCRktPU0iS3rKfhvB 0a0Ufu6JJ2v9s0dy03/xQV5TH8UG/1yHusQUThX/AhVe3BRYwFYMlkRRYxrh0FEfWfG5 jN/HSx/54f+SwG5PrtbHcy8sO2n/JzvRUf25kSae91icZaUtQJRWDUpIHir0C2esNHIP LfuaYTkQ9E6hDU+K2o7bzEmgeP7Hl8gvm2FVc0domzHpTQfehtVeJx2HbI1LtTouW7uL 4PiJVYqEawY/GsdNOUiQ6/aUrVpxDd7/MEmW9xaWvoBS7gGrqDJ3+8k0Pgv6/K48wsL9 yZGw== X-Gm-Message-State: ANhLgQ2P5eoF/Y+a17aNOTHq3MOvWWsI2tbgQ6VMwMkRDUG8WM/aVH8M P9+NBKKe/nfXOU+eU3t5iALTKuqCp0ed0pwhsBIZCHHNR9Hijvrs03VNiK9+tnmw3ZbXPV8dPSu Xh2mLnvTl23Sdxi4= X-Received: by 2002:a5d:4388:: with SMTP id i8mr5029530wrq.216.1584316700446; Sun, 15 Mar 2020 16:58:20 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtQXQGnsDnvfo8vXPLk0j7sOLWRgY/ZMyjsH25ihuzIAGUbzZQXVi5i2lHKb4KMCnPUimR/DA== X-Received: by 2002:a5d:4388:: with SMTP id i8mr5029512wrq.216.1584316700239; Sun, 15 Mar 2020 16:58:20 -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 s22sm25922805wmc.16.2020.03.15.16.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:58:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 11/12] target/s390x: Restrict CpuClass::get_crash_info() to system-mode Date: Mon, 16 Mar 2020 00:57:15 +0100 Message-Id: <20200315235716.28448-12-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] [fuzzy] X-Received-From: 207.211.31.120 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: Eduardo Habkost , David Hildenbrand , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/cpu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 3dd396e870..3b1377c20a 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -237,6 +237,7 @@ out: error_propagate(errp, err); } +#if !defined(CONFIG_USER_ONLY) static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs) { GuestPanicInformation *panic_info; @@ -246,11 +247,7 @@ static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs) panic_info = g_malloc0(sizeof(GuestPanicInformation)); panic_info->type = GUEST_PANIC_INFORMATION_TYPE_S390; -#if !defined(CONFIG_USER_ONLY) panic_info->u.s390.core = cpu->env.core_id; -#else - panic_info->u.s390.core = 0; /* sane default for non system emulation */ -#endif panic_info->u.s390.psw_mask = cpu->env.psw.mask; panic_info->u.s390.psw_addr = cpu->env.psw.addr; panic_info->u.s390.reason = cpu->env.crash_reason; @@ -276,6 +273,7 @@ static void s390_cpu_get_crash_info_qom(Object *obj, Visitor *v, errp); qapi_free_GuestPanicInformation(panic_info); } +#endif static void s390_cpu_initfn(Object *obj) { @@ -285,16 +283,16 @@ static void s390_cpu_initfn(Object *obj) cpu_set_cpustate_pointers(cpu); cs->halted = 1; cs->exception_index = EXCP_HLT; +#if !defined(CONFIG_USER_ONLY) object_property_add(obj, "crash-information", "GuestPanicInformation", s390_cpu_get_crash_info_qom, NULL, NULL, NULL, NULL); - s390_cpu_model_register_props(obj); -#if !defined(CONFIG_USER_ONLY) cpu->env.tod_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu); cpu->env.cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu); #endif + s390_cpu_model_register_props(obj); } static void s390_cpu_finalize(Object *obj) @@ -477,13 +475,13 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) cc->do_interrupt = s390_cpu_do_interrupt; #endif cc->dump_state = s390_cpu_dump_state; - cc->get_crash_info = s390_cpu_get_crash_info; cc->set_pc = s390_cpu_set_pc; cc->gdb_read_register = s390_cpu_gdb_read_register; cc->gdb_write_register = s390_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = s390_cpu_get_phys_page_debug; cc->vmsd = &vmstate_s390_cpu; + cc->get_crash_info = s390_cpu_get_crash_info; cc->write_elf64_note = s390_cpu_write_elf64_note; #ifdef CONFIG_TCG cc->cpu_exec_interrupt = s390_cpu_exec_interrupt; From patchwork Sun Mar 15 23:57:16 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: 11439499 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 407A11392 for ; Mon, 16 Mar 2020 00:08:09 +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 0BC32205C9 for ; Mon, 16 Mar 2020 00:08:09 +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="YnBHgvM5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BC32205C9 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]:60562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdId-0006xz-V3 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:08:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45339) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd9i-0003oH-Hi for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd9f-00045a-BM for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:53 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21648 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 1jDd9f-00043b-6n for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:58:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316730; 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=QIpLs9OctqCuKos7ZiUUzN2VPTQfmDm1r4MzNZjOnFQ=; b=YnBHgvM5k64AoOpqfTBJRQTWy8sYp96qEOVsYs7pOfEGhI/d7l3snQ92C1AQ33s7WPzd+p vrgaO6r6L03xgavih1A6c36zr8eHyN76Rmu2yPezglMdkvH4PQNoATwGkzqNyULtMQ9+b9 gomih7Gs+063d90VWytck6MgGMjzAKE= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-UK6YRZgBP-iVjpdHgUNKVw-1; Sun, 15 Mar 2020 19:58:27 -0400 X-MC-Unique: UK6YRZgBP-iVjpdHgUNKVw-1 Received: by mail-wm1-f69.google.com with SMTP id a23so5014557wmm.8 for ; Sun, 15 Mar 2020 16:58:27 -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=uY3oKl3eAdfHR0fz6PQrp/bV3LAJ2aY0H7iSeuB//0A=; b=YmS9XcQVI41JENx9F0fxM6nCQNaqfde5vJNub4XbsfYGYyjEIWCYTZP6slD0qQNlsO Sjzqmvdb6t7D/CQlm+cX3YZOZSQulXMOBseoaxW2L+X0NEHCgboIn/IVOPJLS0jv1g66 WqCn8qt832iEvDVaRRoRARpkT9utkvOsu3jUDsOMjmO53zK/oZXwslZq2XmzVyvBul6e DJNZCfypScvtJoO1bV74aGpC34jP4GmZtOl7tGRbpuhJUw+6sTgZtPIoibv44lyawy/B nhtY8Z1a1ndvluZdjMPfekLl/kRRHyuPdmEp+ebiVT58gCZ7qW7pcURBMUfJEFQmNwGO Jm4A== X-Gm-Message-State: ANhLgQ2AgZMQtBi53d1Q20w0quK9hSmcrwAAEzH50l9hNyY3UAP92Kio Idr+PfkcPTipY/Y0DH6X0l9vMFQZfgByxoLpHzapd3n1Gc3ITqF3EWg1v9ppxY2IyRyhhUJN1s5 z3zlqkPcH5DATazc= X-Received: by 2002:a1c:80d3:: with SMTP id b202mr9850983wmd.16.1584316706062; Sun, 15 Mar 2020 16:58:26 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuFSZ8a1xPKoAUJpUTBbcg8KqBFak+jSDu0iodws8OyRXOif1AhfUVCzYL+udH7kIdblowc1w== X-Received: by 2002:a1c:80d3:: with SMTP id b202mr9850950wmd.16.1584316705755; Sun, 15 Mar 2020 16:58:25 -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 p10sm90850559wrx.81.2020.03.15.16.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:58:25 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/12] hw/core: Restrict CpuClass::get_crash_info() to system-mode Date: Mon, 16 Mar 2020 00:57:16 +0100 Message-Id: <20200315235716.28448-13-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: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/hw/core/cpu.h | 7 ++++++- hw/core/cpu.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 73e9a869a4..48ab5ec3ed 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -492,6 +492,8 @@ bool cpu_paging_enabled(const CPUState *cpu); void cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list, Error **errp); +#if !defined(CONFIG_USER_ONLY) + /** * cpu_write_elf64_note: * @f: pointer to a function that writes memory to a file @@ -541,6 +543,8 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, */ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu); +#endif /* !CONFIG_USER_ONLY */ + /** * CPUDumpFlags: * @CPU_DUMP_CODE: @@ -634,7 +638,8 @@ static inline int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs) } return ret; } -#endif + +#endif /* CONFIG_USER_ONLY */ /** * cpu_list_add: diff --git a/hw/core/cpu.c b/hw/core/cpu.c index fe65ca62ac..debdd7e670 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -209,6 +209,7 @@ static bool cpu_common_exec_interrupt(CPUState *cpu, int int_req) return false; } +#if !defined(CONFIG_USER_ONLY) GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); @@ -219,6 +220,7 @@ GuestPanicInformation *cpu_get_crash_info(CPUState *cpu) } return res; } +#endif void cpu_dump_state(CPUState *cpu, FILE *f, int flags) {