diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-25 23:13:27 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-25 23:13:27 +0000 |
| commit | c1c9f57640931524eb07813b4686fea27d168035 (patch) | |
| tree | 39a65748487c26dd8f5830553bb40229a727cd0a | |
| parent | 4873ff3a8d5037c086b263071d96f8f484bad1da (diff) | |
| parent | 40638868717a08ca7bbbbcfef552a9a748820635 (diff) | |
| download | cuttlefish_common-android-security-10.0.0_r75.tar.gz | |
Snap for 5605988 from 40638868717a08ca7bbbbcfef552a9a748820635 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: If2d6014406ff2d673d8461523ee95ffb7e865888
| -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) |