From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefan Hajnoczi" <stefanha@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Warner Losh" <imp@bsdimp.com>, "Song Gao" <gaosong@loongson.cn>,
"Zhao Liu" <zhao1.liu@intel.com>
Subject: [PULL 08/19] target: Restrict 'sysemu/reset.h' to system emulation
Date: Wed, 20 Dec 2023 10:40:54 +0100 [thread overview]
Message-ID: <20231220094105.6588-9-thuth@redhat.com> (raw)
In-Reply-To: <20231220094105.6588-1-thuth@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
vCPU "reset" is only possible with system emulation.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-ID: <20231212113640.30287-5-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
target/i386/cpu.c | 2 +-
target/loongarch/cpu.c | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index cd16cb893d..95d5f16cd5 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -24,7 +24,6 @@
#include "qemu/hw-version.h"
#include "cpu.h"
#include "tcg/helper-tcg.h"
-#include "sysemu/reset.h"
#include "sysemu/hvf.h"
#include "hvf/hvf-i386.h"
#include "kvm/kvm_i386.h"
@@ -37,6 +36,7 @@
#include "hw/qdev-properties.h"
#include "hw/i386/topology.h"
#ifndef CONFIG_USER_ONLY
+#include "sysemu/reset.h"
#include "qapi/qapi-commands-machine-target.h"
#include "exec/address-spaces.h"
#include "hw/boards.h"
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c
index fc075952e6..b26187dfde 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -17,7 +17,9 @@
#include "internals.h"
#include "fpu/softfloat-helpers.h"
#include "cpu-csr.h"
+#ifndef CONFIG_USER_ONLY
#include "sysemu/reset.h"
+#endif
#include "tcg/tcg.h"
#include "vec.h"
--
2.43.0
next prev parent reply other threads:[~2023-12-20 9:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-20 9:40 [PULL 00/19] First batch of misc patches for QEMU 9.0 Thomas Huth
2023-12-20 9:40 ` [PULL 01/19] hw: Add compat machines for 9.0 Thomas Huth
2023-12-20 9:40 ` [PULL 02/19] MAINTAINERS: Add some more vmware-related files to the corresponding section Thomas Huth
2023-12-20 9:40 ` [PULL 03/19] system/qtest: Include missing 'hw/core/cpu.h' header Thomas Huth
2023-12-20 9:40 ` [PULL 04/19] system/qtest: Restrict QTest API to system emulation Thomas Huth
2023-12-20 9:40 ` [PULL 05/19] hw/ppc/spapr_hcall: Remove unused 'exec/exec-all.h' included header Thomas Huth
2023-12-20 9:40 ` [PULL 06/19] hw/misc/mips_itu: Remove unnecessary 'exec/exec-all.h' header Thomas Huth
2023-12-20 9:40 ` [PULL 07/19] hw/s390x/ipl: Remove unused 'exec/exec-all.h' included header Thomas Huth
2023-12-20 9:40 ` Thomas Huth [this message]
2023-12-20 9:40 ` [PULL 09/19] docs/system/arm: Fix for rename of type "xlnx.bbram-ctrl" Thomas Huth
2023-12-20 9:40 ` [PULL 10/19] hw: Replace anti-social QOM type names (again) Thomas Huth
2023-12-20 9:40 ` [PULL 11/19] memory: Remove "qemu:" prefix from the "qemu:ram-discard-manager" type name Thomas Huth
2023-12-20 9:40 ` [PULL 12/19] tests/unit/test-io-task: Rename "qemu:dummy" to avoid colon in the name Thomas Huth
2023-12-20 9:40 ` [PULL 13/19] qom/object: Limit type names to alphanumerical and some few special characters Thomas Huth
2023-12-20 9:41 ` [PULL 14/19] tests/qtest/migration-test: Fix analyze-migration.py for s390x Thomas Huth
2023-12-20 9:41 ` [PULL 15/19] qemu-options: Clarify handling of commas in options parameters Thomas Huth
2023-12-20 9:41 ` [PULL 16/19] tests/qtest/npcm7xx_pwm-test: Only do full testing in slow mode Thomas Huth
2023-12-20 9:41 ` [PULL 17/19] tests/unit/test-qmp-event: Drop superfluous mutex Thomas Huth
2023-12-20 9:41 ` [PULL 18/19] tests/unit/test-qmp-event: Simplify event emission check Thomas Huth
2023-12-20 9:41 ` [PULL 19/19] tests/unit/test-qmp-event: Replace fixture by global variables Thomas Huth
2023-12-20 16:03 ` [PULL 00/19] First batch of misc patches for QEMU 9.0 Stefan Hajnoczi
2023-12-20 23:11 ` Alex Bennée
2023-12-21 0:09 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231220094105.6588-9-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=gaosong@loongson.cn \
--cc=imp@bsdimp.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).