diff options
Diffstat (limited to 'host/commands/run_cvd/launch/open_wrt.cpp')
| -rw-r--r-- | host/commands/run_cvd/launch/open_wrt.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/host/commands/run_cvd/launch/open_wrt.cpp b/host/commands/run_cvd/launch/open_wrt.cpp index 0ca4a9cc6..289d63f7a 100644 --- a/host/commands/run_cvd/launch/open_wrt.cpp +++ b/host/commands/run_cvd/launch/open_wrt.cpp @@ -86,11 +86,12 @@ class OpenWrt : public CommandSource { wifi_tap = ap_cmd.AddTap(instance_.wifi_tap_name()); } - if (IsRestoring(config_)) { - const std::string snapshot_dir = config_.snapshot_path(); - CF_EXPECT(ap_cmd.SetToRestoreFromSnapshot(snapshot_dir, instance_.id(), - "_openwrt")); - } + // TODO(khei): Enable restore once open_wrt instance restoring is fixed + // if (IsRestoring(config_)) { + // const std::string snapshot_dir = config_.snapshot_path(); + // CF_EXPECT(ap_cmd.SetToRestoreFromSnapshot(snapshot_dir, instance_.id(), + // "_openwrt")); + //} /* TODO(kwstephenkim): delete this code when Minidroid completely disables * the AP VM itself @@ -123,7 +124,7 @@ class OpenWrt : public CommandSource { auto openwrt_args = OpenwrtArgsFromConfig(instance_); switch (instance_.ap_boot_flow()) { case APBootFlow::Grub: - if (config_.vm_manager() == "qemu_cli") { + if (config_.vm_manager() == VmmMode::kQemu) { ap_cmd.AddReadWriteDisk( instance_.persistent_ap_composite_overlay_path()); } else { @@ -156,7 +157,7 @@ class OpenWrt : public CommandSource { std::string Name() const override { return "OpenWrt"; } bool Enabled() const override { return instance_.ap_boot_flow() != APBootFlow::None && - config_.vm_manager() == vm_manager::CrosvmManager::name(); + config_.vm_manager() == VmmMode::kCrosvm; } private: |