External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 20:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix check for primary IDE controller in QEMU PCI slot assignment

Browse Source 
A typo in the check for the primary IDE controller could cause
a crash on restore depending on the exact guest config.

* src/qemu/qemu_conf.c: Fix s/video/controller/ typo & slot
  number typo
This commit is contained in:
Daniel P. Berrange 2010-02-15 14:37:04 +00:00
parent b6b8009548
commit 9ab3fac841
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_conf.c
View File

@ -2133,10 +2133,10 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs)
if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE &&
def->controllers[i]->idx == 0) { def->controllers[i]->idx == 0) {
if (def->controllers[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { if (def->controllers[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
if (def->videos[i]->info.addr.pci.domain != 0 || if (def->controllers[i]->info.addr.pci.domain != 0 ||
def->videos[i]->info.addr.pci.bus != 0 || def->controllers[i]->info.addr.pci.bus != 0 ||
def->videos[i]->info.addr.pci.slot != 2 || def->controllers[i]->info.addr.pci.slot != 1 ||
def->videos[i]->info.addr.pci.function != 0) { def->controllers[i]->info.addr.pci.function != 1) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Primary IDE controller must have PCI address 0:0:1.1")); _("Primary IDE controller must have PCI address 0:0:1.1"));
goto error; goto error;