Date: Wed, 28 Jul 2021 15:28:01 GMT From: =?utf-8?Q?Roger Pau Monn=C3=A9?= <royger@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 46c46edd1889 - main - xen/control: print warning on call of xctrl_suspend() Message-ID: <202107281528.16SFS1qh088159@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=46c46edd18894e75a51b004f1abc1894c78864fe commit 46c46edd18894e75a51b004f1abc1894c78864fe Author: Julien Grall <julien@xen.org> AuthorDate: 2014-01-14 01:41:15 +0000 Commit: Roger Pau Monné <royger@FreeBSD.org> CommitDate: 2021-07-28 15:27:05 +0000 xen/control: print warning on call of xctrl_suspend() Presently suspend/resume and migration aren't supported on Xen/ARM. As such this shouldn't ever occur. This likely applies to future Xen architectures (RISC-V) and xctrl_suspend() needs dependency on intr_machdep.h fixed. Submitted by: Elliott Mitchell <ehem+freebsd@m5p.com> Reviewed by: royger Differential Revision: https://reviews.freebsd.org/D29599 --- sys/dev/xen/control/control.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c index f72193edceea..234ebdf530b0 100644 --- a/sys/dev/xen/control/control.c +++ b/sys/dev/xen/control/control.c @@ -130,9 +130,9 @@ __FBSDID("$FreeBSD$"); #include <geom/geom.h> #include <machine/_inttypes.h> +#if defined(__amd64__) || defined(__i386__) #include <machine/intr_machdep.h> -#if defined(__amd64__) || defined(__i386__) #include <x86/apicvar.h> #endif @@ -196,6 +196,13 @@ xctrl_reboot() shutdown_nice(0); } +#if !defined(__amd64__) && !defined(__i386__) +static void +xctrl_suspend() +{ + printf("WARNING: xen/control: Suspend not supported!\n"); +} +#else /* __amd64__ || __i386__ */ static void xctrl_suspend() { @@ -332,6 +339,7 @@ xctrl_suspend() printf("System resumed after suspension\n"); } +#endif /* __amd64__ || __i386__ */ static void xctrl_crash()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107281528.16SFS1qh088159>