Merge "Construct page table in Rust."
diff --git a/demo/Android.bp b/demo/Android.bp
index 1342a26..8613166 100644
--- a/demo/Android.bp
+++ b/demo/Android.bp
@@ -19,4 +19,5 @@
platform_apis: true,
use_embedded_native_libs: true,
v4_signature: true,
+ min_sdk_version: "33",
}
diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml
index 74ec210..6669adb 100644
--- a/demo/AndroidManifest.xml
+++ b/demo/AndroidManifest.xml
@@ -3,7 +3,7 @@
package="com.android.microdroid.demo">
<uses-permission android:name="android.permission.MANAGE_VIRTUAL_MACHINE" />
-
+ <uses-sdk android:minSdkVersion="33" android:targetSdkVersion="33"/>
<application
android:label="MicrodroidDemo"
android:theme="@style/Theme.MicrodroidDemo"
diff --git a/docs/getting_started/index.md b/docs/getting_started/index.md
index 562c285..7fddc5a 100644
--- a/docs/getting_started/index.md
+++ b/docs/getting_started/index.md
@@ -39,30 +39,29 @@
```shell
adb reboot bootloader
+fastboot flashing unlock
fastboot oem pkvm enable
fastboot reboot
```
Due to a bug in Android 13 for these devices, pKVM may stop working after an
[OTA update](https://source.android.com/devices/tech/ota). To prevent this, it
-is necessary to manually replicate the `pvmfw` partition across A/B slots:
+is necessary to manually replicate the `pvmfw` partition to the other slot:
```shell
-adb root
-SLOT=$(adb shell getprop ro.boot.slot_suffix)
-adb pull /dev/block/by-name/pvmfw${SLOT} pvmfw.img
+git -C <android_root>/packages/modules/Virtualization
+show de6b0b2ecf6225a0a7b43241de27e74fc3e6ceb2:pvmfw/pvmfw.img > /tmp/pvmfw.img
adb reboot bootloader
-fastboot --slot other flash pvmfw pvmfw.img
+fastboot --slot other flash pvmfw /tmp/pvmfw.img
fastboot reboot
```
Otherwise, if an OTA has already made pKVM unusable, the working partition
-should be copied over from the "other" slot:
+should be copied to the "current" slot:
```shell
-adb pull $(adb shell ls "/dev/block/by-name/pvmfw!(${SLOT})") pvmfw.img
adb reboot bootloader
-fastboot flash pvmfw pvmfw.img
+fastboot flash pvmfw /tmp/pvmfw.img
fastboot reboot
```