Skip to content

Commit 35dd99f

Browse files
committed
cli: Don't hardcode nec-xhci for --controller usb3
Use our helper function to choose the optimal model
1 parent b51104a commit 35dd99f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

tests/cli-test-xml/compare/virt-install-singleton-config-2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
</pm>
130130
<devices>
131131
<emulator>/new/emu</emulator>
132-
<controller type="usb" index="0" model="nec-xhci"/>
132+
<controller type="usb" index="0" model="qemu-xhci" ports="8"/>
133133
<controller type="virtio-scsi" index="0"/>
134134
<filesystem type="mount" accessmode="mapped">
135135
<source dir="/foo/source"/>
@@ -317,7 +317,7 @@
317317
</pm>
318318
<devices>
319319
<emulator>/new/emu</emulator>
320-
<controller type="usb" index="0" model="nec-xhci"/>
320+
<controller type="usb" index="0" model="qemu-xhci" ports="8"/>
321321
<controller type="virtio-scsi" index="0"/>
322322
<filesystem type="mount" accessmode="mapped">
323323
<source dir="/foo/source"/>

virtinst/cli.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2346,9 +2346,7 @@ def _parse(self, inst):
23462346
if self.optstr == "usb2":
23472347
return DeviceController.get_usb2_controllers(inst.conn)
23482348
elif self.optstr == "usb3":
2349-
inst.type = "usb"
2350-
inst.model = "nec-xhci"
2351-
return inst
2349+
return DeviceController.get_usb3_controller(inst.conn, self.guest)
23522350
return VirtCLIParser._parse(self, inst)
23532351

23542352

0 commit comments

Comments
 (0)