diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2022-01-27 10:48:52 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-01-27 20:39:52 +0000 |
| commit | 33f982e17961fae754d12139ecf252545fb16a8a (patch) | |
| tree | a1ad12feeb68b392353149690b6bf611382ba12d | |
| parent | 32c3f30e05b8d17cc3f52c1731ef79a41c63cc79 (diff) | |
| download | crosvm-33f982e17961fae754d12139ecf252545fb16a8a.tar.gz | |
crosvm: allow --stub-pci-device multifunction again
The previous multifunction change removed this option entirely, but that
makes the transition difficult, since the caller and crosvm need to be
updated simultaneously. To make the changeover simpler, allow the
multifunction option but make it do nothing, since the PCI root code
will already do the right thing.
BUG=b:210795995
TEST=Run crosvm with --stub-pci-device with multifunction enabled
Change-Id: I5d378001d495ec54bd4c1869de796ba6a418f43a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3421006
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
| -rw-r--r-- | src/main.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.rs b/src/main.rs index 00b15907b..9241c789c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1012,6 +1012,7 @@ fn parse_stub_pci_parameters(s: Option<&str>) -> argument::Result<StubPciParamet params.subclass = (class >> 8) as u8; params.programming_interface = class as u8; } + "multifunction" => {} // Ignore but allow the multifunction option for compatibility. "subsystem_vendor" => params.subsystem_vendor_id = opt.parse_numeric::<u16>()?, "subsystem_device" => params.subsystem_device_id = opt.parse_numeric::<u16>()?, "revision" => params.revision_id = opt.parse_numeric::<u8>()?, |