commit e69b32b78df6362ad80b9736762d46087148e2b2
author Petr Hosek <phosek@google.com> Thu Apr 25 15:28:42 2024 +0000
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 25 15:28:42 2024 +0000
tree 746394c18ff3cf7df5f49d1598004c129f9a0db3
parent 81c5614893046095f4ee1217d459c08e8ab41c50

[qemu] Don't explicitly disable vhost support

We can instead rely on autodetection and include the vhost support when
available since it can be useful in some scenarios.

Change-Id: Id6a1e7acb42ebd0a34322e340e390903565094de
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/1036392
Fuchsia-Auto-Submit: Petr Hosek <phosek@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Oliver Newman <olivernewman@google.com>

recipes/qemu.expected/linux-amd64.json

diff --git a/recipes/qemu.expected/linux-amd64.json b/recipes/qemu.expected/linux-amd64.json
index f0977c7..4b806ac 100644
--- a/recipes/qemu.expected/linux-amd64.json
+++ b/recipes/qemu.expected/linux-amd64.json
@@ -8466,11 +8466,6 @@
       "-Dusb_redir=disabled",
       "-Dvde=disabled",
       "-Dvdi=disabled",
-      "-Dvhost_net=disabled",
-      "-Dvhost_user=disabled",
-      "-Dvhost_crypto=disabled",
-      "-Dvhost_vdpa=disabled",
-      "-Dvhost_user_blk_server=disabled",
       "-Dvirglrenderer=disabled",
       "-Dvirtfs=disabled",
       "-Dvnc=disabled",

recipes/qemu.expected/linux-arm64.json

diff --git a/recipes/qemu.expected/linux-arm64.json b/recipes/qemu.expected/linux-arm64.json
index 593b8d8..56c02d7 100644
--- a/recipes/qemu.expected/linux-arm64.json
+++ b/recipes/qemu.expected/linux-arm64.json
@@ -8467,11 +8467,6 @@
       "-Dusb_redir=disabled",
       "-Dvde=disabled",
       "-Dvdi=disabled",
-      "-Dvhost_net=disabled",
-      "-Dvhost_user=disabled",
-      "-Dvhost_crypto=disabled",
-      "-Dvhost_vdpa=disabled",
-      "-Dvhost_user_blk_server=disabled",
       "-Dvirglrenderer=disabled",
       "-Dvirtfs=disabled",
       "-Dvnc=disabled",

recipes/qemu.expected/mac-amd64.json

diff --git a/recipes/qemu.expected/mac-amd64.json b/recipes/qemu.expected/mac-amd64.json
index 92c65de..57d6f96 100644
--- a/recipes/qemu.expected/mac-amd64.json
+++ b/recipes/qemu.expected/mac-amd64.json
@@ -8029,11 +8029,6 @@
       "-Dusb_redir=disabled",
       "-Dvde=disabled",
       "-Dvdi=disabled",
-      "-Dvhost_net=disabled",
-      "-Dvhost_user=disabled",
-      "-Dvhost_crypto=disabled",
-      "-Dvhost_vdpa=disabled",
-      "-Dvhost_user_blk_server=disabled",
       "-Dvirglrenderer=disabled",
       "-Dvirtfs=disabled",
       "-Dvnc=disabled",

recipes/qemu.py

diff --git a/recipes/qemu.py b/recipes/qemu.py
index 237ef11..5a9448d 100644
--- a/recipes/qemu.py
+++ b/recipes/qemu.py
@@ -954,11 +954,6 @@
                     "-Dusb_redir=disabled",
                     "-Dvde=disabled",
                     "-Dvdi=disabled",
-                    "-Dvhost_net=disabled",
-                    "-Dvhost_user=disabled",
-                    "-Dvhost_crypto=disabled",
-                    "-Dvhost_vdpa=disabled",
-                    "-Dvhost_user_blk_server=disabled",
                     "-Dvirglrenderer=disabled",
                     "-Dvirtfs=disabled",
                     "-Dvnc=disabled",