Repository navigation
cvd: add acpi_table, device_tree_overlay, and file_backed_mapping to DiskArtifacts proto schema - #3390
cvd: add acpi_table, device_tree_overlay, and file_backed_mapping to DiskArtifacts proto schema#3390erjiaqing wants to merge 1 commit into
Conversation
fd16507 to
505f996
Compare
bridadan
left a comment
There was a problem hiding this comment.
It looks like these changes assume that the ACPI table file, the device tree overlay, and/or the file backed memory file are already present in the local file system. This would work for local builds, but how does this work in CI? How are these artifacts fetched? In #3386 I added logic to the fetch handler to pull the artifacts from the build server. Is that required here as well?
c8aa018 to
43d6f73
Compare
Thanks for the reviewing effort, I looked through #3386 again, and feel there are some feature gaps between This PR is to provide extra parameters, instead of overriding standard images for Android. I confirmed that we can put the artifacts directly on CI. I don't feel it is a good idea to add Do you have any ideas on this? |
| optional string acpi_table = 2; | ||
| optional DeviceTreeOverlayArtifact device_tree_overlay = 3; | ||
| optional FileBackedMapping file_backed_mapping = 4; |
There was a problem hiding this comment.
Based on our offline discussion, the expectation of the path for all of these fields is that they reference a file in the default_build, right?
@rmuthiah just heads up this differs from the vendor_boot and eventually the system fields since those accept a build string. Maybe a comment in each of the relevant fields would be helpful to show the difference.
There was a problem hiding this comment.
Yes, these files should be located in the system_image_dir, which is the extracted default_build zip (Assuming #3234 is merged). Added a comment.
There was a problem hiding this comment.
After discussing offline, these paths can either be:
- An absolute local path
- A local path relative to
system_image_dir(once assemble_cvd: support relative paths for crosvm_acpi_table, crosvm_device_tree_overlay, and crosvm_file_backed_mapping #3234 is merged) - An remote build path, including a file path (e.g.
@ab/<branch>/<target>{<file path>})
I see what you mean, it does seem different from #3386 in that way.
From our discussion before, it sounds like all of the artifacts that would be used are tied to the target build (what goes in the I think it makes sense for these fields to reference "build local" files. It's not a pattern I had considered before but I think its ok. @rmuthiah any thoughts? |
43d6f73 to
ae93b76
Compare
1cba198 to
0613f27
Compare
|
Updates since offline discussions: I still added Since it seems there are no good way to infer the arch of the VM. Also added an extra We expect the acpi_table or device_tree_overlay can be found in the image.zip. |
0613f27 to
178d1d0
Compare
Adds a DiceHandover config (build, addr, and an acpi_table or device_tree_overlay firmware table). When set, the parser emits --crosvm_file_backed_mapping_base64 for the build plus --crosvm_acpi_table or --crosvm_device_tree_overlay for the table. The mapping is always 64K, which covers the guest page size on all platforms. The firmware table type is set in the config because the parser does not know the guest arch. Remote (@ab/...) builds are validated but not yet passed to launch, since cvd fetch does not support them. Bug: 544996625 Bug: 539399873 Test: bazel test //cuttlefish/host/commands/cvd/cli/parser/... Assisted-by: Jetski:Gemini TAG=agy CONV=ef35cb23-c351-4dd9-9690-b254baa904be
178d1d0 to
d0b1e52
Compare
Adds a DiceHandover config (build, addr, and an acpi_table or
device_tree_overlay firmware table). When set, the parser emits
--crosvm_file_backed_mapping_base64 for the build plus
--crosvm_acpi_table or --crosvm_device_tree_overlay for the table.
The mapping size is set by an optional size field (default 0x1000). The
firmware table type is set in the config because the parser does not
know the guest arch. Remote (@ab/...) builds are validated, it will be
implemented as an immediate follow up.
Bug: 544996625
Bug: 539399873
Test: bazel test //cuttlefish/host/commands/cvd/cli/parser/...
Assisted-by: Jetski:Gemini
TAG=agy
CONV=9d324de2-493b-495b-8490-a20d8e687190