[libvirt] [PATCH v2 09/45] qemuxml2argvtest: Properly initialize qemuCaps->arch

qemuCaps->arch should match the guest architecture from domain XML. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- Notes: Version 2: - no changes src/qemu/qemu_capabilities.c | 9 +++++++++ src/qemu/qemu_capspriv.h | 3 +++ tests/qemuxml2argvtest.c | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b0e51ee..538cedb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2250,6 +2250,15 @@ const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps) return qemuCaps->binary; } + +void +virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps, + virArch arch) +{ + qemuCaps->arch = arch; +} + + virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps) { return qemuCaps->arch; diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index aeb1293..c409acb 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -56,4 +56,7 @@ char *virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps, time_t selfCTime, unsigned long selfVersion); +void +virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps, + virArch arch); #endif diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0790843..1b1918a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -27,6 +27,10 @@ # include "storage/storage_driver.h" # include "virmock.h" +# define __QEMU_CAPSRIV_H_ALLOW__ +# include "qemu/qemu_capspriv.h" +# undef __QEMU_CAPSRIV_H_ALLOW__ + # include "testutilsqemu.h" # define VIR_FROM_THIS VIR_FROM_QEMU @@ -332,6 +336,8 @@ testUpdateQEMUCaps(const struct testInfo *info, { int ret = -1; + virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch); + if (testAddCPUModels(info->qemuCaps, info->skipLegacyCPUs) < 0) goto cleanup; -- 2.10.0