Merge "microdroid: Add note about --debug flag for ADB access"
diff --git a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
index ea17dfc..916a27c 100644
--- a/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
+++ b/.prebuilt_info/prebuilt_info_pvmfw_pvmfw_img.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "8597076"
+ build_id: "8745290"
target: "u-boot_pvmfw"
source_file: "pvmfw.img"
}
@@ -9,4 +9,5 @@
version_group: ""
git_project: "platform/packages/modules/Virtualization"
git_branch: "master"
+ transform: TRANSFORM_NONE
}
diff --git a/apex/Android.bp b/apex/Android.bp
index 4698088..923c378 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -3,12 +3,16 @@
}
microdroid_filesystem_images = [
- "microdroid_super",
"microdroid_boot",
+ "microdroid_bootconfig_app_debuggable",
+ "microdroid_bootconfig_full_debuggable",
+ "microdroid_bootconfig_normal",
"microdroid_init_boot",
- "microdroid_vendor_boot",
+ "microdroid_super",
+ "microdroid_uboot_env",
"microdroid_vbmeta",
"microdroid_vbmeta_bootconfig",
+ "microdroid_vendor_boot",
]
apex {
@@ -60,12 +64,8 @@
prebuilts: [
"com.android.virt.init.rc",
"microdroid.json",
- "microdroid_uboot_env",
"microdroid_bootloader",
"microdroid_bootloader.avbpubkey",
- "microdroid_bootconfig_normal",
- "microdroid_bootconfig_app_debuggable",
- "microdroid_bootconfig_full_debuggable",
],
file_contexts: ":com.android.virt-file_contexts",
canned_fs_config: "canned_fs_config",
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index e314b71..df95323 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -360,17 +360,17 @@
# dict of (key, file) for re-sign/verification. keys are un-versioned for readability.
virt_apex_files = {
'bootloader.pubkey': 'etc/microdroid_bootloader.avbpubkey',
- 'bootloader': 'etc/microdroid_bootloader',
+ 'bootloader': 'etc/fs/microdroid_bootloader',
'boot.img': 'etc/fs/microdroid_boot.img',
'vendor_boot.img': 'etc/fs/microdroid_vendor_boot.img',
'init_boot.img': 'etc/fs/microdroid_init_boot.img',
'super.img': 'etc/fs/microdroid_super.img',
'vbmeta.img': 'etc/fs/microdroid_vbmeta.img',
'vbmeta_bootconfig.img': 'etc/fs/microdroid_vbmeta_bootconfig.img',
- 'bootconfig.normal': 'etc/microdroid_bootconfig.normal',
- 'bootconfig.app_debuggable': 'etc/microdroid_bootconfig.app_debuggable',
- 'bootconfig.full_debuggable': 'etc/microdroid_bootconfig.full_debuggable',
- 'uboot_env.img': 'etc/uboot_env.img'
+ 'bootconfig.normal': 'etc/fs/microdroid_bootconfig.normal',
+ 'bootconfig.app_debuggable': 'etc/fs/microdroid_bootconfig.app_debuggable',
+ 'bootconfig.full_debuggable': 'etc/fs/microdroid_bootconfig.full_debuggable',
+ 'uboot_env.img': 'etc/fs/uboot_env.img'
}
diff --git a/compos/common/compos_client.rs b/compos/common/compos_client.rs
index fe31b27..1fd939d 100644
--- a/compos/common/compos_client.rs
+++ b/compos/common/compos_client.rs
@@ -58,8 +58,6 @@
pub config_path: Option<String>,
/// If present, overrides the amount of RAM to give the VM
pub memory_mib: Option<i32>,
- /// Never save VM logs to files.
- pub never_log: bool,
}
impl ComposClient {
@@ -94,7 +92,7 @@
(true, false) => DebugLevel::NONE,
};
- let (console_fd, log_fd) = if parameters.never_log || debug_level == DebugLevel::NONE {
+ let (console_fd, log_fd) = if debug_level == DebugLevel::NONE {
(None, None)
} else {
// Console output and the system log output from the VM are redirected to file.
diff --git a/compos/verify/verify.rs b/compos/verify/verify.rs
index 7a22cfd..64ae75f 100644
--- a/compos/verify/verify.rs
+++ b/compos/verify/verify.rs
@@ -104,7 +104,7 @@
instance_image,
&idsig,
&idsig_manifest_apk,
- &VmParameters { debug_mode, never_log: !debug_mode, ..Default::default() },
+ &VmParameters { debug_mode, ..Default::default() },
)?;
let service = vm_instance.get_service()?;
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 7f240f6..ba3da08 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -167,6 +167,7 @@
"grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
"grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
"grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.known_codenames= $(location :buildinfo.prop) && " +
"cat $(location build.prop) && " +
"echo ro.product.cpu.abilist=x86_64) > $(out)",
}
@@ -183,6 +184,7 @@
"grep ro\\.build\\.version\\.release= $(location :buildinfo.prop) && " +
"grep ro\\.build\\.version\\.sdk= $(location :buildinfo.prop) && " +
"grep ro\\.build\\.version\\.security_patch= $(location :buildinfo.prop) && " +
+ "grep ro\\.build\\.version\\.known_codenames= $(location :buildinfo.prop) && " +
"cat $(location build.prop) && " +
"echo ro.product.cpu.abilist=arm64-v8a) > $(out)",
}
@@ -387,84 +389,34 @@
],
}
-// See external/avb/avbtool.py
-// MAX_VBMETA_SIZE=64KB, MAX_FOOTER_SIZE=4KB
-avb_hash_footer_kb = "68"
-
-prebuilt_etc {
- name: "microdroid_bootconfig_normal",
- src: ":microdroid_bootconfig_normal_gen",
- filename: "microdroid_bootconfig.normal",
-}
-
-prebuilt_etc {
- name: "microdroid_bootconfig_app_debuggable",
- src: ":microdroid_bootconfig_app_debuggable_gen",
- filename: "microdroid_bootconfig.app_debuggable",
-}
-
-prebuilt_etc {
- name: "microdroid_bootconfig_full_debuggable",
- src: ":microdroid_bootconfig_full_debuggable_gen",
- filename: "microdroid_bootconfig.full_debuggable",
-}
-
// python -c "import hashlib; print(hashlib.sha256(b'bootconfig').hexdigest())"
bootconfig_salt = "e158851fbebb402e1f18ea9372ea2f76b4dea23eceb5c4b92e5b27ade8537f5b"
-// TODO(jiyong): make a new module type that does the avb signing
-genrule {
- name: "microdroid_bootconfig_normal_gen",
- tools: ["avbtool"],
- srcs: [
- "bootconfig.normal",
- ":microdroid_sign_key",
- ],
- out: ["microdroid_bootconfig.normal"],
- cmd: "cp $(location bootconfig.normal) $(out) && " +
- "$(location avbtool) add_hash_footer " +
- "--algorithm SHA256_RSA4096 " +
- "--salt " + bootconfig_salt + " " +
- "--partition_name bootconfig " +
- "--key $(location :microdroid_sign_key) " +
- "--partition_size $$(( " + avb_hash_footer_kb + " * 1024 + ( $$(stat --format=%s $(out)) + 4096 - 1 ) / 4096 * 4096 )) " +
- "--image $(out)",
+avb_add_hash_footer {
+ name: "microdroid_bootconfig_normal",
+ src: "bootconfig.normal",
+ filename: "microdroid_bootconfig.normal",
+ partition_name: "bootconfig",
+ private_key: ":microdroid_sign_key",
+ salt: bootconfig_salt,
}
-genrule {
- name: "microdroid_bootconfig_app_debuggable_gen",
- tools: ["avbtool"],
- srcs: [
- "bootconfig.app_debuggable",
- ":microdroid_sign_key",
- ],
- out: ["microdroid_bootconfig.app_debuggable"],
- cmd: "cp $(location bootconfig.app_debuggable) $(out) && " +
- "$(location avbtool) add_hash_footer " +
- "--algorithm SHA256_RSA4096 " +
- "--salt " + bootconfig_salt + " " +
- "--partition_name bootconfig " +
- "--key $(location :microdroid_sign_key) " +
- "--partition_size $$(( " + avb_hash_footer_kb + " * 1024 + ( $$(stat --format=%s $(out)) + 4096 - 1 ) / 4096 * 4096 )) " +
- "--image $(out)",
+avb_add_hash_footer {
+ name: "microdroid_bootconfig_app_debuggable",
+ src: "bootconfig.app_debuggable",
+ filename: "microdroid_bootconfig.app_debuggable",
+ partition_name: "bootconfig",
+ private_key: ":microdroid_sign_key",
+ salt: bootconfig_salt,
}
-genrule {
- name: "microdroid_bootconfig_full_debuggable_gen",
- tools: ["avbtool"],
- srcs: [
- "bootconfig.full_debuggable",
- ":microdroid_sign_key",
- ],
- out: ["microdroid_bootconfig.full_debuggable"],
- cmd: "cp $(location bootconfig.full_debuggable) $(out) && " +
- "$(location avbtool) add_hash_footer " +
- "--algorithm SHA256_RSA4096 " +
- "--salt " + bootconfig_salt + " " +
- "--partition_name bootconfig " +
- "--key $(location :microdroid_sign_key) " +
- "--partition_size $$(( " + avb_hash_footer_kb + " * 1024 + ( $$(stat --format=%s $(out)) + 4096 - 1 ) / 4096 * 4096 )) " +
- "--image $(out)",
+avb_add_hash_footer {
+ name: "microdroid_bootconfig_full_debuggable",
+ src: "bootconfig.full_debuggable",
+ filename: "microdroid_bootconfig.full_debuggable",
+ partition_name: "bootconfig",
+ private_key: ":microdroid_sign_key",
+ salt: bootconfig_salt,
}
prebuilt_etc {
@@ -476,7 +428,7 @@
prebuilt_etc {
name: "microdroid_bootloader",
- src: ":microdroid_bootloader_gen",
+ src: ":microdroid_bootloader_signed",
arch: {
x86_64: {
// For unknown reason, the signed bootloader doesn't work on x86_64. Until the problem
@@ -485,36 +437,20 @@
src: ":microdroid_bootloader_pubkey_replaced",
},
},
+ relative_install_path: "fs",
filename: "microdroid_bootloader",
}
// python -c "import hashlib; print(hashlib.sha256(b'bootloader').hexdigest())"
bootloader_salt = "3b4a12881d11f33cff968a24d7c53723a8232cde9a8d91e29fdbd6a95ae6adf0"
-genrule {
- name: "microdroid_bootloader_gen",
- tools: ["avbtool"],
- srcs: [
- ":microdroid_bootloader_pubkey_replaced",
- ":microdroid_sign_key",
- ],
- out: ["bootloader-signed"],
- // 1. Copy the input to the output becaise avbtool modifies --image in
- // place.
- // 2. Check if the file is big enough. For arm and x86 we have fake
- // bootloader file whose size is 1. It can't pass avbtool.
- // 3. Add the hash footer. The partition size is set to (image size + 68KB)
- // rounded up to 4KB boundary.
- cmd: "cp $(location :microdroid_bootloader_pubkey_replaced) $(out) && " +
- "if [ $$(stat --format=%s $(out)) -gt 4096 ]; then " +
- "$(location avbtool) add_hash_footer " +
- "--algorithm SHA256_RSA4096 " +
- "--salt " + bootloader_salt + " " +
- "--partition_name bootloader " +
- "--key $(location :microdroid_sign_key) " +
- "--partition_size $$(( " + avb_hash_footer_kb + " * 1024 + ( $$(stat --format=%s $(out)) + 4096 - 1 ) / 4096 * 4096 )) " +
- "--image $(out)" +
- "; fi",
+avb_add_hash_footer {
+ name: "microdroid_bootloader_signed",
+ src: ":microdroid_bootloader_pubkey_replaced",
+ filename: "microdroid_bootloader",
+ partition_name: "bootloader",
+ private_key: ":microdroid_sign_key",
+ salt: bootloader_salt,
}
// Replace avbpubkey of prebuilt bootloader with the avbpubkey of the signing key
@@ -528,15 +464,11 @@
],
out: ["bootloader-pubkey-replaced"],
// 1. Copy the input to the output (replace_bytes modifies the file in-place)
- // 2. Check if the file is big enough. For arm and x86 we have fake
- // bootloader file whose size is 1. (replace_bytes fails if key not found)
- // 3. Replace embedded pubkey with new one.
+ // 2. Replace embedded pubkey with new one.
cmd: "cp $(location :microdroid_crosvm_bootloader) $(out) && " +
- "if [ $$(stat --format=%s $(out)) -gt 4096 ]; then " +
"$(location replace_bytes) $(out) " +
"$(location :microdroid_crosvm_bootloader.avbpubkey) " +
- "$(location :microdroid_bootloader_avbpubkey_gen)" +
- "; fi",
+ "$(location :microdroid_bootloader_avbpubkey_gen)",
}
// Apex keeps a copy of avbpubkey embedded in bootloader so that embedded avbpubkey can be replaced
@@ -557,34 +489,24 @@
"--output $(out)",
}
-prebuilt_etc {
- name: "microdroid_uboot_env",
- src: ":microdroid_uboot_env_gen",
- filename: "uboot_env.img",
-}
-
// python -c "import hashlib; print(hashlib.sha256(b'uboot_env').hexdigest())"
uboot_env_salt = "cbf2d76827ece5ca8d176a40c94ac6355edcf6511b4b887364a8c0e05850df10"
+avb_add_hash_footer {
+ name: "microdroid_uboot_env",
+ src: ":microdroid_uboot_env_gen",
+ filename: "uboot_env.img",
+ partition_name: "uboot_env",
+ private_key: ":microdroid_sign_key",
+ salt: uboot_env_salt,
+}
+
genrule {
name: "microdroid_uboot_env_gen",
- tools: [
- "mkenvimage_slim",
- "avbtool",
- ],
- srcs: [
- "uboot-env.txt",
- ":microdroid_sign_key",
- ],
+ tools: ["mkenvimage_slim"],
+ srcs: ["uboot-env.txt"],
out: ["output.img"],
- cmd: "$(location mkenvimage_slim) -output_path $(out) -input_path $(location uboot-env.txt) && " +
- "$(location avbtool) add_hash_footer " +
- "--algorithm SHA256_RSA4096 " +
- "--salt " + uboot_env_salt + " " +
- "--partition_name uboot_env " +
- "--key $(location :microdroid_sign_key) " +
- "--partition_size $$(( " + avb_hash_footer_kb + " * 1024 + ( $$(stat --format=%s $(out)) + 4096 - 1 ) / 4096 * 4096 )) " +
- "--image $(out)",
+ cmd: "$(location mkenvimage_slim) -output_path $(out) -input_path $(location uboot-env.txt)",
}
// Note that keys can be different for filesystem images even though we're using the same key
diff --git a/microdroid/bootconfig.common b/microdroid/bootconfig.common
index 362ff23..f2c8788 100644
--- a/microdroid/bootconfig.common
+++ b/microdroid/bootconfig.common
@@ -1,3 +1,3 @@
androidboot.first_stage_console = 1
androidboot.hardware = microdroid
-kernel.8250.nr_uarts = 2
+kernel.8250.nr_uarts = 4
diff --git a/microdroid/microdroid.json b/microdroid/microdroid.json
index bf8d93e..f02dcbf 100644
--- a/microdroid/microdroid.json
+++ b/microdroid/microdroid.json
@@ -1,5 +1,5 @@
{
- "bootloader": "/apex/com.android.virt/etc/microdroid_bootloader",
+ "bootloader": "/apex/com.android.virt/etc/fs/microdroid_bootloader",
"disks": [
{
"partitions": [
@@ -30,7 +30,7 @@
"partitions": [
{
"label": "uboot_env",
- "path": "/apex/com.android.virt/etc/uboot_env.img",
+ "path": "/apex/com.android.virt/etc/fs/uboot_env.img",
"writable": false
}
],
diff --git a/microdroid_manager/Android.bp b/microdroid_manager/Android.bp
index 8343691..d1afc14 100644
--- a/microdroid_manager/Android.bp
+++ b/microdroid_manager/Android.bp
@@ -34,6 +34,7 @@
"libopenssl",
"libprotobuf",
"librustutils",
+ "libscopeguard",
"libserde",
"libserde_cbor",
"libserde_json",
diff --git a/microdroid_manager/src/main.rs b/microdroid_manager/src/main.rs
index 998b94b..15d6663 100644
--- a/microdroid_manager/src/main.rs
+++ b/microdroid_manager/src/main.rs
@@ -155,17 +155,21 @@
}
}
-fn main() {
- if let Err(e) = try_main() {
- error!("Failed with {:?}. Shutting down...", e);
- if let Err(e) = write_death_reason_to_serial(&e) {
- error!("Failed to write death reason {:?}", e);
- }
+fn main() -> Result<()> {
+ scopeguard::defer! {
+ info!("Shutting down...");
if let Err(e) = system_properties::write("sys.powerctl", "shutdown") {
error!("failed to shutdown {:?}", e);
}
- std::process::exit(1);
}
+
+ try_main().map_err(|e| {
+ error!("Failed with {:?}.", e);
+ if let Err(e) = write_death_reason_to_serial(&e) {
+ error!("Failed to write death reason {:?}", e);
+ }
+ e
+ })
}
fn try_main() -> Result<()> {
diff --git a/pvmfw/pvmfw.img b/pvmfw/pvmfw.img
index 9afb092..dd836c0 100644
--- a/pvmfw/pvmfw.img
+++ b/pvmfw/pvmfw.img
Binary files differ
diff --git a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
index ec2afaa..bb27913 100644
--- a/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
+++ b/tests/hostside/java/android/virt/test/MicrodroidTestCase.java
@@ -254,7 +254,7 @@
// Add partitions to the second disk
final String vbmetaPath = TEST_ROOT + "etc/fs/microdroid_vbmeta_bootconfig.img";
- final String bootconfigPath = TEST_ROOT + "etc/microdroid_bootconfig.full_debuggable";
+ final String bootconfigPath = TEST_ROOT + "etc/fs/microdroid_bootconfig.full_debuggable";
disks.getJSONObject(1).getJSONArray("partitions")
.put(newPartition("vbmeta", vbmetaPath))
.put(newPartition("bootconfig", bootconfigPath))
diff --git a/virtualizationservice/src/aidl.rs b/virtualizationservice/src/aidl.rs
index 23febed..f0b3fb4 100644
--- a/virtualizationservice/src/aidl.rs
+++ b/virtualizationservice/src/aidl.rs
@@ -1090,7 +1090,7 @@
vm.callbacks.notify_error(cid, error_code, message);
Ok(())
} else {
- error!("notifyPayloadStarted is called from an unknown CID {}", cid);
+ error!("notifyError is called from an unknown CID {}", cid);
Err(new_binder_exception(
ExceptionCode::SERVICE_SPECIFIC,
format!("cannot find a VM with CID {}", cid),
diff --git a/virtualizationservice/src/payload.rs b/virtualizationservice/src/payload.rs
index 7b8cb7f..8378df3 100644
--- a/virtualizationservice/src/payload.rs
+++ b/virtualizationservice/src/payload.rs
@@ -365,7 +365,7 @@
)?),
writable: false,
});
- let bootconfig_image = "/apex/com.android.virt/etc/microdroid_bootconfig.".to_owned()
+ let bootconfig_image = "/apex/com.android.virt/etc/fs/microdroid_bootconfig.".to_owned()
+ match config.debugLevel {
DebugLevel::NONE => "normal",
DebugLevel::APP_ONLY => "app_debuggable",
diff --git a/vmbase/example/Android.bp b/vmbase/example/Android.bp
index 0acef2b..a0d84b4 100644
--- a/vmbase/example/Android.bp
+++ b/vmbase/example/Android.bp
@@ -47,6 +47,9 @@
enabled: true,
},
},
+ sanitize: {
+ hwaddress: false,
+ },
apex_available: ["com.android.virt"],
}