Snap for 5606075 from 57602a62548b535f6d3da386fbd5aaa9443ebce3 to qt-c2f2-release
Change-Id: I5c35b0d5c3a3765ade9c431e3b18068bbd40730b
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index 0991d8a..5ccf255 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -86,7 +86,7 @@
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 300b1a1..a909b9b 100644
--- a/host/libs/vm_manager/crosvm_manager.cpp
+++ b/host/libs/vm_manager/crosvm_manager.cpp
@@ -57,7 +57,7 @@
// 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)
