From patchwork Mon May 4 15:29:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283470 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EA6BC3A5A9 for ; Mon, 4 May 2020 15:33:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5AA86206B9 for ; Mon, 4 May 2020 15:33:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fm7vGPVA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5AA86206B9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVd5e-0000li-BA for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 11:33:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVd2D-0003px-IS for qemu-devel@nongnu.org; Mon, 04 May 2020 11:29:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:28002 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVd2C-0003sF-Lb for qemu-devel@nongnu.org; Mon, 04 May 2020 11:29:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588606171; 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=v9XYIGI7HOjYX2BqAYx0wu+sDnz+yL5U2cNQmNKxyCM=; b=fm7vGPVAWBt27pmSetiJznkpIJl9dYvR+xvrh8aSggxvCkFpcABxM3jhtenIcWpizJtg/r p8hblBJ0Y4287OD8owFZSWfonICpDj0ATzlYxpx9aXadSSJ5XABbjb/kdzuEdCvrWDwV/t 3PYGjkXJw3T2nBQSbNtx7HiWGk+H62Q= 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-480-XDyOPtFbNLWSA9CwXzFyJQ-1; Mon, 04 May 2020 11:29:30 -0400 X-MC-Unique: XDyOPtFbNLWSA9CwXzFyJQ-1 Received: by mail-wr1-f70.google.com with SMTP id q13so2090430wrn.14 for ; Mon, 04 May 2020 08:29:30 -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=tI1yUxIlcdhOIzObTuos8yemfQFI0fwt06hTRp539vo=; b=jK4ac6rQqVbICSg6MYv8hMWgf62SW/00BdhrmHtedX/GbJFsSqSzNoAmQc8d1CnaK3 smoXl5B+WsHvKA1TtZyBXo4ANS/AGS5qAzHa5BtZfkZ8ATdtVADm25wTLKgjAvRattqB C0us5yUN92qOJJlY7A09kMobSjjp27LYIEAuiU8vLFTIr7ygqDtNYtA2K9VPHDHHXiVt +Dv9IoNhQxHMVYFN+fRjYgOEqNepvXq43v6r+1HYQEIpG8dO3CfKrPHUTbU4DC1wMwe0 92TSl6Fbck6K7lB1KMQ8kunjk0tNCqLL+rvSwsOyYa2j5/DUmhjT6fkQ4r8YqPKmUVzy dZPQ== X-Gm-Message-State: AGi0PuYszUECwshTsFT2500WOARAzEMuikSf6ATg3oev+CgQhtrLzATA cWfGx1c3XyGJGidd8ZGlJABh/yf0rhtdRaDXMGUuO8oPQc9HbLuSIg7Ls5LJwto6KnbAT1g1eCL UWZxZn62KBBbw26s= X-Received: by 2002:adf:cd88:: with SMTP id q8mr17234779wrj.67.1588606168953; Mon, 04 May 2020 08:29:28 -0700 (PDT) X-Google-Smtp-Source: APiQypJXB5v9cBYgwUOfBejThxl9wqhuCaWRUOFfQePgNSjFUhC9lxyJkxBUbyEzJ4q/VjnjYu4Vhw== X-Received: by 2002:adf:cd88:: with SMTP id q8mr17234750wrj.67.1588606168714; Mon, 04 May 2020 08:29:28 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id i129sm14838974wmi.20.2020.05.04.08.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:29:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 01/12] Makefile: Only build virtiofsd if system-mode is enabled Date: Mon, 4 May 2020 17:29:11 +0200 Message-Id: <20200504152922.21365-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> References: <20200504152922.21365-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 04:24:57 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Alistair Francis , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Do not build the virtiofsd helper when configured with --disable-system. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 34275f57c9..e46b6ef5d4 100644 --- a/Makefile +++ b/Makefile @@ -345,7 +345,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF) vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json endif -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy) +ifeq ($(CONFIG_SOFTMMU)$(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyyy) HELPERS-y += virtiofsd$(EXESUF) vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json endif From patchwork Mon May 4 15:29:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 283469 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C91AC3A5A9 for ; Mon, 4 May 2020 15:38:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 373AD206D7 for ; Mon, 4 May 2020 15:38:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XsRNx9x0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 373AD206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdAQ-0000aV-BQ for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 11:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVd2e-0004ec-Li for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34463 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVd2d-00041b-P1 for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588606199; 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=UXIZVnW5g37k2jLJB8kqlNhfn4cymDqpUWMHJkAG2Eo=; b=XsRNx9x0GjdZXeSY8zIEKIdEzmm8Z/0+YhjcLbS8KmQeDLQuMo8rPqagpmFMdZrpVjCqkG YQLECinclGe3DQSmNpvZR1XyV+kd7bAdkR/rcNO2i/Un8jksOmpb/aqAxXialSf2C7TvhV Qkhw0+M1kKUxfHYKMHzOWlvskGjP6rQ= 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-165-OdkA8HkUMzCcrBOmY1xu8g-1; Mon, 04 May 2020 11:29:57 -0400 X-MC-Unique: OdkA8HkUMzCcrBOmY1xu8g-1 Received: by mail-wr1-f70.google.com with SMTP id g10so2198983wrr.10 for ; Mon, 04 May 2020 08:29:57 -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=/WSQ18h76i7qy6sv74FkIvImN9Z625aM1DPt3KGsaqk=; b=gIuPFgip8xdi5n3co5W7kEfxeTaEIx/+NsbG5DKmJcWhcKpy4lBMujLim9t/TL6q8x +GslUlcM6DOdaNmT4kJD3R/7Kz4fL6Wx+diMHg/nJzP8mneOIdKQwAXvBy8SjLDz/zeO 0MyjOYB0cpUDwuohXlmdFS1LAxZO1ZqGVBJMZW/SS6bN0PF+1iLebclW5Mi39l8P8xRF kgIbdEANUHzV1N+ae21KXCuXZ6AfQ/C8E6nJg9OdDhzNVkgl2RvesQ+kuEhnOudcuHT6 ylDdCtcbLUNKVoTR7erLKrxAjklEcr9Woe18VoWKu478pzEqgwpDr6vKFaDk2oztRoXM EolA== X-Gm-Message-State: AGi0PuZrb1AB1/rv3fsYw51ibSa0UaDmz2txiF1s7/5ToOFjDnAMyuIM 4eVJgv0XKG+exWKwAnQW+L0DHBr0X4gkY9ZeXR7rPCHnaXDuIUzZanUrTd8q+QO/w5JH0i6r7C6 d3HlsY8ux5PsIHB4= X-Received: by 2002:a1c:abc3:: with SMTP id u186mr14936135wme.42.1588606193640; Mon, 04 May 2020 08:29:53 -0700 (PDT) X-Google-Smtp-Source: APiQypLj5eWxZJZ2z2ZUftO3Xg+kRXa7qQn9DNorY0PvIkoZ/Tj/+ACME2VKDR/YpjrsCN5yKp3rsg== X-Received: by 2002:a1c:abc3:: with SMTP id u186mr14936095wme.42.1588606193366; Mon, 04 May 2020 08:29:53 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id r23sm13375342wra.74.2020.05.04.08.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:29:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 06/12] stubs/Makefile: Reduce the user-mode object list Date: Mon, 4 May 2020 17:29:16 +0200 Message-Id: <20200504152922.21365-7-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> References: <20200504152922.21365-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 05:09:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Alistair Francis , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These stubs are not required when configured with --disable-system. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- stubs/Makefile.objs | 52 ++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 45be5dc0ed..5ffa085c67 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -1,46 +1,54 @@ -stub-obj-y += arch_type.o -stub-obj-y += bdrv-next-monitor-owned.o stub-obj-y += blk-commit-all.o -stub-obj-y += blockdev-close-all-bdrv-states.o -stub-obj-y += clock-warp.o stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o stub-obj-y += dump.o stub-obj-y += error-printf.o stub-obj-y += fdset.o stub-obj-y += gdbstub.o -stub-obj-y += get-vm-name.o -stub-obj-y += iothread.o stub-obj-y += iothread-lock.o stub-obj-y += is-daemonized.o stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o stub-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o -stub-obj-y += machine-init-done.o -stub-obj-y += migr-blocker.o -stub-obj-y += change-state-handler.o -stub-obj-y += monitor.o stub-obj-y += monitor-core.o stub-obj-y += notify-event.o +stub-obj-y += qmp_memory_device.o stub-obj-y += qtest.o +stub-obj-y += ramfb.o stub-obj-y += replay.o -stub-obj-y += replay-user.o stub-obj-y += runstate-check.o +stub-obj-$(CONFIG_SOFTMMU) += semihost.o stub-obj-y += set-fd-handler.o +stub-obj-y += vmgenid.o stub-obj-y += sysbus.o stub-obj-y += tpm.o stub-obj-y += trace-control.o -stub-obj-y += uuid.o -stub-obj-y += vm-stop.o stub-obj-y += vmstate.o + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +stub-obj-y += arch_type.o +stub-obj-y += bdrv-next-monitor-owned.o +stub-obj-y += blockdev-close-all-bdrv-states.o +stub-obj-y += change-state-handler.o +stub-obj-y += clock-warp.o stub-obj-y += fd-register.o -stub-obj-y += qmp_memory_device.o -stub-obj-y += target-monitor-defs.o -stub-obj-y += target-get-monitor-def.o -stub-obj-y += vmgenid.o -stub-obj-y += xen-common.o -stub-obj-y += xen-hvm.o +stub-obj-y += fw_cfg.o +stub-obj-y += get-vm-name.o +stub-obj-y += iothread.o +stub-obj-y += machine-init-done.o +stub-obj-y += migr-blocker.o +stub-obj-y += monitor.o stub-obj-y += pci-host-piix.o stub-obj-y += ram-block.o -stub-obj-y += ramfb.o -stub-obj-y += fw_cfg.o -stub-obj-$(CONFIG_SOFTMMU) += semihost.o +stub-obj-y += replay-user.o +stub-obj-y += target-get-monitor-def.o +stub-obj-y += target-monitor-defs.o +stub-obj-y += uuid.o +stub-obj-y += vm-stop.o +stub-obj-y += xen-common.o +stub-obj-y += xen-hvm.o + +endif # CONFIG_SOFTMMU || CONFIG_TOOLS From patchwork Mon May 4 15:29:19 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: 283466 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7233C3A5A9 for ; Mon, 4 May 2020 15:43:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 710E2206D7 for ; Mon, 4 May 2020 15:43:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GpkUxqkk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 710E2206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdFa-0003dj-JQ for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 11:43:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVd2r-00050Q-2i for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:14 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50087 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVd2q-00047C-3w for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588606211; 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=g8CkVk2pIsA5qUp0zix2BjSa/yukK7tJBsycJrJlL6k=; b=GpkUxqkk1BEAj0ytg56Jxd2G7+m2/hUSSb+iT9NXUSZB4v7NebnWam87hObCLy60Cpf0ht fBdJj4gxWDLv/hg1FMNSThwy7XGQkjBlJDm7DK33yEJotoeHPTrsJ5XzLAD40G6TdJT2cx za4c+icKD9kxMVYBH/WowrKFmNqa1YE= 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-272-cYAe6a1KOROa2gD_fr1vtA-1; Mon, 04 May 2020 11:30:10 -0400 X-MC-Unique: cYAe6a1KOROa2gD_fr1vtA-1 Received: by mail-wr1-f70.google.com with SMTP id 30so474702wrp.22 for ; Mon, 04 May 2020 08:30:09 -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=Loi2SqFjSui4Z2kBKxGGjw07sOKKiVmfF0icDHu39aI=; b=Jeo35db6rLeu7N3Gz/wOUM8c2q2iR63NF/SYI3HYXNx9m75M/XfFQJRBYJ/2HCbihS AoYzW7/RgqTO97i23BMs7owjsatLBhq89/UqkqkwXAtk5f2x3jYbH6VCMBpp7G3fFJLs M12zgKFLMifX68UcF4hCZ5exK6rnNMNDAqorCO6s4NWcMvZLHr6EfDBL7ZC26q4PajQj U6mY6gBgROV6mbbk4uCS2gEBhds+MAdME+6Iys2v/yca2f9zqUBXqFiLdDCaZq5QL05w pfa8Uz4r9Bk+g1b0ByPy2VY6msHrRoUcdVD5RyH3dXhVZlGaJ9o+bWOL+2fB+SkbPf6J S+1Q== X-Gm-Message-State: AGi0PuZlaL1Bdx3i8i6raOlUuwCANTVas/KeX6LIiGX6/ZgrGeS53AFm 8d2mHqJ14DnIce49CVRfkoD9ClRe9/+BDDgB9CSeqKrgQFTa4nMYBKKJKb93nITHYsuq+SRF+HI hrScv9ctSgnizu2o= X-Received: by 2002:adf:fac4:: with SMTP id a4mr15444356wrs.134.1588606208432; Mon, 04 May 2020 08:30:08 -0700 (PDT) X-Google-Smtp-Source: APiQypJm0cfJlbqPAJwYrwFKRafzCoYVnnGzHPxQFg4t8os1gRI2OP5f3Fz//NjR/oYIdxM+SAh86g== X-Received: by 2002:adf:fac4:: with SMTP id a4mr15444325wrs.134.1588606208276; Mon, 04 May 2020 08:30:08 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id b66sm15039450wmh.12.2020.05.04.08.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:30:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 09/12] arch_init: Remove unused 'qapi-commands-misc.h' include Date: Mon, 4 May 2020 17:29:19 +0200 Message-Id: <20200504152922.21365-10-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> References: <20200504152922.21365-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 01:21:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Alistair Francis , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Commit ffaee83bcb2 moved qmp_query_target but forgot to remove this include. Reviewed-by: Alistair Francis Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- arch_init.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index d9eb0ec1dd..8afea4748b 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 Mon May 4 15:29:21 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: 283468 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2F1AC3A5A9 for ; Mon, 4 May 2020 15:40:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0385206D7 for ; Mon, 4 May 2020 15:40:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ce5K1beN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0385206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdCf-0004ZU-Rb for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 11:40:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVd35-000589-Kx for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:28 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:44181 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVd32-0004Bd-8u for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588606222; 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=P9+8reP7GTE78L5B1VZBQQawvTQY6zlLXYckga6u98s=; b=Ce5K1beN5zEWmie/58t8XnpkFmJYb/17ZeFkdKtklSA6g5xHjZc/9nK5CDzYq9K5htTtjt tKf6D8W0sS31MM/SvFH3e4xyLHBx1FEUJpOJcX8nY8nhtW6ve2VqeeGH98z/Fkyh5z8sOU adBuU60d88CDL6CW/0RkVcK5WibTXPU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-447-Ed_rJc2FO8iYUvlztz0Kng-1; Mon, 04 May 2020 11:30:20 -0400 X-MC-Unique: Ed_rJc2FO8iYUvlztz0Kng-1 Received: by mail-wm1-f72.google.com with SMTP id l21so5118821wmh.2 for ; Mon, 04 May 2020 08:30:20 -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=Ixj4deVVyRuMLRIFisfgQ9WKiYbhKMCAbBHOhTT1TTc=; b=eSsmTezLTUNsFLgFIO6bfIAm13hdOf6SrI8dAmzald5IIknEKvg6faruuvpAnW5iEx WFL2G4R5yqmBC1BnAZEPoLQ5waH76JeogqDXFdokRvRex0Mjfv1D9x84UPi5+tzVJl8h BvxV8IiOY1mkKaMBF+bblU0jhUs8UtiITMTFQz23OeHmvgESrBdPZTZwW3Bj1qV7bdyL pnaGUFc98KvV86cYI64a0XGrP123EQqrsSVsmkRN6rrizAofqhC/V3koXJH+hjtYw2J2 qE+qBe1TbfSnP9Ep5JgpsY2uGFybzu6mfnA1MSa+gZBFbb/Zx8vxw0ui6RUX1g7rPMC0 k+tA== X-Gm-Message-State: AGi0PuaATo881qXd/RWf7DiHlnJ1uOFn9f8ulInroWDjCiBQntqMhqX4 5B79PnTFpkbYIUlen/3hwoC+u2n7IOluB7t7H12xw3onLwsnk+PmWRhaNMadC5rYbvEKdkwk+fe yeNS4Kab91WvLWTc= X-Received: by 2002:adf:ecc5:: with SMTP id s5mr18314268wro.261.1588606218414; Mon, 04 May 2020 08:30:18 -0700 (PDT) X-Google-Smtp-Source: APiQypJwx30iPwgvBiLbJZBtHnXIYgfy9/mTXK9iJRYZVNTAVVbjQcxhCJrJ+JdH4KjLpXk8VWAT6A== X-Received: by 2002:adf:ecc5:: with SMTP id s5mr18314229wro.261.1588606218190; Mon, 04 May 2020 08:30:18 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id a9sm13422818wmm.38.2020.05.04.08.30.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:30:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 11/12] target/s390x: Restrict CpuClass::get_crash_info() to system-mode Date: Mon, 4 May 2020 17:29:21 +0200 Message-Id: <20200504152922.21365-12-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> References: <20200504152922.21365-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 05:09:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Alistair Francis , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- target/s390x/cpu.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index f2ccf0a06a..afb82206c7 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -247,6 +247,7 @@ out: error_propagate(errp, err); } +#if !defined(CONFIG_USER_ONLY) static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs) { GuestPanicInformation *panic_info; @@ -256,11 +257,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; @@ -286,6 +283,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) { @@ -295,16 +293,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) @@ -488,13 +486,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 Mon May 4 15:29:22 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: 283467 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F186AC47257 for ; Mon, 4 May 2020 15:41:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BFBC520721 for ; Mon, 4 May 2020 15:41:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Zmdz1dFC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BFBC520721 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVdE5-0008Da-S5 for qemu-devel@archiver.kernel.org; Mon, 04 May 2020 11:41:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVd38-0005Af-TF for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46769 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jVd38-0004Jn-34 for qemu-devel@nongnu.org; Mon, 04 May 2020 11:30:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588606228; 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=roSqpWZiqVEnV8LkdMDYBqTbKDtiMZNpOAVtdss6dcA=; b=Zmdz1dFCgGMklmHrSRZryIPdZH9RaLAoTY+SulrVUjUmDjMyHaRPxNcYS1oyoxQIYNwbCE bpyJmII5B+prscKCfenDOZGYSdH44lZhl1m5BDHr/4AqA7Xlb5E2mE2QRXt5wa0S+DDWrZ bhv7b5E98SEPS+EuBsvS2+4jpjbfDik= 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-177-Tc2P4NZPP6yMtFkuozAWVw-1; Mon, 04 May 2020 11:30:25 -0400 X-MC-Unique: Tc2P4NZPP6yMtFkuozAWVw-1 Received: by mail-wr1-f71.google.com with SMTP id p8so155370wrj.5 for ; Mon, 04 May 2020 08:30:25 -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=Yw0XCRWQ5TOmgPjX3CHbIeQtGrafhhkkx8MZiR9pd/4=; b=XLgx6KioTTWb0q4sFCCZ9NkV+F4kDvvM/NcOZHOtBJ6voPS4gp6kN7t7Rspg4Us5cG EPahZNF6YwbR3etAq9CdUmygkqdbJUzfoqMAbvhGYDOERmcEkxmVnSECbDIJgMp8OWv7 Db2SipCXZvSwxjfGa4Qo2vTiZdSoMIK8lG2Ry57LDNaXQc7MQFMKgAM/ilvsGhmLd/gz TaB8aPHziiy12XvtmzbdhAP1+Ua9rDSQ+ge/JnTfKbr28WLmQAF5/2GFcKb9FviaUVvO g0l6bGxO5QQ/YNdvQLnAVHoPgadtxLJTsc+slYkL6ybGp/nbjX5AM5LMhaH8eGibnQFd sutw== X-Gm-Message-State: AGi0PuZ8XKpHbvsP9IyzEqMRuc9WgcRquz5w0lLGrz8JBTSOoGx/Ay82 TF+b6OeRyKYaiAjTWGddjZWaJ0dnHIsUrME9RXJB1Nkh/5Gezb7KpChAwZmvHvM58O3bDjRxTSJ ivQVXCvoa/m3Z4cY= X-Received: by 2002:a7b:c959:: with SMTP id i25mr15022186wml.20.1588606223849; Mon, 04 May 2020 08:30:23 -0700 (PDT) X-Google-Smtp-Source: APiQypKj4Ork54uQyKon7JuuI5hLn/qSvQkcntw69/VS1GCVsLTqkzf4xWLOeWqEwGpwl6KqwP2Uow== X-Received: by 2002:a7b:c959:: with SMTP id i25mr15022125wml.20.1588606223163; Mon, 04 May 2020 08:30:23 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id l19sm14665035wmj.14.2020.05.04.08.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:30:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 12/12] hw/core: Restrict CpuClass::get_crash_info() to system-mode Date: Mon, 4 May 2020 17:29:22 +0200 Message-Id: <20200504152922.21365-13-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> References: <20200504152922.21365-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/04 05:09:11 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Alistair Francis , qemu-riscv@nongnu.org, Eduardo Habkost , Sagar Karandikar , David Hildenbrand , Bastian Koppelmann , Cornelia Huck , Richard Henderson , qemu-s390x@nongnu.org, Palmer Dabbelt , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/hw/core/cpu.h | 7 ++++++- hw/core/cpu.c | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 5bf94d28cf..0d1f9e084f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -490,6 +490,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 @@ -539,6 +541,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: @@ -632,7 +636,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 786a1bec8a..85b9723fee 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) {