Skip to content

changed extra_bootconfig_args to vector for multy vm support #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SuperStrongDinosaur wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Open

changed extra_bootconfig_args to vector for multy vm support #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/assemble_cvd_flags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ DEFINE_string(overlays, "",
"vm_index2:display_index2 [...]'");
DEFINE_string(extra_kernel_cmdline, CF_DEFAULTS_EXTRA_KERNEL_CMDLINE,
"Additional flags to put on the kernel command line");
DEFINE_string(extra_bootconfig_args, CF_DEFAULTS_EXTRA_BOOTCONFIG_ARGS,
DEFINE_vec(extra_bootconfig_args, CF_DEFAULTS_EXTRA_BOOTCONFIG_ARGS,
"Space-separated list of extra bootconfig args. "
"Note: overwriting an existing bootconfig argument "
"requires ':=' instead of '='.");
"requires ':=' instead of '='. "
"If multiple instances are used, use comma as a separator "
"for each instance.");
DEFINE_vec(guest_enforce_security,
fmt::format("{}", CF_DEFAULTS_GUEST_ENFORCE_SECURITY),
"Whether to run in enforcing mode (non permissive).");
Expand Down
5 changes: 4 additions & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/flags.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(

std::vector<std::string> extra_bootconfig_args_base64_vec =
CF_EXPECT(GET_FLAG_STR_VALUE(extra_bootconfig_args_base64));
std::vector<std::string> extra_bootconfig_args_vec =
CF_EXPECT(GET_FLAG_STR_VALUE(extra_bootconfig_args));

std::vector<bool> record_screen_vec = CF_EXPECT(GET_FLAG_BOOL_VALUE(
record_screen));
Expand Down Expand Up @@ -795,7 +797,8 @@ Result<CuttlefishConfig> InitializeCuttlefishConfiguration(
instance.set_enable_gnss_grpc_proxy(start_gnss_proxy_vec[instance_index]);
instance.set_enable_bootanimation(enable_bootanimation_vec[instance_index]);

instance.set_extra_bootconfig_args(FLAGS_extra_bootconfig_args);
instance.set_extra_bootconfig_args(
extra_bootconfig_args_vec[instance_index]);
if (!extra_bootconfig_args_base64_vec[instance_index].empty()) {
std::vector<uint8_t> decoded_args;
CF_EXPECT(DecodeBase64(extra_bootconfig_args_base64_vec[instance_index],
Expand Down
Loading