Merge branch 'google:main' into rpm-build

Author: syslogic

base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/cf_graphics_configs.cpp

@@ -67,6 +67,11 @@ Result<std::string> GenerateDisplayFlag(const EnvironmentSpecification& cfg) {
       } else {
         out_display.set_refresh_rate_hertz(CF_DEFAULTS_DISPLAY_REFRESH_RATE);
       }
+      for (const auto& overlay_entry : in_display.overlays()) {
+        DisplayOverlay* overlay_proto = out_display.add_overlays();
+        overlay_proto->set_vm_index(overlay_entry.vm_index());
+        overlay_proto->set_display_index(overlay_entry.display_index());
+      }
     }
   }
 

base/cvd/cuttlefish/host/commands/cvd/cli/parser/load_config.proto

@@ -86,6 +86,7 @@ message Display {
   optional uint32 height = 2;
   optional uint32 dpi = 3;
   optional uint32 refresh_rate_hertz = 4;
+  repeated DisplayOverlay overlays = 5;
 }
 
 message Disk {
@@ -155,3 +156,8 @@ message DeviceState {
 message Metrics {
   optional bool enable = 1;
 }
+
+message DisplayOverlay {
+  int32 vm_index = 1;
+  int32 display_index = 2;
+}

base/cvd/cuttlefish/host/commands/run_cvd/boot_state_machine.cc

@@ -511,6 +511,15 @@ class CvdBootStateMachine : public SetupFeature, public KernelLogPipeConsumer {
         if (!read_result.ok()) {
           return;
         }
+        if ((*read_result)->event == monitor::Event::BootCompleted) {
+          LOG(INFO) << "Virtual device rebooted successfully";
+          if (!instance_.vcpu_config_path().empty()) {
+            auto res = WattsonRebalanceThreads(instance_.id());
+            if (!res.ok()) {
+              LOG(ERROR) << res.error().FormatForEnv();
+            }
+          }
+        }
       }
     }
   }

base/debian/rules

@@ -22,6 +22,6 @@ override_dh_installinit:
 
 # the `--workspace_status_command` flag path depends on the current working directory of base/cvd
 override_dh_auto_build:
-	cd cvd && bazel build --linkopt="-Wl,--build-id=sha1" 'cuttlefish/package:cvd' --spawn_strategy=local --workspace_status_command=../../tools/buildutils/stamp_helper.sh --build_tag_filters=-clang-tidy
+	cd cvd && bazel build --linkopt="-Wl,--build-id=sha1" 'cuttlefish/package:cvd' --spawn_strategy=local --workspace_status_command=../stamp_helper.sh --build_tag_filters=-clang-tidy
 	dh_auto_build