diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-25 23:04:28 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-25 23:04:28 +0000 |
| commit | 6f73c2746c8902c2275a760ad3f6b16c1ae68224 (patch) | |
| tree | 39a65748487c26dd8f5830553bb40229a727cd0a | |
| parent | b401d5f3232522ca42cb196b0f14b58a991b5bf9 (diff) | |
| parent | 57602a62548b535f6d3da386fbd5aaa9443ebce3 (diff) | |
| download | cuttlefish_common-android10-qpr1-b-s1-release.tar.gz | |
Snap for 5606001 from 57602a62548b535f6d3da386fbd5aaa9443ebce3 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release
Change-Id: Ib56c74eba26db8f1b43abf962a735edfbf4aaa49
| -rw-r--r-- | host/commands/launch/flags.cc | 2 | ||||
| -rw-r--r-- | host/libs/vm_manager/crosvm_manager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc index 0991d8a4..5ccf2554 100644 --- a/host/commands/launch/flags.cc +++ b/host/commands/launch/flags.cc @@ -86,7 +86,7 @@ DEFINE_string(serial_number, g_default_serial_number.c_str(), DEFINE_string(instance_dir, "", // default handled on ParseCommandLine "A directory to put all instance specific files"); DEFINE_string( - vm_manager, vm_manager::QemuManager::name(), + vm_manager, vm_manager::CrosvmManager::name(), "What virtual machine manager to use, one of {qemu_cli, crosvm}"); DEFINE_string(system_image_dir, vsoc::DefaultGuestImagePath(""), "Location of the system partition images."); diff --git a/host/libs/vm_manager/crosvm_manager.cpp b/host/libs/vm_manager/crosvm_manager.cpp index 300b1a18..a909b9bd 100644 --- a/host/libs/vm_manager/crosvm_manager.cpp +++ b/host/libs/vm_manager/crosvm_manager.cpp @@ -57,7 +57,7 @@ void CrosvmManager::ConfigureBootDevices(vsoc::CuttlefishConfig* config) { // PCI domain 0, bus 0, device 5, function 0 // TODO There is no way to control this assignment with crosvm (yet) config->add_kernel_cmdline( - "androidboot.boot_devices=pci0000:00/0000:00:05.0"); + "androidboot.boot_devices=pci0000:00/0000:00:01.0"); } CrosvmManager::CrosvmManager(const vsoc::CuttlefishConfig* config) |