External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Don't set default USB model if qemuCaps is missing

Browse Source 
qemuDomainControllerDefPostParse assigns the default USB controller
model when it was not specified by the user. Skip this step if @qemuCaps
is missing so that we don't fill wrong data. This will then be fixes by
re-running the post parse callback.
This commit is contained in:
Peter Krempa 2017-08-16 15:54:10 +02:00
parent fde772cf82
commit 7808884808
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_domain.c
View File

@ -3438,9 +3438,10 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
break; break;
case VIR_DOMAIN_CONTROLLER_TYPE_USB: case VIR_DOMAIN_CONTROLLER_TYPE_USB:
if (cont->model == -1) { if (cont->model == -1 && qemuCaps) {
/* Pick a suitable default model for the USB controller if none /* Pick a suitable default model for the USB controller if none
* has been selected by the user. * has been selected by the user and we have the qemuCaps for
* figuring out which contollers are supported.
* *
* We rely on device availability instead of setting the model * We rely on device availability instead of setting the model
* unconditionally because, for some machine types, there's a * unconditionally because, for some machine types, there's a