libvirt/tests/qemuxml2argvdata/default-kvm-host-arch.xml

<domain type='kvm'>
  <name>kvm</name>
  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
  <memory unit='KiB'>4194304</memory>
  <currentMemory unit='KiB'>4194304</currentMemory>
  <vcpu placement='static'>4</vcpu>
  <os>
    <type>hvm</type>
    <boot dev='hd'/>
  </os>
</domain>
caps: Fix regression defaulting to host arch My commit 747761a79 (v1.2.15 only) dropped this bit of logic when filling in a default arch in the XML: - /* First try to find one matching host arch */ - for (i = 0; i < caps->nguests; i++) { - if (caps->guests[i]->ostype == ostype) { - for (j = 0; j < caps->guests[i]->arch.ndomains; j++) { - if (caps->guests[i]->arch.domains[j]->type == domain && - caps->guests[i]->arch.id == caps->host.arch) - return caps->guests[i]->arch.id; - } - } - } That attempt to match host.arch is important, otherwise we end up defaulting to i686 on x86_64 host for KVM, which is not intended. Duplicate it in the centralized CapsLookup function. Additionally add some testcases that would have caught this. https://bugzilla.redhat.com/show_bug.cgi?id=1219191 2015-05-06 22:32:05 +00:00			`<domain type='kvm'>`
			`<name>kvm</name>`
			`<uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>`
			`<memory unit='KiB'>4194304</memory>`
			`<currentMemory unit='KiB'>4194304</currentMemory>`
			`<vcpu placement='static'>4</vcpu>`
			`<os>`
			`<type>hvm</type>`
			`<boot dev='hd'/>`
			`</os>`
			`</domain>`