From patchwork Fri Mar 13 18:36:39 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: 1254586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bQMb23M2; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fDw71BqZz9sPJ for ; Sat, 14 Mar 2020 05:37:59 +1100 (AEDT) Received: from localhost ([::1]:35030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpC1-00006V-1B for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:37:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53164) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBB-0007iy-1D for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBA-0002La-06 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:04 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:50166 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 1jCpB9-0002Kw-S0 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124623; 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=iLgNrlwyJy7v8dAuschP4PozhwWEQ5HJ4QmdriYy9Wk=; b=bQMb23M207hIcpVi5QiqHVvpE0xEBc7ll30X/Rcq36qj+a1YFIaRoppEIlRxaB8IktYjIl HP8NHthelRkMBeJdQVbE/A0gscKbRsDAnNkz1SRU9d3Z5uMWCJ5JT5Um+VwyYIUmq8TyK/ U7W+JzBmrY+vwOaJPoQ5O0n9ohV98nY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-399-PDyaD2xXPeKshdZ-N_d6Hw-1; Fri, 13 Mar 2020 14:37:02 -0400 X-MC-Unique: PDyaD2xXPeKshdZ-N_d6Hw-1 Received: by mail-wm1-f71.google.com with SMTP id n188so3800907wmf.0 for ; Fri, 13 Mar 2020 11:37:01 -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=moZeqK0xvieWMnbLXAu30p4QSLVxENxO9B1zIYBPdN0=; b=Ftk8Jg25SywyhvczlKAckLJ+ejzu1qwuuPp7qZxTQ5Zs/fylVHtzEXnQKG3bMrsOTH Qy71B9Lf8X/k9Jaz9qzlzwOHjds8MP5wOBxmrLmPicOIEC0QQI6zGKKlmzlU0KYcsurq PtGluQD/Dn1RJq4J/pUrDw8SVZM8giOqi+sl7Wrr4QX7f/pcw1ZZa0dUI5+uDzLDgTA9 GLQ+QkLE1bF2/wFUCsU/V2UmMLTt+xfoblCaBK4gG2JMXfPzwKlKMfmLT/7NB+iNOqTy L9E+cAiw60xzro3aqkmm2EwLxh2NmqRuAecnxHfS67nMIQxp4NNhT5RFYU8GXcgpvB53 Tu8Q== X-Gm-Message-State: ANhLgQ3NF7/5yaOC9bdIFcBPgBmj6UMTl6NGpPblldKPCwbDb+gF6Xig HJaImi1MXjApD3DcY80+Tu7MF72gtUg54YCrvHXlbyN2C2smwV9BaLxIIt8sj1DRQjNEpzf+Vhn c2KYPw04At+tS98k= X-Received: by 2002:adf:9364:: with SMTP id 91mr18691350wro.223.1584124620540; Fri, 13 Mar 2020 11:37:00 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvLDAdBf5CysHXDLa59Zq3LkeNJxBty6UOuXhAtFGkATum/4g3WahoH0bLSPvYFQI4SzHF95Q== X-Received: by 2002:adf:9364:: with SMTP id 91mr18691318wro.223.1584124620383; Fri, 13 Mar 2020 11:37:00 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id g12sm6334174wrm.87.2020.03.13.11.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:36:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/14] Makefile: Only build virtiofsd if system-mode is enabled Date: Fri, 13 Mar 2020 19:36:39 +0100 Message-Id: <20200313183652.10258-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Do not build the virtiofsd helper when configured with --disable-system. Signed-off-by: Philippe Mathieu-Daudé --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7df22fcc5d..ed77b6e50b 100644 --- a/Makefile +++ b/Makefile @@ -346,8 +346,8 @@ vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) -HELPERS-y += virtiofsd$(EXESUF) -vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json +HELPERS-$(CONFIG_SOFTMMU) += virtiofsd$(EXESUF) +vhost-user-json-$(CONFIG_SOFTMMU) += tools/virtiofsd/50-qemu-virtiofsd.json endif # Sphinx does not allow building manuals into the same directory as From patchwork Fri Mar 13 18:36:40 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: 1254589 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=a1ctCp12; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fDyC1KdVz9sPJ for ; Sat, 14 Mar 2020 05:39:47 +1100 (AEDT) Received: from localhost ([::1]:35166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpDl-0003NE-2q for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:39:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53291) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBH-0007qr-Qz for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBG-0002Sx-RE for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:11 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36390 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 1jCpBG-0002Rp-N0 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124629; 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=QzUdM1ZagK75BIGV+iiLIHXu9NBWzrOD4R++sxCHDoI=; b=a1ctCp124O9hJqJJ8pgJgQiCBuXhNXYkVltnflY4kyudFl5yOgQ7sk711H2R0IpKWzkza/ MsZhzz/Vt1T7yrl1/ikKJ9jHW46Uv1ituvYlTgpNcLYOWaoMOEXHld1a9RasmUegaD76is F55uCaUKvqO7ryW4JLskDQ9KWLzFLzk= 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-47-ZxnLby-VO2qVP1Z5T_oLnA-1; Fri, 13 Mar 2020 14:37:07 -0400 X-MC-Unique: ZxnLby-VO2qVP1Z5T_oLnA-1 Received: by mail-wm1-f69.google.com with SMTP id g26so3289630wmk.6 for ; Fri, 13 Mar 2020 11:37:07 -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=intvWc0QjhhlSzR1IDRa0EVk0LsfQ2/cVL2atlURA2k=; b=DwBE9hwkFblBjhws8Oi1Xcpd4SDZerCCuQOMT+afxdbV46eYp7358RtXcni2fvXXm+ XsqK0FFr3bDJtG3q7BrI+LjSRiJi2tHbE/muGBKoqXD2N/YdYlpJf0ceZx+jaq2ZKQPR XLY1CVMk+zgw0UWn4CWbtzTH4Hx5egM2RXnoqVO1WUXjnG9PgkcEJ7+dyD0IUjOU+zKa TrRqh2gwwW0ghcpUrSWwoLBLmKTySRX3WCnCqFawD03Dyg26rFOZlE9awfr+375/HV1I tMAs6AaP8ixnEfW4e/6OLD84JMR5n1P8firBTEaJ7asRvRa/CAH4BZ3rk91QzmG03pCb YkpA== X-Gm-Message-State: ANhLgQ0RWMp6oAGvgFAurZ9eCd4jbhGBPROsd16ITF5cKac5qym2ykja gS0yQcsBq/o/rrM4rAm+4MOTueZjDIFI3Ao16BRv1hY4cZWbaU+4GM8FTPrF4UOnpL+DtNe2ipl FXX7kexsEohyM+vk= X-Received: by 2002:a7b:cc06:: with SMTP id f6mr7730339wmh.65.1584124626711; Fri, 13 Mar 2020 11:37:06 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs6LWJfbWP4kFQvfej2dGXUhXsnUPkGfYqWd+58D4W2bm/r9A5Xs2YTAiB5KtkiaaAcwYQ9sw== X-Received: by 2002:a7b:cc06:: with SMTP id f6mr7730297wmh.65.1584124626502; Fri, 13 Mar 2020 11:37:06 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id 62sm27365177wri.30.2020.03.13.11.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 02/14] configure: Avoid building TCG when not needed Date: Fri, 13 Mar 2020 19:36:40 +0100 Message-Id: <20200313183652.10258-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:41 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: 1254590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MY+FZcjw; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fDyN3dmcz9sPF for ; Sat, 14 Mar 2020 05:39:56 +1100 (AEDT) Received: from localhost ([::1]:35174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpDu-0003lx-B2 for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:39:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53468) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBM-00082e-CN for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBL-0002f8-B3 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:16 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39149 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 1jCpBL-0002dj-6Y for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124634; 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=S10AEwUkiwmQGgsU4J5LemLC20/NIYdtHAyFHsvDHiI=; b=MY+FZcjwk7C7bWDPDheuzYTMuaZLybStMwDO4Pw1owHauYQj8upz3KQ0QQWJxw0ojuQkE1 6KJSG58nUkAGgR+P5IQFXyl/YoEJx1FTcNl/qDY+GbzXYRUMA4ivbrbBnirRlv+iijxjuV j42OiPk0I3rtuCMYtpTADx3G9gQ7GQw= 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-49-0ifv3u-dOkiKfaJSF3jy_w-1; Fri, 13 Mar 2020 14:37:13 -0400 X-MC-Unique: 0ifv3u-dOkiKfaJSF3jy_w-1 Received: by mail-wr1-f69.google.com with SMTP id c16so4756767wrt.2 for ; Fri, 13 Mar 2020 11:37:12 -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=i8/Rx/aNeBnn+CcI3JJAXpd+80BCLbOpEr5mf5Uimz0=; b=PnCHrg/ce7AxejIoBxj8ZzBbDMTK0T/c5LncK/bIfGEJQyVSwWCyjw+9KOKzf2zADK M4OPODR6CiEiqyqtNmXN3NuEKTiBFX3PId7h9BSV/H1eaw1aXEM0N/tCc7g8NT4sIrrL D+9r7P8x0HSU1DAs8f6wdcusYsew3i7bdpYrqI5AF1GxARHmi7+zszBV+iXa/F/9Rci5 pxqjJdq2a2nINjhs4Zk4JpKVDvbxPDkDG+H40PW1R+4HX9WMy2hjgWoTiJu2Z0aSA3Rs oC4O4+H0Qag90jtNJ8ni/bUf7+xtQVztlDho1frEZR8evcZQoXCBM7zawPj6HWqTzjPv 9l3Q== X-Gm-Message-State: ANhLgQ1v5zcL3uQxtxkJM883Rm7hOp4gwnX6uP1Htbaly2fol0E3fFcy lbvfVA0S16i/TgOwdBpnK0WiLfXnN1OtaeM0Quqf+qPIXqGV2Uzi9MyPgJGYFYmJ84+JfqhxyiL LZ4GZrCu2BoXz3Zc= X-Received: by 2002:a05:600c:410b:: with SMTP id j11mr12489601wmi.86.1584124631693; Fri, 13 Mar 2020 11:37:11 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu/qxzsZj4OctuTP1fk9ERHzqfCWjsfuuUpA+8Y3q0rSgZ7lUB+w0i6WGOhrqKLGDzRhHNS3g== X-Received: by 2002:a05:600c:410b:: with SMTP id j11mr12489569wmi.86.1584124631400; Fri, 13 Mar 2020 11:37:11 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id q13sm29664354wrs.91.2020.03.13.11.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 03/14] tests/Makefile: Only display TCG-related tests when TCG is available Date: Fri, 13 Mar 2020 19:36:41 +0100 Message-Id: <20200313183652.10258-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:42 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: 1254592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZMyDN7n3; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF1F2wwyz9sPJ for ; Sat, 14 Mar 2020 05:42:25 +1100 (AEDT) Received: from localhost ([::1]:35240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpGJ-0000DU-7U for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:42:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53660) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBS-0008G3-3z for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBQ-0002xo-Jr for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:22 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55936 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 1jCpBQ-0002xC-G7 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124640; 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=8aoJLCXCrlxs+uxn6Eno2ayGO83+rkYY4ustjsPF1ac=; b=ZMyDN7n31T2NarG4yj86Dv7yd18T4TR/qmbPZ9BmPYPMK7PVKMD6cYU/+SqOpQvf7ysCfz z02EtGhbXtSxHBSQhqbjXFDbw0pg1sNlBKqQc4hR1hSycqsujx6e0dYM/SptjA/6zSY3YO M5IMwC+KwFfQ40OHFvplNwDgx91HZcw= 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-380-uaRWfU3NM8KwtL9Hq5BOpQ-1; Fri, 13 Mar 2020 14:37:18 -0400 X-MC-Unique: uaRWfU3NM8KwtL9Hq5BOpQ-1 Received: by mail-wr1-f70.google.com with SMTP id p2so2183142wrw.8 for ; Fri, 13 Mar 2020 11:37:18 -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=yX3/yxF6EHlmvUP2BbzjjZIQps3yYgRSbpFFIqc8F/E=; b=XEbuRm+OsaYMNWfLL1L1TuyBSquep4qI+VXc1DIV0LsQaOpxxp8jv5NoAUd1ul28Ku rllZtmWueDwlVhqC9Gb22h4Mpf/sma2qUkH6uzMPUaS5lRGCedTu5nP/xA0VlVeJiCCc G2mTbxhzjdoXGn9FW7WBWiEpK62cLXZaD8WpyrcXYJKGw1fGw26/LobiqlbKxSrQEGOD en1ZVz10TFDOeAAiKLPcJwxTfWBY2CURZthOhLAJvUfZLRCuvfVMeWEAqDcXXOurmObW UEl2lMl97uSAQueoC8SFyRHYu18ezbhpi2+Sn2Upr/P+GxhoGssotMEcnPr3O1ceQX1+ 42Iw== X-Gm-Message-State: ANhLgQ0JqDpqTnPceoFDRwllyocf58NCchsEdo7sVczin5qgNhTFMzHZ VnEDZEosDV+WzSkUHwkkKyhjTEIwkFCSktKXL8O0iyZhaMSljnEkO9GtX0a03FLjaLYj+Q39kVO j/oQpqGqaB7THHtE= X-Received: by 2002:adf:f58f:: with SMTP id f15mr20039034wro.16.1584124636775; Fri, 13 Mar 2020 11:37:16 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs+YASwG+nS4kzBdGtTjiJzofimMO54RlgalOMRsiMkPw/ith6XkJN27+mO5FmTGtPyElY/Jg== X-Received: by 2002:adf:f58f:: with SMTP id f15mr20038999wro.16.1584124636423; Fri, 13 Mar 2020 11:37:16 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id m11sm33980849wrn.92.2020.03.13.11.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 04/14] tests/Makefile: Restrict some softmmu-only tests Date: Fri, 13 Mar 2020 19:36:42 +0100 Message-Id: <20200313183652.10258-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These tests fails when configured with --disable-system. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Tested-by: Richard Henderson --- 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 Fri Mar 13 18:36:43 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: 1254593 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=durJYdeU; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF1F4NBKz9sPR for ; Sat, 14 Mar 2020 05:42:25 +1100 (AEDT) Received: from localhost ([::1]:35238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpGJ-0000Ct-G6 for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:42:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBW-0008Qd-Jv for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBV-0003DR-BF for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:32628 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 1jCpBV-0003C0-6P for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124644; 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=RNscj4znfEFoxUyR2eitCsjwBW0o2g2YBibwWrrvxzw=; b=durJYdeUM0TRBu/gX3dQnZSfpWgVA+KuxLKRqqPerXzuBOLEUxtuNfXI7+XyZTlqzTIwKD Et6XJYdkmn/j6YqAigDT3MweTAl9SyC11/A/CUQcgU5QOA+prrPXKiR3KN1CdmkpbzE/pE 4tLDuq6DiH6Vy2reIh7qsYa+1V1kL/Q= 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-429-vw2RxISwP1yLFu33rPkvnw-1; Fri, 13 Mar 2020 14:37:23 -0400 X-MC-Unique: vw2RxISwP1yLFu33rPkvnw-1 Received: by mail-wr1-f71.google.com with SMTP id x14so4684216wrv.23 for ; Fri, 13 Mar 2020 11:37:23 -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=UFdvn7QNDrVxUqibYwnc6bH6F2vFCMCHuZOu+Zd/Cpc=; b=RyPOiAlnsIMq2rFilZ1cL6TT3PFeCU2+9y/XHoenfP1d1PRV3rbsdrUOtab4rkxbuG 0LgA6KzOA9H7FWAz7zgQ46wYdhYR1wOSmKIGJb4cEsvREvHp7YmubPYdu3eZ4JTV/e50 a3YhsB9wsC9CEMn3LRSN+T2fONzYl758I1m6sx5lVx1EDPfTT6yUSqludpWZTMfvA/A2 4qW+6IbKCctqGRvqunqfMIZB0aBJVYGnlnY6nQVtufvo9OYqxrWZ2saIuDI769mhC+cL O4qn5F+o+YAirx0O7IInT7H4R1ff/kwUN6p1IzggjU9okijhYzFSTheS0eSJ0e0GMDuy hk5g== X-Gm-Message-State: ANhLgQ0Lte3xoUt4sIfxysUGYoq+393cU36xgLRLmzo7jsxiDcTewLeL MZ3N8o40ejteslSmj0TadVPSkB8m2xCB7D17wZtE+/U02YxpIntNBBWBoZDE7XpTE2Ynw7Tqh3n 8q6Q/wW+vrP5R/Ls= X-Received: by 2002:adf:ef92:: with SMTP id d18mr18557122wro.193.1584124641899; Fri, 13 Mar 2020 11:37:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtYmL5ub8rSmVi8dir3DAkQWGyPCni3RmNUQh9poMuQNlUlVUmlvaOCY/piDuFUDxUIHX22Mg== X-Received: by 2002:adf:ef92:: with SMTP id d18mr18557095wro.193.1584124641662; Fri, 13 Mar 2020 11:37:21 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id n2sm12942644wrr.62.2020.03.13.11.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:21 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 05/14] stubs/Makefile: Reduce the user-mode object list Date: Fri, 13 Mar 2020 19:36:43 +0100 Message-Id: <20200313183652.10258-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These stubs are not required when configured with --disable-system. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:44 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: 1254596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QYvSgVC4; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF4133m5z9sPJ for ; Sat, 14 Mar 2020 05:44:49 +1100 (AEDT) Received: from localhost ([::1]:35321 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpId-0004xt-7Z for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:44:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53979) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBb-0000CW-P4 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBa-0003Tv-Bh for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:31 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55067 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 1jCpBa-0003SW-34 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124649; 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=xgDberYaZDed20sm6tRRJ30h81E1DyL3M/u30/cftuw=; b=QYvSgVC4i9C16PK41rSbmKX1I7AI2CevaTwauULW1Zoz+6Lm7xsFkBPNvbmPFlu4YVJulC wO4r5ozCtYznCqxzpAoQ9zjCxamq8QsXAp0nHlkSEkPIvN7ilLvp20GQ5MX25eor1WjoXy vAQdenILRpj9nctpEdvTSzWxnW/Ej+s= 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-312--oaMDIgZNWCCohZj9yvPDA-1; Fri, 13 Mar 2020 14:37:28 -0400 X-MC-Unique: -oaMDIgZNWCCohZj9yvPDA-1 Received: by mail-wm1-f69.google.com with SMTP id s15so1719914wmc.0 for ; Fri, 13 Mar 2020 11:37:28 -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=RC71PykOebGOXBV3Avk2avLieaYMFi0EYKRjpxiFXHU=; b=FUVgfIB0s0fbN50aAbMrMR1UX4GkZ962SOayWvNLqUo+/T7MxaB+hGyweIcRrI5x9Q w852tSbHDHReKUoNIWlfMB6Bhq7EY/xfbJiyGCRhP/bKnEuoDawTiO2jVFXz/zKGi+W2 7cC4bNRYjNX3JN00G7pTX4rGKZZw2sPSXh3HzdQpHK57c0tsrGqOXyq0tt8P+/IK7yJ3 Mpkvi0VYqk9fuFte2fvBclGObqNB5hwNpg+KVpCT/bVaH6WHNY2JBiv6hL29w0QQn3Hq SdQ9yR8l2b5jaGT2SPup8Xhx9+07+lJ14QdurZM2HdgztwFLFy5XhomK6Ws/XGnIntYA 311w== X-Gm-Message-State: ANhLgQ13unAQIS/3tibnlTNWf9luTbthJVs5+tr2pfaa8fzaOjNOzPaG yVgOEUfnOzyX8BU+FeNvyLGxTRMPxRA/0mK5RJfJ2+FdbJO39GEumfxUhwk+zKjyz0NUspoS4rx kZMTDh+JnXADUl8g= X-Received: by 2002:adf:e4ca:: with SMTP id v10mr18665480wrm.305.1584124646870; Fri, 13 Mar 2020 11:37:26 -0700 (PDT) X-Google-Smtp-Source: ADFU+vujjgTFOCuWjS1sUnHVe14BjCxdTIeVV/2vuhZ1FIR92L6DidbJ7VLByJXmZrt1QAbjPTocEA== X-Received: by 2002:adf:e4ca:: with SMTP id v10mr18665462wrm.305.1584124646657; Fri, 13 Mar 2020 11:37:26 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id w81sm17726166wmg.19.2020.03.13.11.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:26 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 06/14] util/Makefile: Reduce the user-mode object list Date: Fri, 13 Mar 2020 19:36:44 +0100 Message-Id: <20200313183652.10258-7-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These stubs are not required when configured with --disable-system. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:45 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: 1254588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TFhdUo7j; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fDyB6B5qz9sPF for ; Sat, 14 Mar 2020 05:39:46 +1100 (AEDT) Received: from localhost ([::1]:35164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpDk-0003KE-Ov for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:39:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54184) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBi-0000Py-9I for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBh-0003pn-7c for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21198 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 1jCpBh-0003ol-3W for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124656; 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=pry6+pV8fUl3y5exktsH4W1Uxi8wrIUzy2x3T/v2sI4=; b=TFhdUo7jXxwE5RJBEZavz5j5k4w3O62mzUP7sI+L2WVZANUvPeCygGF5aoW976TbTw7ovp vGP1ugJnScUlyRcFg4SUusfNQNZIHQ8WfJ93f9Nvit5526v2ewsY0GnEIDuz2Lbbgbs8j0 mw8cJPZD4H/n9JUQTRy3fjMZBAhbUuc= 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-180-Cxawn8MnP3u-l34Xj_xAew-1; Fri, 13 Mar 2020 14:37:33 -0400 X-MC-Unique: Cxawn8MnP3u-l34Xj_xAew-1 Received: by mail-wr1-f70.google.com with SMTP id b12so4758392wro.4 for ; Fri, 13 Mar 2020 11:37:32 -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=GzR0VTVvQsF/hlsamkIvnRsrC8/9iy2Vlr1dz/V+KBw=; b=ba7nZKNyKwhFqzwt2Wc5KGN83SpnOaxKcP18MWMfuFSe9Wv6nMB3ArY7B2Z2ixEUMQ 3RHE6IFJPdaFsE0tKnEphN9GPFm0IFLkLDfdFD1JVDbSHKTJec62yMm+g+tZAMGCW4dl Za8/GHWtqhQ3C+Ud2RsFJqj2XQ8lVVO0dMfZuj4W84T7P8GVrhb+DclPkyswpOvxd5tk MsF/oxT5TxR0D4wz9SNlDVk3x6fGu+gLyzzT4ta7/H+NWGyqW39ayC2FXGICkq7tUwxQ EmwPKoRf/ZIvDChh1j7KFAGB8/kkj5VKPJWfPKw141R3Hw7qkCB1Icf/grZtp3+143JI nPNg== X-Gm-Message-State: ANhLgQ09xwQ1tKNmF0Qlwe1qCbXh8PFkENKqNvyijiYfksTCouTW/3j3 CrALL7NMCxiA2B/bj6HE8OdPpkIXMfMZnxYcKwmdz5oJQSPFpPBi2L/q7mDbpNOO7fgXB8LWbPd tgWijRK1vrEVCxTQ= X-Received: by 2002:a5d:660d:: with SMTP id n13mr18234112wru.383.1584124651689; Fri, 13 Mar 2020 11:37:31 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsXUbMgZopATF5ABmIQGcTP5jpwz9bFq/9SdX9Ao7M7bfLF6/N69ygmaZANBNBGhiIuInwKsA== X-Received: by 2002:a5d:660d:: with SMTP id n13mr18234084wru.383.1584124651541; Fri, 13 Mar 2020 11:37:31 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id p10sm16966938wru.4.2020.03.13.11.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 07/14] target/riscv/cpu: Restrict CPU migration to system-mode Date: Fri, 13 Mar 2020 19:36:45 +0100 Message-Id: <20200313183652.10258-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:46 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: 1254591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=g9gGj84U; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF121tl1z9sPF for ; Sat, 14 Mar 2020 05:42:14 +1100 (AEDT) Received: from localhost ([::1]:35230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpG8-0007pX-5W for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:42:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54298) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBl-0000YH-J8 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBk-00043x-MM for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:41 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:51630 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 1jCpBk-000426-I6 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124660; 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=3SuVECRO5K7Gvy7TFYYgJaxwMNPrKIUm0bQrl4kHjTk=; b=g9gGj84Ulvxt2KZyF2CkyZSWaV/fWRPQJFj755+pOqx6JOtdCUmh5YgEi6ksqyHNMuOsuU Nl+2zIi3gnw2cYoPO/GkfPQcYlT94OoxnKZwHpDSbFNulRRFR95Y6FmXJszxUATbx5zfqh dvpVDuvGtWS2rHnQqL37rQVvZMW9+ro= 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-283-FalTuHuPMT-YcUp342WQuw-1; Fri, 13 Mar 2020 14:37:38 -0400 X-MC-Unique: FalTuHuPMT-YcUp342WQuw-1 Received: by mail-wr1-f72.google.com with SMTP id t4so1772159wrv.9 for ; Fri, 13 Mar 2020 11:37: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=7qrHY3POAwgPR/yw4WHGaOw9mwemlFbyLT5p0JEbbnw=; b=EfXFx7gxBJiuAct8zVykw55RVGC4k8p1hU0xZ9iETg+hUSZZ+Wt0wlwfYjUGqv3jAw dQIw3KmFCQDbunaFRCxk+Mjsc0w3++TDs/TjwSGjz9Ccl4iUH9ir0oto+V1nDIL+P4dl YfJs1X6avd/JSUcKs9WGSkyeL/KpDa1kTFYEQqq07Ma/NSb3HJK5HBUOkEM6tTmiPNb9 Z/KtIyT6KAhu1TaRbhBJlmdgm454e+WRjZjvEfnhFbLQ2rflhqzYRoQ2hn4JbCgDIoSk PRzlkweSi8rqWSpugprqT77iHaeGE2LMiiBYJZ1vfX/EXNIxDWCVKS1X8CWB+q52Q88V En5Q== X-Gm-Message-State: ANhLgQ2g6pjWoIN1WAHnsugFycFGMCYAZw/RHL25PzAatfJsPsbdjclA LFSpiLyWk5Vr/zK+T3x3PU7U6xP3fVdXTNgPI42dZX2zOWdCI3zywQROFV2u/r53FBbvby3N43h 86EpEuJvFEhD4PqE= X-Received: by 2002:a1c:9cd1:: with SMTP id f200mr10863171wme.80.1584124656631; Fri, 13 Mar 2020 11:37:36 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvhA9+6w6SxST3JF6c4Ko2DAdhDZUQcupyXKHijFIIWpb7ZBMQOtnHcAwPsLhSqhwg+SoVqzw== X-Received: by 2002:a1c:9cd1:: with SMTP id f200mr10863153wme.80.1584124656402; Fri, 13 Mar 2020 11:37:36 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id b6sm24047514wrv.43.2020.03.13.11.37.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/14] exec: Assert CPU migration is not used on user-only build Date: Fri, 13 Mar 2020 19:36:46 +0100 Message-Id: <20200313183652.10258-9-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:47 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: 1254587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ca+yngGF; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fDx31fFjz9sP7 for ; Sat, 14 Mar 2020 05:38:47 +1100 (AEDT) Received: from localhost ([::1]:35132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpCm-0001Zn-Qp for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:38:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54435) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBp-0000jW-Tm for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBo-0004GV-W9 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:45 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:21882 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 1jCpBo-0004F7-Ry for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124664; 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=wGoD8B/E7ALRdyPVkuOPFi6qepohKGtXhwvJlBp3QNU=; b=ca+yngGFE8NxbkXX6oWqxkQjLgtLsN1q2EGwRkaZ48rMXvB2Gihl3PUUCDbIm9ebYKmf5q msnpwsJoFwUibjga7Oyqj1Ph+F96taRZfBs5aho1bu0jtXLlo1n872QPFYDl1GReA1S/k2 cFvqvkpogFSLiIMDVwehyF0EhSNTi2c= 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-91-BzChaShcOrOYDHknBqJgmQ-1; Fri, 13 Mar 2020 14:37:43 -0400 X-MC-Unique: BzChaShcOrOYDHknBqJgmQ-1 Received: by mail-wr1-f70.google.com with SMTP id o9so4728791wrw.14 for ; Fri, 13 Mar 2020 11:37: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=T76tUQ+vOJYR7iIj3p+P6wqlEgQ0pagAj6PhTCTXdsc=; b=LTgBObgnoPdc7jKxK/ILCb98m/9YuoN1wtkCxAFZzcNA7M4jzC7BGEmcgaSmhQGBv/ 6QpNfTFIAVgrWpsem6VSB9CL5Xuh5fgLZ9DHr3GtDp4oJiQkt/Sc3rkqM0QDO7b4P+uJ BPRR9ak5AoirKaS7JLvYS4ZoqnR2YqfQufUbbjJJUHiVQmbSwW1xEFnksm1VsGL9oMsp REsrsGMy+QrCN8JYROUMTbniloG0IlGk8NRP0O5H06qdEQYDbsuF7F98ZYYuZm9ng3Z7 lFOVIFKeHIt90uHA6R4vZWs0zBKO/3xEx3X7bGRPzo7Tkm5giK2JnaeWvMc6EC1Aqp+A MN5Q== X-Gm-Message-State: ANhLgQ150QQ+A9i0ewC5KDoERuMPFzmWEv40m8HgevrNkqDpSABBml5c HPcVBRlGHgOv5pggqloBhafogQQY1XtZ8ZGwBZxqeP7Y/bLAM/7HR1EFpPQKNFZiWYkQLwP+yN7 l2k3cfyXyDW6yRQA= X-Received: by 2002:a7b:ce94:: with SMTP id q20mr11560607wmj.157.1584124661706; Fri, 13 Mar 2020 11:37:41 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt55lOk8cq/FfDyGsqCjNX/EF/f1KG2Wt2coox2gOYadwCTOT9928FGmsSSu/bYROjhTtyiSQ== X-Received: by 2002:a7b:ce94:: with SMTP id q20mr11560582wmj.157.1584124661544; Fri, 13 Mar 2020 11:37:41 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id w10sm4132784wrr.49.2020.03.13.11.37.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/14] exec: Drop redundant #ifdeffery Date: Fri, 13 Mar 2020 19:36:47 +0100 Message-Id: <20200313183652.10258-10-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- exec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/exec.c b/exec.c index 7bc9828c5b..f258502966 100644 --- a/exec.c +++ b/exec.c @@ -185,10 +185,6 @@ struct DirtyBitmapSnapshot { unsigned long dirty[]; }; -#endif - -#if !defined(CONFIG_USER_ONLY) - static void phys_map_node_reserve(PhysPageMap *map, unsigned nodes) { static unsigned alloc_hint = 16; From patchwork Fri Mar 13 18:36:48 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: 1254595 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PUgg4MU4; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF3L6FJYz9sPJ for ; Sat, 14 Mar 2020 05:44:14 +1100 (AEDT) Received: from localhost ([::1]:35296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpI4-0003zG-Hm for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54629) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpBv-0000wj-0x for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBu-0004TI-09 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:50 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:36427 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 1jCpBt-0004SM-S3 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124669; 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=4rpQjl/4AvtYAvRXnGhGAakMCQznzosD1UbxsdwPAhc=; b=PUgg4MU4yaoTxeMJUx68Xa9xrhnB+Z1tqPpyhnGQ0vu5tiAuF6AcNWidFLHRpuT+cUMpr8 nqPoIuEot4mFX73dE5PCYiRvEJy99Xg8HjS6sm5OMImPkLcORy+5L0U6IQ+YC7QbrkL1pn 3J5KCLoGyMFx2vOkZaYo+uf+MLPO8fs= 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-153-g28bIXPYOfeXfWiBwTcHlg-1; Fri, 13 Mar 2020 14:37:47 -0400 X-MC-Unique: g28bIXPYOfeXfWiBwTcHlg-1 Received: by mail-wm1-f69.google.com with SMTP id g26so3290315wmk.6 for ; Fri, 13 Mar 2020 11:37:47 -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=5D+mNrA7Q9tvp/FL52Wgm2fEGpMf3trSL+14VYf2HSA=; b=BJi2y1PZ1MjrgqZ46pMyo3cNhGJPUCdV0gaMt3dUJsVeoggUTbHF3Tyx0eZHDZRQW9 wLIZTXBX3r6UVQOEphOoPWg6asWJeU2cNJ6ZC32ThMAH7QmljvB5EGQsWEc1tSgShyIQ NHVaeWyYf+RA67mfSuJ6WprLjXDzIizZJtdI11rODzxNAshwLkyg8PEkExQMARiPioKk U7iLGsUEowT97rLHZZdJsk0Wcxna8VNm2yDjYQewosWCWzeThzR9T76OQ9udhYuaEUw3 NPQBH92s5BGvre3J1mMH5F7U/IUjN7N0OJxkYzj8Z1GNe2EzOHSabiZxHf1wGPIfuct1 cE2A== X-Gm-Message-State: ANhLgQ1mPEOY6u45Q5TrdEsttXc+lEPuipxLjkWiSKY2giaU3k2RQxn6 FVIxT3Ealh1j8Kj0LTP4ivieEXaE4t82u53QZ+DZMRp06LOt9E654bmiB/9KzlC8zfmbc/JDmb6 uBGccXJ7GljtuceY= X-Received: by 2002:adf:b650:: with SMTP id i16mr7761467wre.316.1584124666611; Fri, 13 Mar 2020 11:37:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtbgojL+JELKTTQY7b07V5DyCa0cnA6l8unuf63XU4fZEe0G8Ebz0T4lqt+EoIkgCebb1/0fg== X-Received: by 2002:adf:b650:: with SMTP id i16mr7761438wre.316.1584124666470; Fri, 13 Mar 2020 11:37:46 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id n14sm6761179wmi.19.2020.03.13.11.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 10/14] arch_init: Remove unused 'qapi-commands-misc.h' include Date: Fri, 13 Mar 2020 19:36:48 +0100 Message-Id: <20200313183652.10258-11-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Commit ffaee83bcb2 moved qmp_query_target but forgot to remove this include. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:49 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: 1254599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=N3NLwkeL; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF712vwJz9sPJ for ; Sat, 14 Mar 2020 05:47:25 +1100 (AEDT) Received: from localhost ([::1]:35442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpL9-0001IP-A7 for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:47:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54801) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpC0-0001Bh-Mr for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpBz-0004lh-7x for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:56 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:43755 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 1jCpBz-0004kP-3j for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:37:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124674; 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=g6kDoneuZrMhDVCRmujvDk3IfPp3E6PHImkHQw061IY=; b=N3NLwkeLsHolGeQ7T3a6eo35xVaOMqEnSRhIHXXBtV7e0grtkpd6taBiMaL9q6/81M1R3r aTgI4fUeevRetrPB4sVpYEZvQ7JOlrHIm+ALrrW1HCplM90uWRKGl/dpUiTjnvI8HjogJU EuZnqVAYipAROp6hfggn2TKXLQJEWGA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-348-yTl5njkEMzGBHglAT7wzNg-1; Fri, 13 Mar 2020 14:37:53 -0400 X-MC-Unique: yTl5njkEMzGBHglAT7wzNg-1 Received: by mail-wm1-f71.google.com with SMTP id a11so1368629wmm.9 for ; Fri, 13 Mar 2020 11:37: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=iYsZ3FxrwnOLNhhBs5OQJLjNJeFk+YWQzk3XZ1uOqWs=; b=oH3qmI00m3mN3CK6VxRWDBhf2WdcAyIw+zMpP1pcPDDZJ52ybRb1cQJqcVz/SvalCB mWn+FR4dJLC6Ghfzeg39h+GbcNDQSgFf7xY9sbROuiMw0bveUnRd53cbr4weQMHit6o7 +miNvgaDWUD7SA5BHVYi2ob4cotb/sOPmyDwYv5q3RXtrONWf3gQNxN/HtI0gjtdgiPa ShHNUrVd8KpdLeKEg9+qI+kchBUOid03Q/7jESDXzdFbUjVAYLl6YSMIc0spmtPIJJON mdpXQzdDAn4hsV45JDSLD5EqumKFNCNpPeGYalgbNUTciHMsceNPfAx9XXgyJ7KdUU+3 X8QA== X-Gm-Message-State: ANhLgQ2GMGCsZZTwJpPr0mYRYjFGqw1jFLi4gNIejhegUcXMIjYAdcXE uMYqa+TmUxnnc76GDDb1XTaCUIy5h8h0atQ5V1KqFGpzrH3YC7S+gVf1cytsjbP23JdXNYB5sg0 hhWGwllzHR2YEj1w= X-Received: by 2002:a5d:574e:: with SMTP id q14mr18374374wrw.330.1584124671736; Fri, 13 Mar 2020 11:37:51 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuzB9FhPCxZc8c+0Bt5wwNy9uUOC87j76T5iMKQTrkMJKvPhtuZkOqXgFb/ot1hwBoMX14+LQ== X-Received: by 2002:a5d:574e:: with SMTP id q14mr18374340wrw.330.1584124671486; Fri, 13 Mar 2020 11:37:51 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id g129sm19273217wmg.12.2020.03.13.11.37.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 11/14] target: Restrict write_elfXX_note() handlers to system-mode Date: Fri, 13 Mar 2020 19:36:49 +0100 Message-Id: <20200313183652.10258-12-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- target/arm/cpu.h | 10 +++++----- target/i386/cpu.h | 18 +++++++++--------- target/ppc/cpu.h | 2 -- target/s390x/internal.h | 3 ++- target/ppc/translate_init.inc.c | 2 -- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 4ffd991b6f..8a22212521 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -958,6 +958,11 @@ void arm_cpu_post_init(Object *obj); uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz); #ifndef CONFIG_USER_ONLY +int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, + int cpuid, void *opaque); +int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, + int cpuid, void *opaque); + extern const VMStateDescription vmstate_arm_cpu; #endif @@ -982,11 +987,6 @@ int arm_gen_dynamic_xml(CPUState *cpu); */ const char *arm_gdb_get_dynamic_xml(CPUState *cpu, const char *xmlname); -int arm_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, - int cpuid, void *opaque); -int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, - int cpuid, void *opaque); - #ifdef TARGET_AARCH64 int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 576f309bbf..f25fe5fc7c 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1738,6 +1738,15 @@ struct X86CPU { #ifndef CONFIG_USER_ONLY +int x86_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu, + int cpuid, void *opaque); +int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu, + int cpuid, void *opaque); +int x86_cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cpu, + void *opaque); +int x86_cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, + void *opaque); + extern VMStateDescription vmstate_x86_cpu; #endif @@ -1749,15 +1758,6 @@ void x86_cpu_do_interrupt(CPUState *cpu); bool x86_cpu_exec_interrupt(CPUState *cpu, int int_req); int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request); -int x86_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cpu, - int cpuid, void *opaque); -int x86_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cpu, - int cpuid, void *opaque); -int x86_cpu_write_elf64_qemunote(WriteCoreDumpFunction f, CPUState *cpu, - void *opaque); -int x86_cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu, - void *opaque); - void x86_cpu_get_memory_mapping(CPUState *cpu, MemoryMappingList *list, Error **errp); diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index b283042515..b9fb76d0b3 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1225,12 +1225,10 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg); #ifndef CONFIG_USER_ONLY void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu); const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name); -#endif int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque); int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque); -#ifndef CONFIG_USER_ONLY void ppc_cpu_do_system_reset(CPUState *cs); extern const VMStateDescription vmstate_ppc_cpu; #endif diff --git a/target/s390x/internal.h b/target/s390x/internal.h index d37816104d..dcbd8d2065 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -226,9 +226,10 @@ static inline hwaddr decode_basedisp_s(CPUS390XState *env, uint32_t ipb, #define decode_basedisp_rs decode_basedisp_s /* arch_dump.c */ +#if !defined(CONFIG_USER_ONLY) int s390_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, int cpuid, void *opaque); - +#endif /* cc_helper.c */ const char *cc_name(enum cc_op cc_op); diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index 53995f62ea..768ec18a28 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -10902,8 +10902,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) #ifndef CONFIG_USER_ONLY cc->get_phys_page_debug = ppc_cpu_get_phys_page_debug; cc->vmsd = &vmstate_ppc_cpu; -#endif -#if defined(CONFIG_SOFTMMU) cc->write_elf64_note = ppc64_cpu_write_elf64_note; cc->write_elf32_note = ppc32_cpu_write_elf32_note; #endif From patchwork Fri Mar 13 18:36:50 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: 1254598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VM4bxa6D; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF5y3ph2z9sPF for ; Sat, 14 Mar 2020 05:46:30 +1100 (AEDT) Received: from localhost ([::1]:35388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpKG-0007xx-Cj for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:46:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54966) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpC5-0001Ol-HU for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpC4-00050q-Em for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36626 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 1jCpC4-0004zS-Ax for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124679; 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=JMDYkzt1lBUpYc+oo4cCc5AD+w7GESjUgDgAA86mAF8=; b=VM4bxa6DRv0uNq5P7wk/GXuYvq9XDuaYSHfKILQslr+GNq9SR7Qawv9pl1H1iqY6H8jQQm p/a3rl3ZZkTaHOCyIlzAIxEKjMrPlXyLkf9dxTjuipnkn2e18zIuULy8lcFEc0y8N1lhx/ umexmI5HMAsi+VmvxHfMdlrvRpFLlc8= 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-220-VRkWHfuEMXekQnZrAjC58g-1; Fri, 13 Mar 2020 14:37:58 -0400 X-MC-Unique: VRkWHfuEMXekQnZrAjC58g-1 Received: by mail-wr1-f72.google.com with SMTP id b12so4758883wro.4 for ; Fri, 13 Mar 2020 11:37:58 -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=IUJwu5mIghgObyHS7qfpHw05F+W1fo3IIale5ma1lsg=; b=VGUH3brrYyImdCzzzt0NPQ2LZt33ThXv6nAYus48ao51ZGSH8JUUPcc1CPADMIYF42 GRYf/980taCzc3r2thvhpdpWOzzK2Hbacb7m0Twj0tfXBSslF+jImyO5Nrg8Shf/2f7j vzEMTFxrXotXUJTVPEhfnnVNDlxdXaIos/wu/P6bsrn3mmA0Fvv1Pr2hbZA1fZgCx9w3 JR3ImWvy60EmaNDtYx2eyAu2h8Uz/eIeB5MhtKF/ph3yRy3byNwYX03/xulEE7RGHSmZ Bq7nCGRt1lwoYXmpyw3mfPrJYh4k/2LenIoxUaMR1vLp4w4ricALdQ8sY/PCVXziFy17 aY+Q== X-Gm-Message-State: ANhLgQ3cKJJbzojP79gWFD8iwZQPOHiDspE1qExiloAuuKsYDjqLP7nU WCEfzCzW8s/8/bk1jYbu8mqUuDCVOwOvHuqqftx9AvTzQvQL6Vpzo8wTNZlA+29wc0XKbBHuBCt v8EooiOObwF5iaw0= X-Received: by 2002:a05:6000:12d2:: with SMTP id l18mr18412656wrx.240.1584124676641; Fri, 13 Mar 2020 11:37:56 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuQgtDba68GKbgL+OtxixjWPY6YDPO3kDmuQFbZyGRp3cq7WJ2+l5hb5NCjjxv5ygLu7MTvmw== X-Received: by 2002:a05:6000:12d2:: with SMTP id l18mr18412615wrx.240.1584124676447; Fri, 13 Mar 2020 11:37:56 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id l18sm10978168wrr.17.2020.03.13.11.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:37:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 12/14] target/i386: Restrict CpuClass::get_crash_info() to system-mode Date: Fri, 13 Mar 2020 19:36:50 +0100 Message-Id: <20200313183652.10258-13-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:51 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: 1254603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XIYSYisv; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fFBD6QSGz9sPF for ; Sat, 14 Mar 2020 05:50:12 +1100 (AEDT) Received: from localhost ([::1]:35498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpNq-0005VD-P2 for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55117) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpCB-0001ZN-DM for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpC9-0005Bd-5S for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:07 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:38782 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 1jCpC9-0005B1-0v for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124684; 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=5MOJ97Mg3uK0x1VWiafJ67lfSZFLwR4mry93M3PzeTE=; b=XIYSYisvM95Af3fWw7nYZzTplHxmjkStADU3uyEILCsJyyExYyqMRsbSzvf/VGJBXNtkW8 2/rRdAsC+DKYRDptOH92jKggvnC4jJxrrI4IDqlpCIFeivkUT2Bm+a4St/A5h8XsoUWSo8 9J26HPLTeUS3W1pmwiYBM7h4aLjZsLE= 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-368-SCnl8dbQPguVEOyLSponvQ-1; Fri, 13 Mar 2020 14:38:03 -0400 X-MC-Unique: SCnl8dbQPguVEOyLSponvQ-1 Received: by mail-wr1-f71.google.com with SMTP id c16so4757762wrt.2 for ; Fri, 13 Mar 2020 11:38:02 -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=bmLIgnK8nZe09V5xRPW03+txWxMqC+nMqZrcX0UoUn8=; b=XcYfVBgeLYuJqdDUhTbM4eJ8eMy0pQZGX2TwBChdAChtpxOMxcjAy2os7hIriOJyq+ uzz3tni42NvtvhDf2sFPj3UzHlJazxRKWsLdYT28RE9OvYOhpscTwz/jxvJQS/8QPyNt s82n+6RMdW9KEqzPLJxV/ZaDlVPj+IEudwMArjMSCR8DI8ohDI9VAw7iN9WTSJneMSxF TPRANdOubcXL8SRsB1Cvznqaj8k/X45+THJOuttHJgwjZALycFmur7508kzs7hyxVO8L 4WqvWjLDhQzek/NzCdmfWjMWJe6AAxJzAgFOgPaFkCSwSaPg+y89eE+AhPC4FrI2GAzN EP4g== X-Gm-Message-State: ANhLgQ1uGMnG9j0EuigQNGcwFQy5X8NTUXaz12nL6ZE35sXZ+9yBnrnI zgSSsZJXRhfJclLHGeBebfrU+fYf0TJKldbddr6m8ZeNNXi+1MLMB0WNtRJw77FdS1zir1oUtxx R+ic8ux99LiCiDt8= X-Received: by 2002:a1c:9c52:: with SMTP id f79mr12077999wme.30.1584124681700; Fri, 13 Mar 2020 11:38:01 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtclmKmGWDITHGPwMFiNasidZXEOeI/Khix6i2umLsjJPJ2oehdsOA5I9WH66oYsI9Bk4vE/A== X-Received: by 2002:a1c:9c52:: with SMTP id f79mr12077972wme.30.1584124681479; Fri, 13 Mar 2020 11:38:01 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id q4sm36337983wro.56.2020.03.13.11.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:38:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 13/14] target/s390x: Restrict CpuClass::get_crash_info() to system-mode Date: Fri, 13 Mar 2020 19:36:51 +0100 Message-Id: <20200313183652.10258-14-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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 Fri Mar 13 18:36:52 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: 1254602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SpV1jA0t; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48fF9M3B6lz9sPF for ; Sat, 14 Mar 2020 05:49:27 +1100 (AEDT) Received: from localhost ([::1]:35484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpN7-00047p-Bz for incoming@patchwork.ozlabs.org; Fri, 13 Mar 2020 14:49:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCpCH-0001jl-B7 for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCpCG-0005MO-7C for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:13 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59590 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 1jCpCG-0005Li-3s for qemu-devel@nongnu.org; Fri, 13 Mar 2020 14:38:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584124691; 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=Jc8uJI+fsWVnbFhna2J0NMxSMRDSs2zyN/X211eVidg=; b=SpV1jA0tXgvUa77PO6hYPhCjWVtlRLPl5Wm6Xs0ZaWl2JyJrpxioEPEXWg+wPXsKrzacv2 dUb7a0QvyR8Z5uJgCNMJ6bHpIJzzN8x/bFIOx8qMHHkDNad5wSvcLZSpZ/xJqM59LfAU0B a/ITmn5CLHzJufI2yMNjs7a4hr42N8o= 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-23-mlC3S_BPOHuHagFc_wpHuA-1; Fri, 13 Mar 2020 14:38:08 -0400 X-MC-Unique: mlC3S_BPOHuHagFc_wpHuA-1 Received: by mail-wm1-f69.google.com with SMTP id a11so1368835wmm.9 for ; Fri, 13 Mar 2020 11:38:07 -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=oL9lM1TjQ9zbVx8kM0/Y3ow0t+KGUtP0TdO5NgiCTHI=; b=mrDSz/yyKJ+1g2wO+8s0H/K3mzjnsDVhLUimpM8xJS1L/cImJhlmqhpw8m6x3f97ix fJfEh4f+eeMoSFi1WHfmP/qa1wEIAXWbI62sWolG1jfXYSkoSJ+gX5aU/UAxpkIxn4H7 ou0qNOkf8BhCVY3wX7qv/96LqsirC3RuY1IKkRdeh4v4hjdvqHTOVXGmVkt4GS7ITkLS aNaki2W04Em4yZyjPCQmKtE6A7GB3IEGC/kcrQRf26gslrwhhSs7H7pP8rj3Gx3YiYCv nKLd5fmO++Ak61lvN+5qges8UuKBavuxhgnMEG8nyjj9MSyLLyBg7fJrE67Sehz24abG XhPw== X-Gm-Message-State: ANhLgQ3t9eUy/f9HmGjKQz01cNxKMkq5tS7q70XE7FiJzPsBc06HL4J4 3blwk/E55atIoEMWQCO21n075GlM/mqu0s5+0PfeSxbvWpaNYqd3E8Nsr8o+fQ67SslQa8UFnkx uI34lRhLEo2i8NQY= X-Received: by 2002:a05:600c:22d9:: with SMTP id 25mr12481664wmg.41.1584124686791; Fri, 13 Mar 2020 11:38:06 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvkUiNDT12hS5ZR4JFRBhywm9lydrk/287pcgsHZIDKqKgIi1sD3FdgAsAeou1Hy1iXt4HYMQ== X-Received: by 2002:a05:600c:22d9:: with SMTP id 25mr12481624wmg.41.1584124686545; Fri, 13 Mar 2020 11:38:06 -0700 (PDT) Received: from x1w.redhat.com (47.red-88-21-205.staticip.rima-tde.net. [88.21.205.47]) by smtp.gmail.com with ESMTPSA id f17sm59325628wrm.3.2020.03.13.11.38.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 11:38:06 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 14/14] hw/core: Restrict CpuClass::get_crash_info() to system-mode Date: Fri, 13 Mar 2020 19:36:52 +0100 Message-Id: <20200313183652.10258-15-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200313183652.10258-1-philmd@redhat.com> References: <20200313183652.10258-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: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Alistair Francis , David Gibson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Palmer Dabbelt , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- 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) {