Extract VmmMode to a separate file out of cuttlefish_config.h

Databean · Databean · commit 35b3c73e9741 · 2025-07-30T23:23:29.000Z
Bug: b/435249938
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
@@ -163,6 +163,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:data_image",
         "//cuttlefish/host/libs/config:fetcher_config",
         "//cuttlefish/host/libs/config:instance_nums",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/feature:inject",
         "//libbase",
         "@gflags",
@@ -176,7 +177,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:files",
         "//cuttlefish/common/libs/utils:result",
-        "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/image_aggregator",
         "//cuttlefish/host/libs/image_aggregator:qcow2",
         "//libbase",
@@ -198,6 +199,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:fetcher_config",
         "//cuttlefish/host/libs/config:instance_nums",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//libbase",
     ],
 )
@@ -268,6 +270,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:host_tools_version",
         "//cuttlefish/host/libs/config:instance_nums",
         "//cuttlefish/host/libs/config:secure_hals",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/vhal_proxy_server",
         "//cuttlefish/host/libs/vm_manager",
         "//libbase",
@@ -327,6 +330,7 @@ cf_cc_library(
         "//cuttlefish/host/graphics_detector:graphics_detector_cc_proto",
         "//cuttlefish/host/libs/config:config_constants",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//libbase",
         "@fmt",
         "@protobuf",
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc
@@ -56,6 +56,7 @@
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/data_image.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel
@@ -195,6 +195,7 @@ cf_cc_library(
         "//cuttlefish/host/commands/assemble_cvd/disk:generate_persistent_vbmeta",
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/image_aggregator",
         "//cuttlefish/host/libs/vm_manager",
         "@gflags",
@@ -308,6 +309,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:data_image",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/image_aggregator:qcow2",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/initialize_instance_composite_disk.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/initialize_instance_composite_disk.cc
@@ -17,7 +17,6 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk/initialize_instance_composite_disk.h"
 
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "cuttlefish/common/libs/utils/files.h"
@@ -27,6 +26,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/disk_builder.h"
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/image_aggregator/image_aggregator.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/sd_card.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk/sd_card.cc
@@ -20,6 +20,7 @@
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/data_image.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/image_aggregator/qcow2.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.cpp
@@ -22,7 +22,7 @@
 #include <android-base/file.h>
 
 #include "cuttlefish/common/libs/utils/files.h"
-#include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/image_aggregator/image_aggregator.h"
 #include "cuttlefish/host/libs/image_aggregator/qcow2.h"
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_builder.h
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "cuttlefish/common/libs/utils/result.h"
-#include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/image_aggregator/image_aggregator.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_image_flags_vectorization.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/disk_image_flags_vectorization.cc
@@ -34,6 +34,7 @@
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/fetcher_config.h"
 #include "cuttlefish/host/libs/config/instance_nums.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc
@@ -66,6 +66,7 @@
 #include "cuttlefish/host/libs/config/host_tools_version.h"
 #include "cuttlefish/host/libs/config/instance_nums.h"
 #include "cuttlefish/host/libs/config/secure_hals.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/vhal_proxy_server/vhal_proxy_server_eth_addr.h"
 #include "cuttlefish/host/libs/vm_manager/gem5_manager.h"
 #include "cuttlefish/host/libs/vm_manager/qemu_manager.h"
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags/BUILD.bazel
@@ -90,7 +90,7 @@ cf_cc_library(
         "//cuttlefish/common/libs/utils:result",
         "//cuttlefish/host/commands/assemble_cvd:flags_defaults",
         "//cuttlefish/host/commands/assemble_cvd:guest_config",
-        "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//libbase",
         "@gflags",
     ],
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags/vm_manager.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags/vm_manager.cc
@@ -25,7 +25,7 @@
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/flags_defaults.h"
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
-#include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 DEFINE_string(vm_manager, CF_DEFAULTS_VM_MANAGER,
               "What virtual machine manager to use, one of {qemu_cli, crosvm}");
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/flags/vm_manager.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/flags/vm_manager.h
@@ -19,7 +19,7 @@
 
 #include "cuttlefish/common/libs/utils/result.h"
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
-#include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc
@@ -30,6 +30,7 @@
 #include "cuttlefish/host/graphics_detector/graphics_detector.pb.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 #ifdef __APPLE__
 #define CF_UNUSED_ON_MACOS [[maybe_unused]]
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.h b/base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.h
@@ -21,6 +21,7 @@
 #include "cuttlefish/host/commands/assemble_cvd/guest_config.h"
 #include "cuttlefish/host/graphics_detector/graphics_detector.pb.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 
diff --git a/base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel b/base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel
@@ -21,6 +21,7 @@ cf_cc_binary(
         "//cuttlefish/common/libs/utils:tee_logging",
         "//cuttlefish/host/commands/metrics/proto:metrics_protos",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/metrics",
         "//cuttlefish/host/libs/metrics:metrics_headers",
         "//cuttlefish/host/libs/msg_queue",
diff --git a/base/cvd/cuttlefish/host/commands/metrics/events.cc b/base/cvd/cuttlefish/host/commands/metrics/events.cc
@@ -22,6 +22,7 @@
 #include "cuttlefish/host/commands/metrics/proto/cf_metrics_protos.h"
 #include "cuttlefish/host/commands/metrics/utils.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/metrics/metrics_defs.h"
 
 namespace cuttlefish {
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel
@@ -86,6 +86,7 @@ cf_cc_binary(
         "//cuttlefish/host/libs/config:custom_actions",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:data_image",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/config/adb",
         "//cuttlefish/host/libs/config/fastboot",
         "//cuttlefish/host/libs/feature",
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel b/base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel
@@ -274,6 +274,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:ap_boot_flow",
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:openwrt_args",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/feature",
         "//cuttlefish/host/libs/vm_manager",
         "//libbase",
@@ -411,6 +412,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:cuttlefish_config",
         "//cuttlefish/host/libs/config:guest_os",
         "//cuttlefish/host/libs/config:known_paths",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//cuttlefish/host/libs/feature",
         "//libbase",
         "@fmt",
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/open_wrt.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/launch/open_wrt.cpp
@@ -33,6 +33,7 @@
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
 #include "cuttlefish/host/libs/config/openwrt_args.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
 #include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/host/libs/vm_manager/crosvm_builder.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/launch/streamer.cpp b/base/cvd/cuttlefish/host/commands/run_cvd/launch/streamer.cpp
@@ -42,6 +42,7 @@
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/custom_actions.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/config/guest_os.h"
 #include "cuttlefish/host/libs/config/known_paths.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
diff --git a/base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl.h b/base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl.h
@@ -32,6 +32,7 @@
 #include "cuttlefish/host/libs/command_util/runner/defs.h"
 #include "cuttlefish/host/libs/command_util/util.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 #include "cuttlefish/host/libs/feature/command_source.h"
 #include "cuttlefish/host/libs/feature/feature.h"
 #include "cuttlefish/host/libs/feature/inject.h"
diff --git a/base/cvd/cuttlefish/host/libs/config/BUILD.bazel b/base/cvd/cuttlefish/host/libs/config/BUILD.bazel
@@ -106,6 +106,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:config_fragment",
         "//cuttlefish/host/libs/config:config_utils",
         "//cuttlefish/host/libs/config:secure_hals",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//libbase",
         "@fmt",
         "@jsoncpp",
@@ -130,6 +131,7 @@ cf_cc_library(
         "//cuttlefish/host/libs/config:esp",
         "//cuttlefish/host/libs/config:mbr",
         "//cuttlefish/host/libs/config:openwrt_args",
+        "//cuttlefish/host/libs/config:vmm_mode",
         "//libbase",
     ],
 )
@@ -218,6 +220,7 @@ cf_cc_library(
     deps = [
         "//cuttlefish/common/libs/utils:architecture",
         "//cuttlefish/host/libs/config:cuttlefish_config",
+        "//cuttlefish/host/libs/config:vmm_mode",
     ],
 )
 
@@ -276,3 +279,14 @@ cf_cc_library(
         "//libbase",
     ],
 )
+
+cf_cc_library(
+    name = "vmm_mode",
+    srcs = ["vmm_mode.cc"],
+    hdrs = ["vmm_mode.h"],
+    deps = [
+        "//cuttlefish/common/libs/utils:result",
+        "//libbase",
+        "@fmt",
+    ],
+)
diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.cpp b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.cpp
@@ -39,6 +39,7 @@
 #include "cuttlefish/host/libs/config/config_constants.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/secure_hals.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 namespace {
diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config.h
@@ -38,24 +38,14 @@
 #include "cuttlefish/host/libs/config/config_fragment.h"
 #include "cuttlefish/host/libs/config/config_utils.h"
 #include "cuttlefish/host/libs/config/secure_hals.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace Json {
 class Value;
 }
 
 namespace cuttlefish {
 
-enum class VmmMode {
-  kUnknown,
-  kCrosvm,
-  kGem5,
-  kQemu,
-};
-
-std::ostream& operator<<(std::ostream&, VmmMode);
-std::string ToString(VmmMode mode);
-Result<VmmMode> ParseVmm(std::string_view);
-
 enum class ExternalNetworkMode {
   kUnknown,
   kTap,
@@ -1037,6 +1027,4 @@ bool IsRestoring(const CuttlefishConfig&);
 #if FMT_VERSION >= 90000
 template <>
 struct fmt::formatter<cuttlefish::ExternalNetworkMode> : ostream_formatter {};
-template <>
-struct fmt::formatter<cuttlefish::VmmMode> : ostream_formatter {};
 #endif
diff --git a/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp b/base/cvd/cuttlefish/host/libs/config/cuttlefish_config_instance.cpp
@@ -23,7 +23,6 @@
 #include <fstream>
 #include <optional>
 #include <ostream>
-#include <sstream>
 #include <string>
 #include <string_view>
 #include <utility>
@@ -44,6 +43,7 @@
 #include "cuttlefish/host/libs/config/ap_boot_flow.h"
 #include "cuttlefish/host/libs/config/boot_flow.h"
 #include "cuttlefish/host/libs/config/config_constants.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 namespace {
@@ -77,37 +77,6 @@ Result<ExternalNetworkMode> ParseExternalNetworkMode(std::string_view str) {
   }
 }
 
-std::string ToString(VmmMode mode) {
-  std::stringstream ss;
-  ss << mode;
-  return ss.str();
-}
-
-std::ostream& operator<<(std::ostream& out, VmmMode vmm) {
-  switch (vmm) {
-    case VmmMode::kUnknown:
-      return out << "unknown";
-    case VmmMode::kCrosvm:
-      return out << "crosvm";
-    case VmmMode::kGem5:
-      return out << "gem5";
-    case VmmMode::kQemu:
-      return out << "qemu_cli";
-  }
-}
-
-Result<VmmMode> ParseVmm(std::string_view str) {
-  if (android::base::EqualsIgnoreCase(str, "crosvm")) {
-    return VmmMode::kCrosvm;
-  } else if (android::base::EqualsIgnoreCase(str, "gem5")) {
-    return VmmMode::kGem5;
-  } else if (android::base::EqualsIgnoreCase(str, "qemu_cli")) {
-    return VmmMode::kQemu;
-  } else {
-    return CF_ERRF("\"{}\" is not a valid Vmm.", str);
-  }
-}
-
 std::ostream& operator<<(std::ostream& out, GuestHwuiRenderer renderer) {
   return out << ToString(renderer);
 }
diff --git a/base/cvd/cuttlefish/host/libs/config/data_image.cpp b/base/cvd/cuttlefish/host/libs/config/data_image.cpp
@@ -40,6 +40,7 @@
 #include "cuttlefish/host/libs/config/esp.h"
 #include "cuttlefish/host/libs/config/mbr.h"
 #include "cuttlefish/host/libs/config/openwrt_args.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 // https://cs.android.com/android/platform/superproject/main/+/main:device/google/cuttlefish/Android.bp;l=127;drc=6f7d6a4db58efcc2ddd09eda07e009c6329414cd
 #define F2FS_BLOCKSIZE "4096"
diff --git a/base/cvd/cuttlefish/host/libs/config/kernel_args.cpp b/base/cvd/cuttlefish/host/libs/config/kernel_args.cpp
@@ -21,6 +21,7 @@
 
 #include "cuttlefish/common/libs/utils/architecture.h"
 #include "cuttlefish/host/libs/config/cuttlefish_config.h"
+#include "cuttlefish/host/libs/config/vmm_mode.h"
 
 namespace cuttlefish {
 namespace {
diff --git a/base/cvd/cuttlefish/host/libs/config/vmm_mode.cc b/base/cvd/cuttlefish/host/libs/config/vmm_mode.cc
diff --git a/base/cvd/cuttlefish/host/libs/config/vmm_mode.h b/base/cvd/cuttlefish/host/libs/config/vmm_mode.h
diff --git a/base/cvd/cuttlefish/host/libs/vm_manager/BUILD.bazel b/base/cvd/cuttlefish/host/libs/vm_manager/BUILD.bazel
diff --git a/base/cvd/cuttlefish/host/libs/vm_manager/vm_manager.h b/base/cvd/cuttlefish/host/libs/vm_manager/vm_manager.h
