From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252534; cv=none; d=zohomail.com; s=zohoarc; b=JynMVDvY58wsuEThijUt6uC64tlgP4XdWJRDIYRFG2zJO/iT53hBgNJ1exGWW9jpHbP3AGxTo0QUHbo71AumhShHT+Yatu8V5KOmhfp2xJWLOeuuqYSe3kDAAL7MuRkw969aQZhBcOs6/4S7/xekuGe8VFvdo4jwVjfcRjPef3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252534; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dFXoUEWPzoILClpIHpT3WuY+4eNYczJvqbaeCiygkAQ=; b=kal7FVbHbkCTXy213dZlB4a7/XHS/i6BDWR/rUqXZIXhfB4qvyZPsYcp3/BV+TOylYahAgZcgvc4mlKzugXcka700/BtOW4rKIVnEnG22fak+6yuPA5JBA1GAJh/7BgNqGRwBDdCGmkaGlW/AC+xfHOf1Lq4Wwuzrb/8jOBJPno= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1621252534689205.59767923937716; Mon, 17 May 2021 04:55:34 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so3414005wmh.4 for ; Mon, 17 May 2021 04:55:34 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m9sm10224259wrs.36.2021.05.17.04.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dFXoUEWPzoILClpIHpT3WuY+4eNYczJvqbaeCiygkAQ=; b=aYc9tMpgd2Hx82qy/uj9bIkDk/75UOFg9bs9o+/WTFuWZzGrcNrcCq7lp+/1qbhbqd VVN97vHw8NLGY6GjOvzsliL2E4AThNZvCx9I/BkA0UbDU78YrIOz56rTpLnLLcLQlVnn tWZOX5ZETc5kgJ+H1tqFrXf7gjVJ4xDulvdSiMUp8A3A+jlRdBzm5SMELPdGVflAI7gg 9Ut7B8fQCYP5kJQcgnic2vltWRPfMkqGaerMHvl/MqUZvH678FX96pFIAH+zDeDue+ul 9nB/2Ben/qIJixz2EKamocCVojvGIUsnVp0T1hllrZ0lqudUx5jvvaXsQ2aguVXwM0mC CmnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dFXoUEWPzoILClpIHpT3WuY+4eNYczJvqbaeCiygkAQ=; b=dGiXGEMlH1EoJBIV9GSqV1bm6MdjOBy/WLpxRqw8mwBFF8B/TwgNbDHZKrnlDr5yrn vG3EpRJYDP6zVT/OdgNcwmJtv6QoWo0L3rpcqj+X8bXX9+npCh9DyhM/lOpT2GsulXzh 6Amw7AlW11zqqOgyA9qo5uTAim3i+y/z13drgMoFYuVimscOq2yFuCbVvlDJiaI9s6Ws aV9NyAbv/fgloWN6cTwd3BTk74wOAEYI+foKAnIwFWwyUOzRWYwAaAllFvaUaMsb7wv2 rMpImjIoHq5oIgGkibyWQyKMOBm1Im5vO++I8j+mgkDbeD/tQHz+dmmbAfE5YO1WE6ye 6Zqw== X-Gm-Message-State: AOAM5324CCyKEjFahZlrfVmb7J61GScma8+5pwjRC8ICbMnsewr7bVws oka/aI7dOmhimmEhMiE6dcA= X-Google-Smtp-Source: ABdhPJyWQ1M1TDLpKAh7EYEf6Gc3XuZRUqhoaCRTgebcaunaggqw5DDVTZc0pkHZD77Nvo4glIHqRQ== X-Received: by 2002:a1c:2507:: with SMTP id l7mr36039379wml.188.1621252532967; Mon, 17 May 2021 04:55:32 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 01/15] accel/kvm: Add more stubs Date: Mon, 17 May 2021 13:55:11 +0200 Message-Id: <20210517115525.1088693-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) To be able to make softmmu/cpus.c not target-specific, we need to add two more KVM stubs, to avoid: /usr/bin/ld: libcommon.fa.p/softmmu_cpus.c.o: in function `cpu_thread_is_= idle': softmmu/cpus.c:85: undefined reference to `kvm_halt_in_kernel_allowed' /usr/bin/ld: libcommon.fa.p/softmmu_cpus.c.o: in function `cpu_check_are_= resettable': include/sysemu/hw_accel.h:28: undefined reference to `kvm_cpu_check_are_r= esettable' Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/stubs/kvm-stub.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 5b1d00a2224..6bda6c8c925 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -20,6 +20,7 @@ KVMState *kvm_state; bool kvm_kernel_irqchip; bool kvm_async_interrupts_allowed; +bool kvm_halt_in_kernel_allowed; bool kvm_eventfds_allowed; bool kvm_irqfds_allowed; bool kvm_resamplefds_allowed; @@ -147,4 +148,10 @@ bool kvm_arm_supports_user_irq(void) { return false; } + +bool kvm_cpu_check_are_resettable(void) +{ + g_assert_not_reached(); +} + #endif --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252539; cv=none; d=zohomail.com; s=zohoarc; b=Z5B/h32C/FcZtxr5Ip6HwoXvaOor4xWExm9QPTnUASmQdKtySdDlHYacG88JVoprSZhfQw6/B/eEsjjbBQZ4l4WDpGM6wXu9Ib/OdEatEOoJfKNM4kh4hPXKzof0RZY2kBhenHjOLpC65YxTYhT0tiOLjarAlbB58xXFgcONI1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252539; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/43ScFgw6ZoJnoZI0Vs8YRgCLUW4OQusCylPD74zESI=; b=JFTMbZ3hG11Ro8s4Dv2ueJypOYqSwVYuWMzkMIeHNlmFtLRyjw6YlpI8nQJbVGzmvAMVC556PpIXtJuWBVAmCl6tUG9H7X0zKokSRmrZimcSqS3iiG7AxplNDgkcibvJnSWu1HiN3K+CA7Nb5hxiBOIzArZkx9gZtLC7oQeuhwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1621252539536434.46260062209035; Mon, 17 May 2021 04:55:39 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso5132474wmc.1 for ; Mon, 17 May 2021 04:55:38 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id o1sm20512016wmc.6.2021.05.17.04.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/43ScFgw6ZoJnoZI0Vs8YRgCLUW4OQusCylPD74zESI=; b=j2xCWv/1CETSHLahgnOaCoShSULx9VwLwo/hgTfZVq0WyW2GsJHYpuUjqi7616Khis sKFi0vdc9lCUgBPTanRSEkLpAcu6bIUjS6ViwYVVqEnF2RTxnE8Ule6p82beWImfCgLj rqjTfar6oE0zpHF34N+502yOiYO4NrWgXOlTTleCBtK0wZYw9btNq1IMe0UIh239yhfX zqc4vXBiHJoxN5BEs0FMwEVfM/yCpq5a5ZTUntcGIIziAi8Y773ZMfXa2FXUVwFnYNpk Dxzuh+xdYdhb9U7S9/jbJla0Q6cgbYlGAHKhh+XZ6Oscc7u+egiQS+zBlh6o5LMZgA6d a1zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/43ScFgw6ZoJnoZI0Vs8YRgCLUW4OQusCylPD74zESI=; b=DZNNd80jsqN5/p3U/6s/1zM/4b3+Pgf48Bwz2LbNAAcTi51wosiHwaDp7wBOHU7Leg bo8e+hcl8T02afmj+LDyz+UlO2+Ia52TBt7eOI8lHwXFcGF3vUqLi552sZEn+ybrkTra VEuVtKOuru9/BYsOKtWuxGtXm3b1xr4wZrecfblLUNT4Vyb8tKfYOOUHdoYYwKwLWFk9 NkeRt22IYbB26mhTDsShkmIgPK557TSb+p38ApS3es/5cqLA9WAo6DwFXQsUBqPXQoUK 1IsjXN+gTdritZxf3GltmkueCCIDtouvYiW1dZGw+sVOkAiQy4EbNqU2RfOjD46fryL7 TMVQ== X-Gm-Message-State: AOAM532GN05PmhQPTkWF08ourGQgbL++HGnv4kKlT16nslM0hpMy7B28 WW2kGuk6dbsM23+VD62EYM73Ux1xerDORg== X-Google-Smtp-Source: ABdhPJwYzSCnmC3dp/mCradg3viEp9719htCpOz3Zrv5zKkPIuo6OPi+6zPam7iaDhGHyQpqZ0Iihw== X-Received: by 2002:a1c:750b:: with SMTP id o11mr23175382wmc.188.1621252537759; Mon, 17 May 2021 04:55:37 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 02/15] accel/whpx: Simplify #ifdef'ry Date: Mon, 17 May 2021 13:55:12 +0200 Message-Id: <20210517115525.1088693-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) whpx_apic_in_platform() is called from: - pic_irq_request() in hw/i386/x86.c - cpu_thread_is_idle() softmmu/cpus.c - apic_get_class() in target/i386/cpu-sysemu.c whpx_enabled() is called from: - cpu_report_tpr_access() in target/i386/helper.c By converting macros to a function, we can remove the NEED_CPU_H dependency and build softmmu/cpus.c once for all targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/whpx.h | 15 +-------------- accel/stubs/whpx-stub.c | 21 +++++++++++++++++++++ target/i386/whpx/whpx-all.c | 2 +- MAINTAINERS | 1 + accel/stubs/meson.build | 1 + 5 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 accel/stubs/whpx-stub.c diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index 2889fa2278b..b32f46f9ebf 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -13,20 +13,7 @@ #ifndef QEMU_WHPX_H #define QEMU_WHPX_H =20 -#ifdef NEED_CPU_H - -#ifdef CONFIG_WHPX - -int whpx_enabled(void); +bool whpx_enabled(void); bool whpx_apic_in_platform(void); =20 -#else /* CONFIG_WHPX */ - -#define whpx_enabled() (0) -#define whpx_apic_in_platform() (0) - -#endif /* CONFIG_WHPX */ - -#endif /* NEED_CPU_H */ - #endif /* QEMU_WHPX_H */ diff --git a/accel/stubs/whpx-stub.c b/accel/stubs/whpx-stub.c new file mode 100644 index 00000000000..794a992acc6 --- /dev/null +++ b/accel/stubs/whpx-stub.c @@ -0,0 +1,21 @@ +/* + * QEMU WHPX stub + * + * Copyright (c) 2019 Philippe Mathieu-Daud=C3=A9 + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + */ + +#include "qemu/osdep.h" +#include "sysemu/whpx.h" + +bool whpx_enabled(void) +{ + return false; +} + +bool whpx_apic_in_platform(void) +{ + return false; +} diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index f832f286ac3..6709a89f8f0 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -1862,7 +1862,7 @@ error: return ret; } =20 -int whpx_enabled(void) +bool whpx_enabled(void) { return whpx_allowed; } diff --git a/MAINTAINERS b/MAINTAINERS index 78561a223f9..7877710e372 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -439,6 +439,7 @@ F: include/sysemu/hvf.h WHPX CPUs M: Sunil Muthuswamy S: Supported +F: accel/stubs/whpx-stub.c F: target/i386/whpx/ F: include/sysemu/whpx.h =20 diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 12dd1539afa..3fbe34e5bb3 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -2,3 +2,4 @@ specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +specific_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c')) --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252544; cv=none; d=zohomail.com; s=zohoarc; b=SUHUJ0W+3wFnvmhib21VojhmxzPteaaAOOhMN6YlyhzMyskLpg8JG06DmBQDdgAS7/LOzFpmc9xBYpEnkJi3uUoBPkPTCLli7mG+f5c+jBOrrX/dtYjHRf7zM2Jgp8P0EAo87Ld+V7bB4dKRmsHL+dR60fhLp90nXncnJWUJNMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252544; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ALNUiIR9f1KnIIz0k1dSE1UPa7kOz9dgBqDIcEEWFkM=; b=APHXR8o/FIT3b5w4/c+dyw+uvuGBufIQ/vCeLaCZF9/csRQNnKwjHYAMv6GxIMQzkeVbUxoyGSQ+qJYNpRhGxxaM9m+881ACJD7CXQTbKFZJDq/LW25hnqUPAJLZsqeBUlicgYrWoNwnQQLkhBqmFuQFFxkZtJAEBlIOt4mLvkM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1621252543998286.98108187244134; Mon, 17 May 2021 04:55:43 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id d11so6071512wrw.8 for ; Mon, 17 May 2021 04:55:43 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b62sm14554343wmc.39.2021.05.17.04.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ALNUiIR9f1KnIIz0k1dSE1UPa7kOz9dgBqDIcEEWFkM=; b=sv75uBQxRceb49/L+N584zI9iqSsBxaMYo+nxqmp4mG1ub+PR392LSr9kMxWr4rxZp jElCbrh3A1/wqIpZA04joUK6A5ysnKx0zocUSaVFEazZSJj6klBtGwKUePbXmRjeH6QT Gt12hbqeMDnkOJwTVR/Sb89RCoM6fddoxOD/YBkJaz/pIzoZa1tjO/eZPgvNCXhif04a 5BrTDDEeKBVmSEpY7sctRPDt6qtDPwrB0A9SX7uZsJq4HWDnq6OeKy8W4tmkwcbg8E5/ 3wD0rrb30Avntjxhxaaq0SE+kGCudV9iDvG2adoDr1HU1heg5ueBGG/TWtGC7w6nqrKu IUWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ALNUiIR9f1KnIIz0k1dSE1UPa7kOz9dgBqDIcEEWFkM=; b=lYCeAa+nIBRfIZMPkAcR/PQiz/3m/aq1FqnoOODrhW7RYBLwHf53VyInF7UhduaC3W VTOfBRWhUM6TQWCsGMltWTKn1weFet+P8i0N2a6WYv6trr88TgQnC/ZT3I4oTMf1wKzi KgQrdmgaREh25JRTKFnT5RxfWuWg2T/MAFv3zI0HHao1LCeWVvz8/LORODXt02JC2Sb8 rgSRfeKCcFZGTMpbew6atM4sfg2JddOydjuxCYGM2Roe/1SRpBnODJ3/iKcRDS4ZL+eA /C5G05IIfV4EgNykVlL5xZ03DsBB34vH4VOYYCSvwDFKlOsyhvVwfp/DF/9dHcoPc3CC TpGw== X-Gm-Message-State: AOAM530H9+7iJ2F9/8mTmuQd7ur1IrMSs46RkWBLaoJzs7cE/Ymcg0vn z1edAdWiTomJDIOTZTItHUQ= X-Google-Smtp-Source: ABdhPJwCiJv/0v0LPkNcvYs3C6DR2V5P9kLaNr1pGRzHPiAqXP+bnir/FWuGFOa0VMHAOu1yQzTZNA== X-Received: by 2002:a5d:6041:: with SMTP id j1mr72142092wrt.374.1621252542332; Mon, 17 May 2021 04:55:42 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 03/15] accel/hax: Simplify #ifdef'ry Date: Mon, 17 May 2021 13:55:13 +0200 Message-Id: <20210517115525.1088693-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) hax_enabled() is called from: - qemu_init_board() in softmmu/vl.c - qemu_wait_io_event() in softmmu/cpus.c - apic_common_realize() in hw/intc/apic_common.c By converting macros to a function, we can remove the NEED_CPU_H dependency and build softmmu/cpus.c once for all targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/hax.h | 14 +------------- accel/stubs/hax-stub.c | 5 +++++ target/i386/hax/hax-all.c | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index 247f0661d12..bc165b23ae6 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -24,18 +24,6 @@ =20 int hax_sync_vcpus(void); =20 -#ifdef NEED_CPU_H - -#ifdef CONFIG_HAX - -int hax_enabled(void); - -#else /* CONFIG_HAX */ - -#define hax_enabled() (0) - -#endif /* CONFIG_HAX */ - -#endif /* NEED_CPU_H */ +bool hax_enabled(void); =20 #endif /* QEMU_HAX_H */ diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c index 49077f88e3c..1a0370a4362 100644 --- a/accel/stubs/hax-stub.c +++ b/accel/stubs/hax-stub.c @@ -16,6 +16,11 @@ #include "qemu/osdep.h" #include "sysemu/hax.h" =20 +bool hax_enabled(void) +{ + return false; +} + int hax_sync_vcpus(void) { return 0; diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c index bf65ed6fa92..d99feef21d4 100644 --- a/target/i386/hax/hax-all.c +++ b/target/i386/hax/hax-all.c @@ -56,7 +56,7 @@ struct hax_state hax_global; static void hax_vcpu_sync_state(CPUArchState *env, int modified); static int hax_arch_get_registers(CPUArchState *env); =20 -int hax_enabled(void) +bool hax_enabled(void) { return hax_allowed; } --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252548; cv=none; d=zohomail.com; s=zohoarc; b=PXC4eQpq2Dkp4l2QzZvBNnkPjB2NnN0EadXwnl6BkqxDnmtOexybnwdHa3KeyneICekiz6EDcS8VIGTyd+pQ5lA8s1RMpKTXIxWto+XTnk89Q/+c4M+vDaVjbNRWlzxKzWLzr4iFQXTv+M5d2dVm+bMrukV/Pmxe1pqrfTcl45w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252548; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1UcPExstjBATEDHDrm3TI5/PEt/ztF/FbFjk6Eg9jrc=; b=HlFDZHgaZV7S9+QvPVuMNtWpS5niv3wqrOPzhUOmPTRZR+FoKQtgfSH5uUm0N/gDcTbg5rObycY88rMy/vVTJOLE95NDAMwcm9OXioo7bajQEJ+MFQiTGPs0AQ3SJE5mtJUrH0Vjx+dnOW/h0zrN9Eac8btwG/yp9/eDo5YKDXk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1621252548735861.3774877605465; Mon, 17 May 2021 04:55:48 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id o6-20020a05600c4fc6b029015ec06d5269so3448327wmq.0 for ; Mon, 17 May 2021 04:55:48 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id m11sm17009007wri.44.2021.05.17.04.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1UcPExstjBATEDHDrm3TI5/PEt/ztF/FbFjk6Eg9jrc=; b=iNLFibzZQ/IwWJ5YSa4+GEAct8/5VwMAsUDndVCrv2WeDAQajbGesFcHBv/uXIDnFH MwIRzVxYSBVTaxkpy7O0Wjhota91XVOt6W3nzmkbazARFg17n7g/StGvstJsdkKOpiGg zp8O+Yl6HM8+SoLI0jl2uEd5sw6teaZ4EAmO7WEB6pRTthHPzI9zqDAuj7nkqNe/D6k2 6cGWAEvL/vJRE4svj5dWSmKxpOJN5WtvrrIQKGGx7ZJiZKlKoqJEwP2zDUUvKaVVRM7w qRTmLn1Kd878PgB/4glwhScGrWlptdJ+Gay1kYNFqzNHolrPdwFTCh4/VZQmETfpSL5c z2kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1UcPExstjBATEDHDrm3TI5/PEt/ztF/FbFjk6Eg9jrc=; b=aIRoxEZSJMejW8cviSOtHhoqemttDrw7+bQVmYli/kSSrbnx9w8A4w7Upa79Guf4vB RKntcYqd1Fay/V2fCYXobLitFYifDJnyE+FahUlVhrA56DQxSEFjEohqMmDSv3uHVBnP szLu9dZcVJrzfyvhP2N/vSghJ7cu0QXLSnO1xxdyWi4dc5KDeZqyaXt8qzJCDEFO2rKM n4ItxGbOC1UfK8riEy+6yRWY+aEjaJoE/ia5V064xuXlLKEAyqZVmhgZO4+/xzUdCxbr 6/C93yzj150JUGm6/3AtI8ejD19O2OJ3Sb6UW6ZCCDi8QjQY7f6Tg3n0FpPNAmEaGVXj Uq3g== X-Gm-Message-State: AOAM531o9zkM0QRbzmgBVz7fGu+rG03xxyqxAPiKj7C7t6n81OZJnhtP S+n+xucvE71PnqF3SaHJf7T8aMIUafvDJw== X-Google-Smtp-Source: ABdhPJyx2gr86MIh73Vvdncfm4PVk3txntVki9/J1wBLwEfunfEZKyxJyr4r3FzM58h49Zva39DpJQ== X-Received: by 2002:a05:600c:4fd6:: with SMTP id o22mr41220589wmq.83.1621252546946; Mon, 17 May 2021 04:55:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 04/15] accel: Only use TCG when building user-mode emulation Date: Mon, 17 May 2021 13:55:14 +0200 Message-Id: <20210517115525.1088693-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- accel/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/accel/meson.build b/accel/meson.build index b44ba30c864..0e296911aea 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -2,11 +2,13 @@ softmmu_ss.add(files('accel-softmmu.c')) user_ss.add(files('accel-user.c')) =20 -subdir('qtest') -subdir('kvm') subdir('tcg') -subdir('xen') -subdir('stubs') +if have_system + subdir('kvm') + subdir('qtest') + subdir('stubs') + subdir('xen') +endif =20 dummy_ss =3D ss.source_set() dummy_ss.add(files( --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252554; cv=none; d=zohomail.com; s=zohoarc; b=GAgEicDZxdGjhSapwoQMk5h7NKO9pspU+U0aElKhpx98qOAAp0kA8j3XATfk1okyWUFsvZ+Y/0Ng4PFTZWjgeNwUskdmgJ2IvV+H0iFNN13cscXYfqsFd8HAcvDPLgblW2lKHi1ccWyuHEMibv+oEwJ/6PO1YaXH+mQczRR8eW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252554; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CR4jn+u6FS9l33qzafdhc7xASGZQil1oCqTnHK2u1S4=; b=EeOVdDU9BGVvG1nuK76fasu2gLK1uqinWXbEXjKW5vB+u50Wgh9gfA54Bmww+RFkOpR8oEiJrMwjF/OOjQ4MwS8zAEROOdbJA0emyhwcUBEbKzDw0ltjcHW0p6DjwzgZnntEO0pf2rRe1k3+P/N2DVnb5Sy7TFVkYRT2q5JErx0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1621252554218473.2685446810773; Mon, 17 May 2021 04:55:54 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id y184-20020a1ce1c10000b02901769b409001so2022698wmg.3 for ; Mon, 17 May 2021 04:55:53 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id t17sm10099919wrp.89.2021.05.17.04.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CR4jn+u6FS9l33qzafdhc7xASGZQil1oCqTnHK2u1S4=; b=UjmmldowfgUW/2dYGE1wvcQiPb/QSfAV48oPnfKKR1uwmr8qKlj7zePF8Fxju7YAwS eYw55JW9018XMdR/wmoQTb+BgTrq7vL0XVzcO5/ULhE1sbVrDNV/s0CLN2MHZ8pg6pGj YLq2xLnaHCsN0LNu9XWlFLWvUoXJw2GwKE0amhQV8B1RxHMTvNA+6ffnWrFSpfcteJhK P76UW6v9Oji9Eyjhqo4h0iFrkQDdmJ/T/ocruvl69QPBP7prat9aspH3cPLYYQbQAC0l eSWuhv7eMTQz1QN2uRghqXHDOIgQPNVZoEv4XlrN4JFk4fhdR9/zURwvcJtCP6uf/SCx J7Rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CR4jn+u6FS9l33qzafdhc7xASGZQil1oCqTnHK2u1S4=; b=R+nlMFLmv7GN+NXwdyV0DlGY1Oxgynm8M0yDJXvBchIYRhJTZA0vEfIUshq0LaqQYz IYlOoGu/eKczMClPlOOgnqdgl1ml239YAGIuVnx7FbFcrckNcqzAkSmcEzrkwNDkfo0U pLLyWc3S9m9IT1yYjDpICm94i+MigFAHJBglkuz+m4wQt5uu4EDYL/ZblzkZ57RkM3P2 qB9svPOtZfgcT/3ZMx3u55F5TC0wsF9YGy2gBmhkbA5Irmw1F5aDmKm4KBMGM0OCGGgp RCaH5GOzG2DLwyFPoPqr+IjsmsehbxR67apOStWDSFcPAINkes8dfqdbp0RdXYfen7lJ iqEA== X-Gm-Message-State: AOAM533dVhciv3hP9ydUiZjzPrAk3qSK1WsJhlzQB8P1MSre+5/v7TuE RW5yDDxBBWcahXp8IbcdT8g= X-Google-Smtp-Source: ABdhPJySU3h0X8Q9/eRNb6f/a6UYDSpipRwF3Y4dEuLrGVC9AjKeGSV+47K3WT2T3JLLD7U2/JEqcQ== X-Received: by 2002:a05:600c:4ca7:: with SMTP id g39mr7915482wmp.1.1621252552469; Mon, 17 May 2021 04:55:52 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 05/15] accel/kvm: Simplify user-mode #ifdef'ry Date: Mon, 17 May 2021 13:55:15 +0200 Message-Id: <20210517115525.1088693-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Now than we only build this stub with system emulation, remove the user-mode #ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- accel/stubs/kvm-stub.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 6bda6c8c925..6ae1ff62607 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -12,10 +12,7 @@ =20 #include "qemu/osdep.h" #include "sysemu/kvm.h" - -#ifndef CONFIG_USER_ONLY #include "hw/pci/msi.h" -#endif =20 KVMState *kvm_state; bool kvm_kernel_irqchip; @@ -81,7 +78,6 @@ int kvm_on_sigbus(int code, void *addr) return 1; } =20 -#ifndef CONFIG_USER_ONLY int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) { return -ENOSYS; @@ -153,5 +149,3 @@ bool kvm_cpu_check_are_resettable(void) { g_assert_not_reached(); } - -#endif --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1621252559; cv=none; d=zohomail.com; s=zohoarc; b=eBDycXoKFOhj4zqKsHi+UveBdafdwEFMlL5E7fMLVGX6yZKOnS8pLnZAdGkYOK5klquRdCH4HjG4mZfwhEkRiQJJYgV6gSOSEjTbtUOGPdqSyN5KxtmzlEkzBa/yN5yWnRVH/bC5XP6fZ4nJqDU/4reGhMl23JWK0Om7dNk4lsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252559; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h74n15CgGUrao8YiqbCGB58c5XEuJcuW9skFxH7JU3E=; b=I+NbV+WuRAgMwTGo4xJNxSzb1XfgyPWSoQQ/fASuY8DiVpCuyeEKVR21yRGX6Aghxg5rSCq4F9g717JWE9t1tMYBGeVZDxf+tATWXIODXj0/w2NuN/st16YplsTnU60UmlUHa4CmRcbPZ253Tuemyc7PFg/XYldE5Plju0cvcGI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1621252559144461.58207367159173; Mon, 17 May 2021 04:55:59 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id b7so2818703wmh.5 for ; Mon, 17 May 2021 04:55:58 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id y2sm23625710wmq.45.2021.05.17.04.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h74n15CgGUrao8YiqbCGB58c5XEuJcuW9skFxH7JU3E=; b=VXGTlqG9kcZzQhGHsJnDnlQZh+FLyR7M8NMcboGO2Vksqf1DcZHNFMKQRimuZgasJU x4gYYMGyoIz8OeaMjlAiAridv/TiukPfuS3JNdKnmZ1MdWH69KAdQqZVvJhovcwjjSjW CqC6O6q2HV/z4ruyjH/eh4LUSCezCsO9Ot0KY2xULSlQnUeWkJ2k0BSvGxDWguECb6sZ Ky2g3i+ynXqgLDmvcNmZPifWwZEkwf5RoyVc4mmxixUhd4n0G/UsVLiKS6JOMldEBLl7 6ScHmhvwceBDt85a7a1YxU7x5DA0ti/7VLU4JiNu98p6wZC4adVPens45GtwH+CORJcn e9sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=h74n15CgGUrao8YiqbCGB58c5XEuJcuW9skFxH7JU3E=; b=SJ8lKNEmJW1PS8MrYNaE7fAN/5zel+qTOJdLx2GTPzpggjvinSQ+/a2Eno9afCA3i8 eS5Zx+tREBWZVRd0E5hl+D8wwlrOsGH0XNal4GE/tipK9G6+OZzPNOWJD1WbUmJhc8IK 5olDXX9xRXqk5yAlitmiYlkhO+vEF38aWq9W/Fh5kwUNabnbKal9tbPCa4taljR5HdMk K+dsi9J/TGjAh2U2Fviapcs3VUWHKE9s5VMdPX7gMji4X38whmEXyz453XDeppGpQqXe Fp8m+r06Qvt0gzs6msMcjgayrCH5cXYQpfPbWaI7aZPqHyiUnhGTrO35rsFj4xt3O876 Zdog== X-Gm-Message-State: AOAM533ttObLIOF+Q0KJeictl3mGHKA7lhQLDpxN2fY3gxzm0wHjvVVN YYjTgDFQHPEA+rz6gtyy1TI= X-Google-Smtp-Source: ABdhPJycW/h+x63pgRhNXWlXhkHnPVCdnZezMWARkl2+AioirvCmPvQEbqyCzCggnST1/LqTgkb8EA== X-Received: by 2002:a05:600c:198a:: with SMTP id t10mr22200329wmq.97.1621252557207; Mon, 17 May 2021 04:55:57 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 06/15] hw/acpi/memory_hotplug: Remove unused 'hw/acpi/pc-hotplug.h' header Date: Mon, 17 May 2021 13:55:16 +0200 Message-Id: <20210517115525.1088693-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/acpi/memory_hotplug.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index af378894235..104c1abd4eb 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -1,6 +1,5 @@ #include "qemu/osdep.h" #include "hw/acpi/memory_hotplug.h" -#include "hw/acpi/pc-hotplug.h" #include "hw/mem/pc-dimm.h" #include "hw/qdev-core.h" #include "migration/vmstate.h" --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252563; cv=none; d=zohomail.com; s=zohoarc; b=d4pA8rh81lMGQbl4VvGqywC3IIMYdjQ2IR/yyUk1Qgdy++SoxV3ppOrbSyPGypPkgxu/Xi8H/gHfz2SkqGIcp/2WpE5Gf8yroOfG/i2WyCaLiM1+nLHFtgp5LZ/FXJyggH5qBC1+99PPxKMXy3XhlH2q9lXDypv8jIHE9IyPtgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252563; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6K25Rk+jURG0ASVbfGKwW1bl2gEnBYtQHzFYqwQ6Y7w=; b=kB8Yc6g2BQnNMGUH6hWtqhL121cfjOl8gGgY46QcV3I8MIzrx+z3BrLf1aeNkJDPtImBc3zgGH7ea3Cza+X87tGWn+U8LAuhrzB/I8Fd0JGdPlPJdag+Y8EsAi0hcq/JMPnW/2FsMDp4AUHVK8iYS6SNWPRDWs2FgFI+3Cu1tWs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1621252563648755.7246158538906; Mon, 17 May 2021 04:56:03 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id b19-20020a05600c06d3b029014258a636e8so3424580wmn.2 for ; Mon, 17 May 2021 04:56:03 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id r17sm20961195wmh.25.2021.05.17.04.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6K25Rk+jURG0ASVbfGKwW1bl2gEnBYtQHzFYqwQ6Y7w=; b=g6RfVtyRzr844kigFqFWHLaCd8810RmO324fJGBhJBLbvrcQYESFr7t9X20y5VtBhF Kj1IFGK/iB2slh+wtuDg3Cdhw14VGEJ51diKgvagpRFvgSGHguBwl8JIpDn5diexsARB AhnrjDW+z/6+t91uw43zRcCpkXJ1N7ut7Q7d7HZOaejdofsmZz+vcJuHp3IKC/L73s/U J7L/f8RhDMTXbDl1F02ubFA3b8vhzi/23sKCPYyOnrUOoFWVOBA0rztNkinV11as2EjS /DQDlWsmOMr7X4raZwShIKPUJtjpkRUatv1mSdjxTnstkQB3z9kxSvBkUoWIBCbapnQB gZgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6K25Rk+jURG0ASVbfGKwW1bl2gEnBYtQHzFYqwQ6Y7w=; b=tKqGqk1EKRhaJwAmRiuuXjfEA01OPOjojXkK860s42QCYnYoyzWLG+oKypiWkAi0ES 4RnQ2K/cPPqOtSqLiImfc+HvNjkIBxv0zkGMwykPlApgTBHoYuMmbYaX1q0wK1ffEGjx 3xSuCIgP9SBc5FkVjFoAJfhzvYJLqDiHBKP1by5GwhXdNWMvUSUM7gbHTMs89WTPko3p VMgnc2W3QnPl9BSYH3xuGMensD4jVUthw0N30w+kEPzJRLXST9OYAPwtdv28Rq7OLD3c 9GHP1AJYCjDKNjmehcIugRm4u9ySK975oQNzBqjFL1tB6LaIEin5fFkRH194RybJn0gn /3jg== X-Gm-Message-State: AOAM530J4ZeDi2+gvMVI6cPKdJvpxX2tuFsXtEmEdbp+AE7rvUA0/7G6 gwqJxO9g7i9RLxTZRKQNn6A= X-Google-Smtp-Source: ABdhPJzsenCwWagdV5cM7EKW5/ie2ZdgVzdFcX24qTN69x+JGApDq0+bSf/gH79bh0xNez1YWK4EQw== X-Received: by 2002:a1c:e90d:: with SMTP id q13mr15724245wmc.163.1621252561866; Mon, 17 May 2021 04:56:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 07/15] softmmu/globals: Remove unused 'hw/i386/*' headers Date: Mon, 17 May 2021 13:55:17 +0200 Message-Id: <20210517115525.1088693-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- softmmu/globals.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/softmmu/globals.c b/softmmu/globals.c index 7d0fc811835..3ebd718e35d 100644 --- a/softmmu/globals.c +++ b/softmmu/globals.c @@ -25,8 +25,6 @@ #include "qemu/osdep.h" #include "exec/cpu-common.h" #include "hw/display/vga.h" -#include "hw/i386/pc.h" -#include "hw/i386/x86.h" #include "hw/loader.h" #include "hw/xen/xen.h" #include "net/net.h" --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252568; cv=none; d=zohomail.com; s=zohoarc; b=fY0VijO8Lof5uBwnVw4q+h0+sy7deruyLCWQeqpJhypqKOMY0YkOxg5TuX9dYdi1LKr4flXElTy2P55eKOkz0QZuL27EC/r4WPDQr50bDGjDt1pTpP8OmT4S+dBvLTSnziIejRNrtuCOjBOvvccwntaBjuJ2EyawWdotilzyb9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nXvmJE3pa9KbD0CunFZ/EN5wHDszvex1L42QnnkAm/k=; b=Wmz1+JuglCH0pUQmwRiHFkkimhwPBYXY+hu1YY6xcRIpROhUdNjLDcwAF6tLoUwaSe8vzqD0PMmouyvUM5adZeo4OQ9P91bfrF6app1Pa3jYSBevqThFrx+VXRUQ7PduUMBIAEm0nUoL6ifwpbdjL/OdLJ0ukQw3HPAp0xFDM/U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1621252568561941.6939018071324; Mon, 17 May 2021 04:56:08 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so5008900wmk.1 for ; Mon, 17 May 2021 04:56:07 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id h14sm14252735wmb.1.2021.05.17.04.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nXvmJE3pa9KbD0CunFZ/EN5wHDszvex1L42QnnkAm/k=; b=Gj70vDFO2vDCHOx01N4yYz28L/3XAqa2+SkSqAnSA9vBbwn9nlk9A934z3/VNQJCAx mVzSwoiVYpgKyEn8MJDqR0ADy3p/Wh/YbqhUiSdSx+qkwzLA2t6ly52zBQESgA65nphJ KZ2gZnruz0uoKo0XUX7AyLdM/4U4keWtWlz3xLvbYlaKFDXhCy76MgaJQczvNz1QMPT3 6v7sOpJLrMjSR+aZn+Q+QUBGRqacmfiMDqnOT+4sZj/KE7MCavgALcnzmF8E3Ic5/6ZC XJs8a3rpG8Uz2lLOkT/W9mc4YY3PEtQOYCyxhCG+yr4NQhutpccpRUjG9F5cmpihpKfn V6lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nXvmJE3pa9KbD0CunFZ/EN5wHDszvex1L42QnnkAm/k=; b=Brx+YLKh2jpv7kjeMevKvGXqdJycjP+/I0ppUh74/SRuDqGFAhdK2sVnYzI7tvOq83 rEWu0qNUO6GczHHRGOhquiZued/DNKzq8aBiOQE01N8Tnp3UQ3FwtPJtowmeHUpulA9K bLI5K3q2uKeobSBlvDoGvaTidUOJ8c79HlR0hZaEaicUbYB0Z6z6D8GrnqAspVsrS3qd LMKE4LP6CoQlf5ckVCb8X48xzSIg9IX8/otxDPYTducqn8fGAFIwgzQlhU8ZekpImHiz wT7hnEbud7C7ABsl2zjaPHCBtuc80Vr0QgSi1W8geQMPEGUkGrcGKYeaT7cFirCBYTjc XnkQ== X-Gm-Message-State: AOAM53138R3Q4pkWqrYs8IiuAq7OTzdNGctrIhNsekrLkE5eKp6fEfSw CncPMQvVvEJ6Bd3SzEWSIws= X-Google-Smtp-Source: ABdhPJy15jE8/1p78nuyYNLa5vAQq09RUdf2eB5TZvDym6cjwrA93ZYtDHhz6uyIOlJ38fseVsKNug== X-Received: by 2002:a1c:4601:: with SMTP id t1mr4452694wma.27.1621252566778; Mon, 17 May 2021 04:56:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 08/15] softmmu/cpu-timers: Remove unused 'exec/exec-all.h' header Date: Mon, 17 May 2021 13:55:18 +0200 Message-Id: <20210517115525.1088693-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- softmmu/cpu-timers.c | 1 - 1 file changed, 1 deletion(-) diff --git a/softmmu/cpu-timers.c b/softmmu/cpu-timers.c index 34ddfa02f1e..204d946a172 100644 --- a/softmmu/cpu-timers.c +++ b/softmmu/cpu-timers.c @@ -28,7 +28,6 @@ #include "migration/vmstate.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "exec/exec-all.h" #include "sysemu/cpus.h" #include "qemu/main-loop.h" #include "qemu/option.h" --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252573; cv=none; d=zohomail.com; s=zohoarc; b=ROeJ1cq3xI1ozgUwsZiAtZdsAt5eAyI8Er40uZUI7cql6SegEHZt7sRTgDHcj7LuZTQ94eG8B8A2HadP88ZEN0YuB4Yq2wxRs0p0A33rYEUAxyV1aKtU9SsQgxpdqrPhKOPPib5mFOqj9tLfflr2CyPjWo7bX9v25ajQaECvwYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252573; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=n6qSXYJyeygMS7hOGRe1NILjaLIrw4Ci3+3bzVyP0vw=; b=i4SZHWMQVIesxI13cGKfnBxC72YuWfqX78zTXDRsTZmW4H4YOyvjN+34HwSIFMVpxdJpjtpaUGO5jV6NFIGn72oDXfWcg/fMK/1yF6ybgIBqg0K8DO3WO+JvP+uGAoKVUPdmau3WXrMZ/b0I/aZiTOMdjV1OO9jtHOIVlwE8nFE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1621252573248204.73800852298166; Mon, 17 May 2021 04:56:13 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id n2so6155787wrm.0 for ; Mon, 17 May 2021 04:56:12 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id z18sm16439930wrh.16.2021.05.17.04.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n6qSXYJyeygMS7hOGRe1NILjaLIrw4Ci3+3bzVyP0vw=; b=NvNwAgn2yGxN2wfL6s8axYgXuVA0E8Npyr9ZAWBBcxPvzNPwEwfiqzyO/VoBALQHzN 9uCtsyg0Ll3Cmes3P+yS2yuLyDBuzl+mfqxaX6bvLCmdgLwq0UGd1zahiWfFNAnlKVWC Ajr2AaONBNDeJ/AHWU9VSMoJxoUBtGsIoUv68zn8TZZOyinqXGDG/PK2IU9LFK46A8il 3IktPIVRSwbeDow6sk4wd7afBv1Vk235HcBSQ76W0J7IcX3BqG7dRWtVp2FNLHI8qiQj cLDzBMhYp8ovmSvT5h8vXY2ZeyOEHXyUvfWPaqdmVuHaBAMgUaZyMYA3wanHdDd7o0JA B+gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=n6qSXYJyeygMS7hOGRe1NILjaLIrw4Ci3+3bzVyP0vw=; b=EvEnz/5jT3zjUO+43baCV7F9JfpZF5BcKbIoaDaSzMkAFqr7aqhNnBy61HurpAhS7U aFJ1n/+sg566jaqeHn8AtyfLp0s0DeQvWLx83XRXSduA6PsyZolSolO6BeX7boVlEZlm ZB7CMTfZSUkRqzsSIVVvB1R7yXIctCSpOBc8qUDTb2UKVXtA6+WLD30SrpEW20UO+4Y0 Y96U3+LSo9ryWNgld0qjQsme5ck79t9IybcHlQnfSDeDxvMWBLU2c9YiHkMCQenanPBK iSzovaxCw28mMGpo/o595n2Ws7Zq51xf6Y5pZgLH1LWgHPXpvIeTbTHU0c+Pzf+jbfGa dHeg== X-Gm-Message-State: AOAM533J6RTHm+PPEB7sXdXCtzekBsVKqwxKTB82zZsJQ6XUEhMPvyaB TmgllI7wkp7CfjsDBsEeCU8= X-Google-Smtp-Source: ABdhPJzygxoSnijySjWm0bzYj3sEXlV0vEaB99JYDCeF3WjDIRd2HvkOeeSUJhcFAd8R7MD04xPkIw== X-Received: by 2002:a05:6000:1449:: with SMTP id v9mr74023234wrx.82.1621252571475; Mon, 17 May 2021 04:56:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 09/15] softmmu/runstate: Clean headers Date: Mon, 17 May 2021 13:55:19 +0200 Message-Id: <20210517115525.1088693-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add the missing 'qemu/log.h' header and remove the unused 'exec/exec-all.h' one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- softmmu/runstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/softmmu/runstate.c b/softmmu/runstate.c index ce8977c6a29..ffd8ddf1341 100644 --- a/softmmu/runstate.c +++ b/softmmu/runstate.c @@ -30,7 +30,6 @@ #include "crypto/cipher.h" #include "crypto/init.h" #include "exec/cpu-common.h" -#include "exec/exec-all.h" #include "exec/gdbstub.h" #include "hw/boards.h" #include "migration/misc.h" @@ -44,6 +43,7 @@ #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/job.h" +#include "qemu/log.h" #include "qemu/module.h" #include "qemu/plugin.h" #include "qemu/sockets.h" --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1621252577; cv=none; d=zohomail.com; s=zohoarc; b=O3S3xxv/Oy++Wj5NX/mCzs0f+2gCjWa5/sv75HBCi4PjI3R18AZTx+dlKde0FuBHk1nxZLPRUD1GlPMHiwQS1OdeAgEao8QlXvkicbLhqV3WJqv+P+5+HDsNnrXaq8cgBwGpzh873xVjoazM77e9DnIP40FkNScna7fHawwhfr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252577; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=beAyqo4khbDHbaVb949CqGnk/6fQrvukzuYEC9WsMck=; b=MwIb6pQK10hJjwCVj9mLb7xaOrYkx1j2gSz6dPlFjiELctsknfybWYXB7hhDxWNN4O1Mb2gS+FBHZDmWgFKCrlQMNxCnpC2oapTxBxq/dpYLLAZxCeAdqJYWkmOsyGVDtTzfPByvikloVFyYBdC/eoA2kpMpKwiMhI2JNXwd5kQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1621252577848632.3424282737686; Mon, 17 May 2021 04:56:17 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id i17so6059788wrq.11 for ; Mon, 17 May 2021 04:56:17 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id t18sm14339758wmq.19.2021.05.17.04.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=beAyqo4khbDHbaVb949CqGnk/6fQrvukzuYEC9WsMck=; b=JRY1NAieOPp/dBnMJEmPysFuZB3xGnjgVH61HrHtiElyqCVaqkrCDhfuBby3TNJ30R aABaFXwzjgXo/JqHYMrqkRTZQGkKuZatKVnl+QONCAKibQdodPTbnWlmBzWqmZadLT6l xSKZNWDU7dteRuftvnIw3jMjcjZNUy+fTthMJsm506PvWKH3+w0E51kIYmjr6r0Pn7uw RGAnKSG7INXM9ge6uwJDbAJY+G0Y12P6usKk8D/d5GCkLot7ZkMEw8jxskLwfZcl29vm sqWLsI5ZIfMbjl8mOxYvj+y5VH3iNRe79YcGbIIFt1CSAL3TJ6UUkD3YN9VUOglN7fPi qpjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=beAyqo4khbDHbaVb949CqGnk/6fQrvukzuYEC9WsMck=; b=KQheh1WytSOENtXyLf9kU1TPrK3sbtfj8upA5QMUO2+s8dJp/E6OULhRI4nXNDRCdO zcJ2FGYWiNFF9RoXE9Lb371pxH/20zKDs+lfMBysN4ij5P7xJ7CDYGa9w36mZHK2lEke ZV/ZyPIpuvDhr+zsM+RzEUEWFfVi4lUSd5tFekPLoT9nsUh+/74nrqDt8wY+vwRaiXi6 rUIV4+Hj2PiCGoo/Mf+Gauf3cwymt703FjZm1MLJB4bSeGbknxwST93QrO/+JsGWDXZj I8RBnUeUg8adpGlA8JXb9lelSJt4ijLjhXJld6STOnCbju6besE5Xvny/SiF87IOMCpu zaVw== X-Gm-Message-State: AOAM531yMjDrLXUcgzpZBGEGQ15XRvPH5TOD7khNy4ntKZzTWgcMiEVw RVUd4Lq017I0kj0BQQ78cQo= X-Google-Smtp-Source: ABdhPJxqxc6ewOrse+3AEqCoD+AeX2NuUq3cDBb/DWs4OuBlHH1TxtZvjCJhwsX2WX2tpgaWUceYgg== X-Received: by 2002:adf:cc81:: with SMTP id p1mr765179wrj.175.1621252576149; Mon, 17 May 2021 04:56:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 10/15] exec/gdbstub: Make gdb_exit() / gdb_set_stop_cpu() target agnostic Date: Mon, 17 May 2021 13:55:20 +0200 Message-Id: <20210517115525.1088693-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) gdb_exit() and gdb_set_stop_cpu() prototypes don't have to be target specific. Remove this limitation to be able to build softmmu/cpus.c and softmmu/runstate.c once for all targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/exec/gdbstub.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index a024a0350df..84b1f2ff2aa 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -45,17 +45,6 @@ void gdb_do_syscall(gdb_syscall_complete_cb cb, const ch= ar *fmt, ...); */ void gdb_do_syscallv(gdb_syscall_complete_cb cb, const char *fmt, va_list = va); int use_gdb_syscalls(void); -void gdb_set_stop_cpu(CPUState *cpu); - -/** - * gdb_exit: exit gdb session, reporting inferior status - * @code: exit code reported - * - * This closes the session and sends a final packet to GDB reporting - * the exit status of the program. It also cleans up any connections - * detritus before returning. - */ -void gdb_exit(int code); =20 #ifdef CONFIG_USER_ONLY /** @@ -177,6 +166,18 @@ static inline uint8_t * gdb_get_reg_ptr(GByteArray *bu= f, int len) */ int gdbserver_start(const char *port_or_device); =20 +/** + * gdb_exit: exit gdb session, reporting inferior status + * @code: exit code reported + * + * This closes the session and sends a final packet to GDB reporting + * the exit status of the program. It also cleans up any connections + * detritus before returning. + */ +void gdb_exit(int code); + +void gdb_set_stop_cpu(CPUState *cpu); + /** * gdb_has_xml: * This is an ugly hack to cope with both new and old gdb. --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252589; cv=none; d=zohomail.com; s=zohoarc; b=j048+A8nn8qWHOOxF1ILlBhClOt6eBtq1S3zFOZnG4WhBxkxt1A2qAoW7RafYA1nIqulixwpK3gevPMCs/RNKF8Y9AQ1cVE4jnpBFuodMUBKfMFvu4Unjkv33neTMj5r3sb7t96mXnOytgLJqvHN6TAmcu/bzqczV20XKWDlQUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252589; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L0W+6Vm5qV+IHP9AnHmUXACYLiu+ypqABP540bBo9bI=; b=bWVtzcgb+cIA4rHSgFuGeAscQTXSOy5TFKeSFKZ2g+x0ckkvuilGPo56nyPO8hb2Y4aEIReyBqKZpVlVH8vWAPO78+oo9N/M0noAJgt4YM3lSdHBsq/s+saBuYcsBk8Yg0ihyLzGVKDeUl+2MsMvb0wVb/OfX7+RS14LsL3GetY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1621252589555425.1575913565906; Mon, 17 May 2021 04:56:29 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id x8so6071289wrq.9 for ; Mon, 17 May 2021 04:56:26 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id g66sm14216444wma.11.2021.05.17.04.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L0W+6Vm5qV+IHP9AnHmUXACYLiu+ypqABP540bBo9bI=; b=p7aCRUuiIQqNZEL/KM6qm+hMp6V/k7IJr2dwRFxI74sCv1KXT6RZd25oxWTPHqAJgp UFuZt7jAtfOJGfPxkpUCkDAEoYyyevkGfLfP5tZ4CKGeoC4eKHoaYfdWDHeFeR3/mxGZ HZLbY8cjDupY2O4mQ4g+LDqsedap9zIB26i9cXKjsTCdnJuo0SleqBlsJAp8v3CQkSXt 5+xqEw+nDZy6kNOJm1hE8F+M7W6T567rH3MxE30xeAkoRR/2N2caK4tEDgY613vHi0FS O/YyPmpvsIbhYKC6qQqO/P4oATdAzAnJeNzANnIT6Qg4ueRg9F0i7X2vgN6sDFOPCmZ1 Vm3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=L0W+6Vm5qV+IHP9AnHmUXACYLiu+ypqABP540bBo9bI=; b=NpXreGkeoFZWUvf2pS8wx/DGaDn00WqbxRo1FnWu83McstQ7cl/ofOo3TTzrf/HJjF At1kyB66LM3ovBjuhVoC2sTMuLZAnWK1VNITRyQuQMkX5NGDcyRVLHe0lemXk45B8ujl GjLXYcHnqM3gswWN1o7FzIuQY/kZ4Ivxx5FCPH/mgmePS2pMP3uZM2L306Ar3MnxJIMr Yjnx/5l7sIN5FSLaIM1klyylo3akFkbaBWjpaHCK4FhHhROBdTe4MxVUNiM6s6V1IOEm tjhQvaQeUl6kpU1ELIqzN7KCp6XWCpyWWGVVpcRmUJtmH+znZ9kl/70GlJ3Gr3OW9qH1 P6VQ== X-Gm-Message-State: AOAM530pBatJFa5lNHWL2/T2h0skyf5WGOtVW3DLAmVQtzIlDsD0DDfZ m5Oa3mYOYGzIAj9lP9KDDbI= X-Google-Smtp-Source: ABdhPJwYt+25OYRCGoVeScVAETWF3UjbAA+Dbj9Dq+/tdMxB3LOCZTCP3Jmk2/3eTBSyscywk9gq2A== X-Received: by 2002:a5d:6b43:: with SMTP id x3mr39863228wrw.263.1621252585741; Mon, 17 May 2021 04:56:25 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 11/15] exec/cpu: Make address_space_init/reloading_memory_map target agnostic Date: Mon, 17 May 2021 13:55:21 +0200 Message-Id: <20210517115525.1088693-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) cpu_address_space_init() and cpu_reloading_memory_map() don't have to be target specific. Remove this limitation to be able to build softmmu/cpus.c once for all targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/exec/cpu-common.h | 23 +++++++++++++++++++++++ include/exec/exec-all.h | 25 ------------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index ccabed4003a..a4fb6813206 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -68,6 +68,28 @@ void qemu_ram_unset_migratable(RAMBlock *rb); size_t qemu_ram_pagesize(RAMBlock *block); size_t qemu_ram_pagesize_largest(void); =20 +/** + * cpu_address_space_init: + * @cpu: CPU to add this address space to + * @asidx: integer index of this address space + * @prefix: prefix to be used as name of address space + * @mr: the root memory region of address space + * + * Add the specified address space to the CPU's cpu_ases list. + * The address space added with @asidx 0 is the one used for the + * convenience pointer cpu->as. + * The target-specific code which registers ASes is responsible + * for defining what semantics address space 0, 1, 2, etc have. + * + * Before the first call to this function, the caller must set + * cpu->num_ases to the total number of address spaces it needs + * to support. + * + * Note that with KVM only one address space is supported. + */ +void cpu_address_space_init(CPUState *cpu, int asidx, + const char *prefix, MemoryRegion *mr); + void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, bool is_write); static inline void cpu_physical_memory_read(hwaddr addr, @@ -80,6 +102,7 @@ static inline void cpu_physical_memory_write(hwaddr addr, { cpu_physical_memory_rw(addr, (void *)buf, len, true); } +void cpu_reloading_memory_map(void); void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen, bool is_write); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 6b036cae8f6..781ee62f395 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -84,31 +84,6 @@ static inline bool cpu_loop_exit_requested(CPUState *cpu) return (int32_t)qatomic_read(&cpu_neg(cpu)->icount_decr.u32) < 0; } =20 -#if !defined(CONFIG_USER_ONLY) -void cpu_reloading_memory_map(void); -/** - * cpu_address_space_init: - * @cpu: CPU to add this address space to - * @asidx: integer index of this address space - * @prefix: prefix to be used as name of address space - * @mr: the root memory region of address space - * - * Add the specified address space to the CPU's cpu_ases list. - * The address space added with @asidx 0 is the one used for the - * convenience pointer cpu->as. - * The target-specific code which registers ASes is responsible - * for defining what semantics address space 0, 1, 2, etc have. - * - * Before the first call to this function, the caller must set - * cpu->num_ases to the total number of address spaces it needs - * to support. - * - * Note that with KVM only one address space is supported. - */ -void cpu_address_space_init(CPUState *cpu, int asidx, - const char *prefix, MemoryRegion *mr); -#endif - #if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) /* cputlb.c */ /** --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252592; cv=none; d=zohomail.com; s=zohoarc; b=WDEC33U8rZum2OcKp0LxiNSkUTAdFWOKvU+DESy/jZLM5v2z5wwzhUclwap6toFzgmucFYRtLgPLfUaIN/yC9ePsv8UlmE0clCYbGhnsyPIEWMm9d9P9VkmCHONDhUZoNM2KYJ8Ub/F4O3mi0mjKkubQioGFLCyK3N1qiTFaLZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252592; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p05OmJSUnMaHriZWyvxG4nEBuEX9uFZwBMmOOJcu+D0=; b=jy/N06ip1AtsnbOHiDzO1ePSRA4+RfqB1N19CRqCyeRYToeGPggjWW67H9RPGArF5vmiLeSapYgifike/X2ko9bp+HlfVseY0hCYaCGBbBTnlvFRnlE4wdm8giZ/5ucliFVfRfYduTCHoX3SGYjtKmh5ZFdCKgq1yDcrpGShclU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1621252592184107.10208901213593; Mon, 17 May 2021 04:56:32 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id k5-20020a05600c4785b0290174b7945d7eso3003739wmo.2 for ; Mon, 17 May 2021 04:56:31 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b81sm15566809wmd.18.2021.05.17.04.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p05OmJSUnMaHriZWyvxG4nEBuEX9uFZwBMmOOJcu+D0=; b=ecQw9znaR0vYWUZIuj4B8nuzmLrvMOZd+LMK6ZgeIGNN6kup4xj5kS7i1Ii/AuA6hA tf4UzkIjwxZ66P5GeQ+C5fbXaqbpeq6KUI0P9syWfQkWBwbfJNd5bpVZo9/6hxtSPGov A3y+b66mmbKSCqvLN8duYzprfuapGP78ywK20PivWms0ps5SR6gDr/vk3acZOzTJAXV/ SxN4B5vRH5bFAXF0u+brI3Wf2ZXP87Z0mj8c/2AsbuImbVQtu/xe1pvRHd6s03UNBWBT sEZfOxuaKxiNhvkmbxhZUvZ3L1S49syG/Yf3EZvyM+07dpqfcUc5QmTH5WA+uP4b9M+p vpow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p05OmJSUnMaHriZWyvxG4nEBuEX9uFZwBMmOOJcu+D0=; b=iobRA6KAyYkiB3D+KCoG0gpN56EtzSQgblN4H2sI9viVsJ4RKsMzRnJ4QYmcTbGCw2 2axynTmTFbb5Q7AkJtrPSZoA0SLOeU1kaarFU7gK6ifDBEDNSNIuTH5JKrionK6NVc2i p+/WBd1jwOtMhc/47+IC7Rj99kp+wkeVMSo0cDnde+GiVnZmJjD2IzPR5I82w2tUPlaS zfFQGZtQ8kAO2JcwAH8BzFGLoGXkZGdBd/0djygKDECGjRjCNexeqqy/VYmn4zO2/6GZ N3n/tDUQEAKjqnXH7xfgcTckTYRzQYX40LEmPoi54eg4sTZhNYP+MyDPMHuuLqC8d3xz 4kUA== X-Gm-Message-State: AOAM533n5T/nhhrvI5kyfsHtTh+peQeZ4HbY7TgvFRf1KNke3LHmiH21 7JhdmDjzTE3DYvy+4lS6PbY= X-Google-Smtp-Source: ABdhPJy3qxpBtoK00l6ykYnLzODQ/NGxvvidVPJ6XwV+/iYPx2BNgAnDWcMyO8iZU8EytNQgBh7J5Q== X-Received: by 2002:a1c:c309:: with SMTP id t9mr20227233wmf.161.1621252590390; Mon, 17 May 2021 04:56:30 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 12/15] sysemu/kvm: Make kvm_on_sigbus() / kvm_on_sigbus_vcpu() target agnostic Date: Mon, 17 May 2021 13:55:22 +0200 Message-Id: <20210517115525.1088693-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) kvm_on_sigbus() and kvm_on_sigbus_vcpu() prototypes don't have to be target specific. Remove this limitation to be able to build softmmu/cpus.c once for all targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/sysemu/kvm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a1ab1ee12d3..d9bced5f392 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -234,6 +234,9 @@ int kvm_has_intx_set_mask(void); bool kvm_arm_supports_user_irq(void); =20 =20 +int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); +int kvm_on_sigbus(int code, void *addr); + #ifdef NEED_CPU_H #include "cpu.h" =20 @@ -246,9 +249,6 @@ int kvm_remove_breakpoint(CPUState *cpu, target_ulong a= ddr, void kvm_remove_all_breakpoints(CPUState *cpu); int kvm_update_guest_debug(CPUState *cpu, unsigned long reinject_trap); =20 -int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); -int kvm_on_sigbus(int code, void *addr); - /* internal API */ =20 int kvm_ioctl(KVMState *s, int type, ...); --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252596; cv=none; d=zohomail.com; s=zohoarc; b=hf9OrKxCLHV4ExVtXxMwwoiurRrcd5TmloVKu6bUPhDI3wH5J9n/b55ztWGT7mSpbPknz604KE82TIysqywgSPqGtyd79b6h87GwDO/VVCWGB19vFov3mJ+jE32U1mNARoc/hAQhn7ksYpSqeoql5fD0Wv3udOk/zeqasoN+I7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=elm9qcdGQk72gqB4ibNX9churq/FsJ3KEAhg0i9d3/Q=; b=nywkYRTUGAxYuD/HWZrWoLB3dZKUmLIPJiC6HfpRLFMboi06bOS9p6AKvBV0nwwsZUAtMgxavSz7qMhd6/77SxRKhYDmcfXheMzgeDN59vGQW/2CzCjY4bWk94/qSQ8kXDDvp+h/vpVoRT5BvSPoh/eZVPOMd8FhMDqkahr9Rgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1621252596862331.65193035716663; Mon, 17 May 2021 04:56:36 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id r12so6103115wrp.1 for ; Mon, 17 May 2021 04:56:36 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id e38sm19636720wmp.21.2021.05.17.04.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=elm9qcdGQk72gqB4ibNX9churq/FsJ3KEAhg0i9d3/Q=; b=SyqO3x6epByKgiVLWqzXpweNnmkfuMBF6TP/J3mAS/ebit1aIkZ6bmRWh/W9+jWy65 m4rd+8JfD0NrO1Nslz6LEZmIYZyBvJH8M2a0O4ghYC78GDea9vos1kulWFkastZchLSy 9AYht9dxddRfJrXgEjwRpm0bFHdi3HxpQ+h2fLRDgIPh7Ggvzxw+yNa+Gtl+p5izjF+l SkRD9/HiFZ5D0d2O+jNWOYF+L8nYi3Ct6rTFeV/GiizBmUbmCC+dvjRnKN6N7MFcdQ17 0LJ3haMb4VCbb+l/UJwmev18IDyNuAacuEeOiEwe35pZlAIrWt9nfR5TqV3KOflNjN+Y euNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=elm9qcdGQk72gqB4ibNX9churq/FsJ3KEAhg0i9d3/Q=; b=EJY0tme/Iis8inUak4MAM01KeZYkxcK6mT8GzjSNkmP3iRnDirGOPm2mezGR+qV2Ec qVgPVX1dMhkm+6N6nG13AiypByZHRFzy9sj8Rc8ub+cwvhBQyHT+Y2VF3Kl9gYTBSwqO vbpjTfL+x6QhmZRYPe0ZAU52Il+6yIczRkm5fi3O/vmtU3g1St7bei+K3pAFMVAlNtj4 k/N0vNkZaEQ1hXg12ya0HFvGuAnoEFL2h8y84gRaA9I+Xi4KN7VvmXXingH2oeTH3XcE T3w4O0HorkNMCCSL0g57aaH63o3QxP6Ly3YcLnEkQWRwbSu4i7o9ROkLVGVmeSbNrZy3 C3Ow== X-Gm-Message-State: AOAM53094pD5gr1jE5u2/R/e46FSulVqugnoLQ2EpVMti8xQf0hkQFRU e6vkfO13laaH57/+400yoXU= X-Google-Smtp-Source: ABdhPJw+jY8vbOb4NTf11Ar5/z/Y2VqSoIiQXVEgb3GcP+4fLXfc3/EzC+b8exRGrXuEtH2VPbMgMA== X-Received: by 2002:adf:cf09:: with SMTP id o9mr23207211wrj.334.1621252595011; Mon, 17 May 2021 04:56:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 13/15] sysemu/memory_mapping: Become target-agnostic Date: Mon, 17 May 2021 13:55:23 +0200 Message-Id: <20210517115525.1088693-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) target_ulong is target-specific, while hwaddr isn't. memory_mapping_list_add_merge_sorted() uses hwaddr arguments anyway, so use the hwaddr type for MemoryMapping::virt_addr. Remove the unnecessary "exec/cpu-defs.h" target-speficic header from "memory_mapping.h" and use the target-agnostic "hw/core/cpu.h" locally in memory_mapping.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/sysemu/memory_mapping.h | 3 +-- softmmu/memory_mapping.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mappin= g.h index 4b20f1a639e..771dba21773 100644 --- a/include/sysemu/memory_mapping.h +++ b/include/sysemu/memory_mapping.h @@ -15,7 +15,6 @@ #define MEMORY_MAPPING_H =20 #include "qemu/queue.h" -#include "exec/cpu-defs.h" #include "exec/memory.h" =20 typedef struct GuestPhysBlock { @@ -43,7 +42,7 @@ typedef struct GuestPhysBlockList { /* The physical and virtual address in the memory mapping are contiguous. = */ typedef struct MemoryMapping { hwaddr phys_addr; - target_ulong virt_addr; + hwaddr virt_addr; ram_addr_t length; QTAILQ_ENTRY(MemoryMapping) next; } MemoryMapping; diff --git a/softmmu/memory_mapping.c b/softmmu/memory_mapping.c index e7af2765466..7bb74df5a7a 100644 --- a/softmmu/memory_mapping.c +++ b/softmmu/memory_mapping.c @@ -17,6 +17,7 @@ #include "sysemu/memory_mapping.h" #include "exec/memory.h" #include "exec/address-spaces.h" +#include "hw/core/cpu.h" =20 //#define DEBUG_GUEST_PHYS_REGION_ADD =20 --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252601; cv=none; d=zohomail.com; s=zohoarc; b=OiM0mjroQS3TSbWELLpM2TprvPjT1m0vlj9QNR3Q4qjVPkq/FEmdFNa8Vny63qBR2vK8Ae208FAIjKRHmIiBEFOx5htQPKYr+Wjm7aEj6jMtdQaVbGVgICCr4GUVJ2bBK1reTArbMY1XOe235V22oLtYJP0f43g8gI/fAfhkvCc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252601; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sd+8rlQTZ1aQWmKwzm10sDs8kTu4DF8a2ZaQBsZHL+s=; b=QfStSRW2frxl9anAs3JZaPXK5WInQdD5i1vWaYdWDlN2tOe6S7QLqe8ZdcJKhfLcPX7Y7+joheiHtG+TS7jB2ug2w7HJUeSLrGPB0LuOZwcR2E9DiUeMlNR3DlXF1tc0QShwgdDSfAqdZ7+xloO6i4m/PYnnRIbDgV+OqB6Nts0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1621252601368351.1868439538964; Mon, 17 May 2021 04:56:41 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id a4so6112862wrr.2 for ; Mon, 17 May 2021 04:56:40 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id z66sm22158561wmc.4.2021.05.17.04.56.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sd+8rlQTZ1aQWmKwzm10sDs8kTu4DF8a2ZaQBsZHL+s=; b=Ef65eCcW+UYXksgChEGOj7hbYMyBJyAD0mcVItG0bhbFrVCDWE6FJxqYPn9NQBtfQB aDvaN3AFxquafO9h5zyoFm7F9H3i4AhJ4HVZrz9ypjLPcPKnA6dfXPiRuZrVLuifeFZ8 cvpS83M38CKWHzipB7ns7t1svqI3jbMbifJjA3Du77akusC3lR2WUXQ6XOAB8+O2TUHK auFqH8huq0gFksLNTHrJaVS9POX/ZRoaa9EnicNBuqgaAu8cnrEwDiu3eLFeu8zd5fmC /0Rcak/mkpWlq7frlfqatsSLxdhHmsSyQr51p/YpkLqRgX4F7VPPxvPcIUDqf0bWyTr8 +l3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sd+8rlQTZ1aQWmKwzm10sDs8kTu4DF8a2ZaQBsZHL+s=; b=Nsip0Q2ucwgbQKsdfTcnbLMCN/CVRbVMyRTNH9Kn9c/Hq0sdq/44NZSP4bW023JwdZ SfjzLX2Qr0LSY+UjauVIHmRzW+Er+kPgCRyXPR+wpvv2fwlQ1hybjU/ib1zRtK4ZWPqv FsdXqTA1X5fLTsom4OFw2WNU6pkFw8GGByXVn/dBrkd2AoV6P3wrWWAZwmU8uOic+Fw1 4LPZINfVdQ1VfYVT9g5nb+H9pZLnVh2LK45F2GuTi2JqKWO7iSz5DfFjQvOzUBX7j58k 9Y6eKA7cw3itgn9RXvoet+Zabzy5TX53E44ERH3kxzvEsRhuPLdrvjX2j3JNkp9govDI 4uUg== X-Gm-Message-State: AOAM533s2kfVE8OJzmTtG7ZE71cfRm+kWex3/4yltDjMcZOefAYNzdom HJvnGHRZ4exXUs0LqeKrvkA= X-Google-Smtp-Source: ABdhPJwQyaKdsUaWI3uJSHGdeYnG2iypDW3Iu9cqX48JnACSPkGTMnx1Fsl7uu4Qr6wgpAOXL3RE4w== X-Received: by 2002:adf:df8d:: with SMTP id z13mr30592907wrl.267.1621252599559; Mon, 17 May 2021 04:56:39 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 14/15] softmmu/cpus: Extract QMP command handlers to cpus-qmp.c Date: Mon, 17 May 2021 13:55:24 +0200 Message-Id: <20210517115525.1088693-15-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) qmp_memsave() and qmp_pmemsave() call cpu_memory_rw_debug() and cpu_physical_memory_read(), which are target specific prototypes. To be able to build softmmu/cpus.c once for all targets, extract the QMP commands handlers to a new file which will be built per target. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- softmmu/cpus-qmp.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ softmmu/cpus.c | 89 ---------------------------------- softmmu/meson.build | 1 + 3 files changed, 116 insertions(+), 89 deletions(-) create mode 100644 softmmu/cpus-qmp.c diff --git a/softmmu/cpus-qmp.c b/softmmu/cpus-qmp.c new file mode 100644 index 00000000000..7b613028225 --- /dev/null +++ b/softmmu/cpus-qmp.c @@ -0,0 +1,115 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "exec/exec-all.h" +#include "qapi/error.h" +#include "qapi/qmp/qerror.h" +#include "qapi/qapi-commands-machine.h" +#include "monitor/monitor.h" +#include "hw/nmi.h" + +void qmp_memsave(int64_t addr, int64_t size, const char *filename, + bool has_cpu, int64_t cpu_index, Error **errp) +{ + FILE *f; + uint32_t l; + CPUState *cpu; + uint8_t buf[1024]; + int64_t orig_addr =3D addr, orig_size =3D size; + + if (!has_cpu) { + cpu_index =3D 0; + } + + cpu =3D qemu_get_cpu(cpu_index); + if (cpu =3D=3D NULL) { + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", + "a CPU number"); + return; + } + + f =3D fopen(filename, "wb"); + if (!f) { + error_setg_file_open(errp, errno, filename); + return; + } + + while (size !=3D 0) { + l =3D sizeof(buf); + if (l > size) { + l =3D size; + } + if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) !=3D 0) { + error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRId64 + " specified", orig_addr, orig_size); + goto exit; + } + if (fwrite(buf, 1, l, f) !=3D l) { + error_setg(errp, QERR_IO_ERROR); + goto exit; + } + addr +=3D l; + size -=3D l; + } + +exit: + fclose(f); +} + +void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, + Error **errp) +{ + FILE *f; + uint32_t l; + uint8_t buf[1024]; + + f =3D fopen(filename, "wb"); + if (!f) { + error_setg_file_open(errp, errno, filename); + return; + } + + while (size !=3D 0) { + l =3D sizeof(buf); + if (l > size) { + l =3D size; + } + cpu_physical_memory_read(addr, buf, l); + if (fwrite(buf, 1, l, f) !=3D l) { + error_setg(errp, QERR_IO_ERROR); + goto exit; + } + addr +=3D l; + size -=3D l; + } + +exit: + fclose(f); +} + +void qmp_inject_nmi(Error **errp) +{ + nmi_monitor_handle(monitor_get_cpu_index(monitor_cur()), errp); +} diff --git a/softmmu/cpus.c b/softmmu/cpus.c index a7ee431187a..e3810135166 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -24,20 +24,14 @@ =20 #include "qemu/osdep.h" #include "qemu-common.h" -#include "monitor/monitor.h" #include "qapi/error.h" -#include "qapi/qapi-commands-machine.h" -#include "qapi/qapi-commands-misc.h" #include "qapi/qapi-events-run-state.h" -#include "qapi/qmp/qerror.h" #include "exec/gdbstub.h" #include "sysemu/hw_accel.h" -#include "exec/exec-all.h" #include "qemu/thread.h" #include "qemu/plugin.h" #include "sysemu/cpus.h" #include "qemu/guest-random.h" -#include "hw/nmi.h" #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" @@ -720,86 +714,3 @@ void list_cpus(const char *optarg) cpu_list(); #endif } - -void qmp_memsave(int64_t addr, int64_t size, const char *filename, - bool has_cpu, int64_t cpu_index, Error **errp) -{ - FILE *f; - uint32_t l; - CPUState *cpu; - uint8_t buf[1024]; - int64_t orig_addr =3D addr, orig_size =3D size; - - if (!has_cpu) { - cpu_index =3D 0; - } - - cpu =3D qemu_get_cpu(cpu_index); - if (cpu =3D=3D NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "cpu-index", - "a CPU number"); - return; - } - - f =3D fopen(filename, "wb"); - if (!f) { - error_setg_file_open(errp, errno, filename); - return; - } - - while (size !=3D 0) { - l =3D sizeof(buf); - if (l > size) - l =3D size; - if (cpu_memory_rw_debug(cpu, addr, buf, l, 0) !=3D 0) { - error_setg(errp, "Invalid addr 0x%016" PRIx64 "/size %" PRId64 - " specified", orig_addr, orig_size); - goto exit; - } - if (fwrite(buf, 1, l, f) !=3D l) { - error_setg(errp, QERR_IO_ERROR); - goto exit; - } - addr +=3D l; - size -=3D l; - } - -exit: - fclose(f); -} - -void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, - Error **errp) -{ - FILE *f; - uint32_t l; - uint8_t buf[1024]; - - f =3D fopen(filename, "wb"); - if (!f) { - error_setg_file_open(errp, errno, filename); - return; - } - - while (size !=3D 0) { - l =3D sizeof(buf); - if (l > size) - l =3D size; - cpu_physical_memory_read(addr, buf, l); - if (fwrite(buf, 1, l, f) !=3D l) { - error_setg(errp, QERR_IO_ERROR); - goto exit; - } - addr +=3D l; - size -=3D l; - } - -exit: - fclose(f); -} - -void qmp_inject_nmi(Error **errp) -{ - nmi_monitor_handle(monitor_get_cpu_index(monitor_cur()), errp); -} - diff --git a/softmmu/meson.build b/softmmu/meson.build index d8e03018abf..5e578b20e6c 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -2,6 +2,7 @@ 'arch_init.c', 'balloon.c', 'cpus.c', + 'cpus-qmp.c', 'cpu-throttle.c', 'datadir.c', 'globals.c', --=20 2.26.3 From nobody Sat May 18 05:53:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621252606; cv=none; d=zohomail.com; s=zohoarc; b=TxmA6URGcQSPeV7tJXuacEtvE6eOkSv4X4AHtP6zzeBJw10WGgn6eCBZH0Njs0Jtk65b376SdtYe9HS3jW87twwOsDvi4Rf7x0PhAJSJfF9ND84A3z2npEA34vsQbT8cRjhyFqWKo4udEOAPATlVfA0B6Zm0BqnW4sxzyJeKApE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621252606; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m+MsLzuZDqfLZAxBKNrCafeqXV0sWDn9fgPx9NJiYpI=; b=DVS1m1ByHxAV/726YxvlvtCQ7mCowew3CIHeriZ2RrT3+GUsTgPcZgZt9xjDvw2Ok8C+PrIVUJLdyWWf3AGC8uurCg5xqtkA6+AqZ+Z+/3ffjBeRKYzTN2SdG4+Sq2RWh24HfOjhAKD7U5210/nipIoO4iizwhzgHRwcGF0LwJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1621252606011141.76667336599473; Mon, 17 May 2021 04:56:46 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id y184-20020a1ce1c10000b02901769b409001so2024333wmg.3 for ; Mon, 17 May 2021 04:56:45 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id u16sm15846419wmj.27.2021.05.17.04.56.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 04:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m+MsLzuZDqfLZAxBKNrCafeqXV0sWDn9fgPx9NJiYpI=; b=N0yXozTxEdFGhrtpSq+2LtC3g12YsIB8yGnYPCt4MtFIeCPd89TNPVkM+f/SiQBlsA lTWc8wdH72aJKHWrB5e0yzZzRb+0zJOJgIHYCd9b6ye/4KhcxZo8zJjl+a4Dwb62j6po l9wfkPhKnyaeAsXGmFm0GOLGE0bcGSO2j5qYAiy1sDqCEyXThqY257id6G5pQx/Xy1wa pnkiVQnq5N7Xbid6SDNS/cUXH3QSf9vsccqUe/YoaMvwLV3uwEyFGBkYUXBQ+X8PCYaN Tuu1AvvE1U+x4CuBOCsIGlVnpkaZnS5tVAYvE/NpErkF3TsMhjWhfPOiRSyvL4ixE00w l3nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=m+MsLzuZDqfLZAxBKNrCafeqXV0sWDn9fgPx9NJiYpI=; b=GVs5LCt8x4wT7eEK2LEYlQyu6h4NKtgdAv7n1YjS7P4KkIDGD7i7r0RSuzED+jvYfQ frS/1FM5MNtrDNAiakToGMtky8m/sVWXDBm7wl8gZY7/mdW2VjGKLwkiUgkiXCzV7/iy LNT/a9iU4gulYOeAqCbeMaaf3mYNkcimg8GRLBg2Qa03TeeFXtiPtu/VOx1oAmnURwFB 19GeGxIaOvLCrvpSFxz25PW1ixonko0RhZkUtgaZ33ZwdvmEr0Uf31ZTEZxrCn8Ey7uR DR9CWJBh6yBdGkHM9eSygMIV9drbc/PT6sFltA4LsQyyLfz46YYYLGumknmw4j0NLCmj ArnA== X-Gm-Message-State: AOAM532QvZ5gz0VP+tvT5sGL+ZqGW6eApjT7Pd+fE9q+ZzDOrBUnY7OJ j1oA8RXwxSG+VYjyjD39br0= X-Google-Smtp-Source: ABdhPJwlE0FH/AZTV1/bt9LrbN2BnP3ERfWBigDq0y26JqvBJOh7F6/Z34Zk5l+w+fBkGQPzj2pIgQ== X-Received: by 2002:a7b:ca55:: with SMTP id m21mr7297959wml.77.1621252604276; Mon, 17 May 2021 04:56:44 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Richard Henderson , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 15/15] softmmu: Build target-agnostic objects once Date: Mon, 17 May 2021 13:55:25 +0200 Message-Id: <20210517115525.1088693-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210517115525.1088693-1-f4bug@amsat.org> References: <20210517115525.1088693-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Various softmmu objects aren't target specific. Move them to the generic softmmu source set. For our 31 softmmu targets, this is in total 330 objects less to build! Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- softmmu/meson.build | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/softmmu/meson.build b/softmmu/meson.build index 5e578b20e6c..f98a5972d23 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -1,21 +1,10 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( 'arch_init.c', - 'balloon.c', - 'cpus.c', 'cpus-qmp.c', - 'cpu-throttle.c', - 'datadir.c', - 'globals.c', - 'physmem.c', 'ioport.c', - 'rtc.c', - 'runstate.c', 'memory.c', - 'memory_mapping.c', + 'physmem.c', 'qtest.c', - 'vl.c', - 'cpu-timers.c', - 'runstate-action.c', )]) =20 specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( @@ -23,9 +12,20 @@ )]) =20 softmmu_ss.add(files( + 'balloon.c', 'bootdevice.c', + 'cpus.c', + 'cpu-throttle.c', + 'cpu-timers.c', + 'datadir.c', 'dma-helpers.c', + 'globals.c', + 'memory_mapping.c', 'qdev-monitor.c', + 'rtc.c', + 'runstate-action.c', + 'runstate.c', + 'vl.c', ), sdl, libpmem, libdaxctl) =20 softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c')) --=20 2.26.3