commit fc863b6abd87d35b928de699a3fed3e46d115502
author Jeongik Cha <jeongik@google.com> Mon Oct 21 07:58:04 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 21 07:58:04 2024 +0000
tree 27a42ef42226f0ad7c6f627ed555ce4c09370e65
parent 0c179ad6ab90c748ae128f2e998600ed7aed152e
parent 4e3021a8f4d593af6f7c4a4350727a500db002d9

Modify vm_config.json properly am: 4e3021a8f4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3313757

Change-Id: Id9d4fa73fea43c2b9ffccff273d189879df4bc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

build/debian/vm_config.json.aarch64

diff --git a/build/debian/vm_config.json.aarch64 b/build/debian/vm_config.json.aarch64
index 658ecfc..9f9295c 100644
--- a/build/debian/vm_config.json.aarch64
+++ b/build/debian/vm_config.json.aarch64
@@ -7,9 +7,6 @@
             "writable": true
         }
     ],
-    "kernel": "$PAYLOAD_DIR/vmlinuz",
-    "initrd": "$PAYLOAD_DIR/initrd.img",
-    "params": "root=/dev/vda1",
     "protected": false,
     "cpu_topology": "match_host",
     "platform_version": "~1.0",
@@ -20,4 +17,3 @@
     "console_input_device": "ttyS0",
     "network": true
 }
-

build/debian/vm_config.json.x86_64

diff --git a/build/debian/vm_config.json.x86_64 b/build/debian/vm_config.json.x86_64
index c9a16bf..2fb9faa 100644
--- a/build/debian/vm_config.json.x86_64
+++ b/build/debian/vm_config.json.x86_64
@@ -7,6 +7,9 @@
             "writable": true
         }
     ],
+    "kernel": "$PAYLOAD_DIR/vmlinuz",
+    "initrd": "$PAYLOAD_DIR/initrd.img",
+    "params": "root=/dev/vda1",
     "protected": false,
     "cpu_topology": "match_host",
     "platform_version": "~1.0",
@@ -17,4 +20,3 @@
     "console_input_device": "ttyS0",
     "network": true
 }
-