These arguments control IA32 HLT and PAUSE instructions, so
there are supported only on amd64.

Signed-off-by: Roman Bogorodskiy <[email protected]>
---
 src/bhyve/bhyve_command.c                                 | 8 ++++++--
 tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args   | 2 --
 .../bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args  | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index e6dddfcf97..8c1e06b736 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -928,9 +928,13 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, 
virDomainDef *def,
      *
      * The PAUSE exit is most useful when there are large numbers of guest VMs 
running,
      * since it forces the guest to exit when it spins on a lock acquisition.
+     *
+     * These flags are currently supported on amd64 only.
      */
-    virCommandAddArg(cmd, "-H"); /* vmexit from guest on hlt */
-    virCommandAddArg(cmd, "-P"); /* vmexit from guest on pause */
+    if (ARCH_IS_X86(def->os.arch)) {
+        virCommandAddArg(cmd, "-H"); /* vmexit from guest on hlt */
+        virCommandAddArg(cmd, "-P"); /* vmexit from guest on pause */
+    }
 
     virCommandAddArgList(cmd, "-s", "0:0,hostbridge", NULL);
 
diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args 
b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args
index b8388f5691..51eef94fd0 100644
--- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args
+++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-base.args
@@ -2,8 +2,6 @@ bhyve \
 -c 1 \
 -m 214 \
 -u \
--H \
--P \
 -s 0:0,hostbridge \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
 -s 2:0,virtio-blk,/tmp/freebsd.img \
diff --git a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args 
b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args
index 73d0005faf..ae0e6bc1b3 100644
--- a/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args
+++ b/tests/bhyvexml2argvdata/aarch64/bhyvexml2argv-console.args
@@ -2,8 +2,6 @@ bhyve \
 -c 1 \
 -m 214 \
 -u \
--H \
--P \
 -s 0:0,hostbridge \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
 -s 2:0,virtio-blk,/tmp/freebsd.img \
-- 
2.51.2

Reply via email to