openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rewrite the condition in qemuDomainAssignARMVirtioMMIOAddresses 

It was not indented correctly.
This commit is contained in:
Ján Tomko 2016-05-03 10:54:55 +02:00
parent 2d61934a21
commit 204b459c1a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_domain_address.c
View File

@ -402,12 +402,16 @@ static void
qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
if (((def->os.arch == VIR_ARCH_ARMV7L) || if (def->os.arch != VIR_ARCH_ARMV7L &&
(def->os.arch == VIR_ARCH_AARCH64)) && def->os.arch != VIR_ARCH_AARCH64)
(STRPREFIX(def->os.machine, "vexpress-") || return;
STREQ(def->os.machine, "virt") ||
STRPREFIX(def->os.machine, "virt-")) && if (!(STRPREFIX(def->os.machine, "vexpress-") ||
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { STREQ(def->os.machine, "virt") ||
STRPREFIX(def->os.machine, "virt-")))
return;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) {
qemuDomainPrimeVirtioDeviceAddresses( qemuDomainPrimeVirtioDeviceAddresses(
def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO);
} }