diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-27 02:11:28 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-27 02:11:28 +0000 |
| commit | d8d3a67eae6eac732396821ceb6038d2f055a263 (patch) | |
| tree | 39a65748487c26dd8f5830553bb40229a727cd0a | |
| parent | d3a385e30c4f38e9770b6efb497d2eaaa46f0aa8 (diff) | |
| parent | c1c9f57640931524eb07813b4686fea27d168035 (diff) | |
| download | cuttlefish_common-android10-mainline-a-release.tar.gz | |
Snap for 5606289 from c1c9f57640931524eb07813b4686fea27d168035 to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android10-mainline-releaseandroid10-mainline-a-release
Change-Id: I91dca792bb49e6f760b4a5f57d789018ad4e3869
| -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) |