libvirt/tests/qemucaps2xmloutdata/caps.s390x.xml

<capabilities>

  <host>
    <cpu>
      <arch>s390x</arch>
    </cpu>
    <power_management/>
    <iommu support='no'/>
  </host>

  <guest>
    <os_type>hvm</os_type>
    <arch name='s390x'>
      <wordsize>64</wordsize>
      <emulator>/usr/bin/qemu-system-s390x</emulator>
      <domain type='qemu'/>
      <domain type='kvm'/>
    </arch>
    <features>
      <cpuselection/>
      <deviceboot/>
      <disksnapshot default='on' toggle='no'/>
    </features>
  </guest>

</capabilities>
tests: Add more tests to qemucaps2xml More specifically, everything that's tested by qemucapabilities now goes through qemucaps2xml as well. Ideally we'll rewrite both so that listing all test cases is unnecessary and they get picked up automatically by listing the contents of the input directory instead, but that's a refactor for another day :) Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com> 2018-09-13 16:28:59 +00:00			`<capabilities>`

			`<host>`
			`<cpu>`
			`<arch>s390x</arch>`
			`</cpu>`
			`<power_management/>`
			`<iommu support='no'/>`
			`</host>`

			`<guest>`
			`<os_type>hvm</os_type>`
			`<arch name='s390x'>`
			`<wordsize>64</wordsize>`
			`<emulator>/usr/bin/qemu-system-s390x</emulator>`
			`<domain type='qemu'/>`
qemu: Don't duplicate binary name in capabilities virCapabilitiesAddGuestDomain() takes an optional binary name: this is intended for cases where a certain domain type can't use the default one registered for the guest architecture, but has to use a special binary instead. The current code, however, will pass 'binary' again when 'kvmbin' is not defined, which is unnecessary as 'binary' has been registered as default earlier, and will result in capabilities output such as <emulator>/usr/bin/qemu-system-x86_64</emulator> <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-system-x86_64</emulator> </domain> with the second <emulator> element providing no additional information. Change it so that, when 'kvmbin' is not defined, NULL is passed and so the default emulator will be used instead. Signed-off-by: Andrea Bolognani <abologna@redhat.com> 2018-09-14 11:10:27 +00:00			`<domain type='kvm'/>`
tests: Add more tests to qemucaps2xml More specifically, everything that's tested by qemucapabilities now goes through qemucaps2xml as well. Ideally we'll rewrite both so that listing all test cases is unnecessary and they get picked up automatically by listing the contents of the input directory instead, but that's a refactor for another day :) Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com> 2018-09-13 16:28:59 +00:00			`</arch>`
			`<features>`
			`<cpuselection/>`
			`<deviceboot/>`
			`<disksnapshot default='on' toggle='no'/>`
			`</features>`
			`</guest>`

			`</capabilities>`