Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e4c4f64..3361a40 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2014,9 +2014,10 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) if (!ret) return NULL; + ret->usedQMP = qemuCaps->usedQMP; + virBitmapCopy(ret->flags, qemuCaps->flags); - ret->usedQMP = qemuCaps->usedQMP; ret->version = qemuCaps->version; ret->kvmVersion = qemuCaps->kvmVersion; -- 2.9.2

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3361a40..6c80d59 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -354,6 +354,8 @@ struct virQEMUCapsMachineType { * correctly. It does not have to be ABI-stable, as * the cache will be discarded & repopulated if the * timestamp on the libvirtd binary changes. + * + * And don't forget to update virQEMUCapsNewCopy. */ struct _virQEMUCaps { virObject object; @@ -2016,6 +2018,11 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) ret->usedQMP = qemuCaps->usedQMP; + if (VIR_STRDUP(ret->binary, qemuCaps->binary) < 0) + goto error; + + ret->ctime = qemuCaps->ctime; + virBitmapCopy(ret->flags, qemuCaps->flags); ret->version = qemuCaps->version; @@ -2044,6 +2051,12 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps) ret->machineTypes[i].maxCpus = qemuCaps->machineTypes[i].maxCpus; } + if (VIR_ALLOC_N(ret->gicCapabilities, qemuCaps->ngicCapabilities) < 0) + goto error; + ret->ngicCapabilities = qemuCaps->ngicCapabilities; + for (i = 0; i < qemuCaps->ngicCapabilities; i++) + ret->gicCapabilities[i] = qemuCaps->gicCapabilities[i]; + return ret; error: -- 2.9.2

Doing a load, copy, format cycle on all QEMU capabilities XML files should make sure we don't forget to update virQEMUCapsNewCopy when adding new elements to QEMU capabilities. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 8 ++++++-- src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_capspriv.h | 2 ++ tests/qemucapabilitiestest.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6c80d59..43e3ea7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2864,8 +2864,12 @@ virQEMUCapsLoadCache(virQEMUCapsPtr qemuCaps, const char *filename, goto cleanup; } - /* Don't check for NULL, since it is optional and thus may be missing */ - qemuCaps->package = virXPathString("string(./package)", ctxt); + if (virXPathBoolean("boolean(./package)", ctxt) > 0) { + qemuCaps->package = virXPathString("string(./package)", ctxt); + if (!qemuCaps->package && + VIR_STRDUP(qemuCaps->package, "") < 0) + goto cleanup; + } if (!(str = virXPathString("string(./arch)", ctxt))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e083d61..d249e2e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -384,7 +384,6 @@ typedef struct _virQEMUCapsCache virQEMUCapsCache; typedef virQEMUCapsCache *virQEMUCapsCachePtr; virQEMUCapsPtr virQEMUCapsNew(void); -virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps); int virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon); diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 647aafa..aeb1293 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -37,6 +37,8 @@ struct _virQEMUCapsCache { gid_t runGid; }; +virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps); + virQEMUCapsPtr virQEMUCapsNewForBinaryInternal(const char *binary, const char *libDir, diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index b98f775..4f1e5a5 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -77,6 +77,50 @@ testQemuCaps(const void *opaque) return ret; } + +static int +testQemuCapsCopy(const void *opaque) +{ + int ret = -1; + const testQemuData *data = opaque; + char *capsFile = NULL; + virCapsPtr caps = NULL; + virQEMUCapsPtr orig = NULL; + virQEMUCapsPtr copy = NULL; + char *actual = NULL; + + if (virAsprintf(&capsFile, "%s/qemucapabilitiesdata/%s.%s.xml", + abs_srcdir, data->base, data->archName) < 0) + goto cleanup; + + if (!(caps = virCapabilitiesNew(virArchFromString(data->archName), + false, false))) + goto cleanup; + + if (!(orig = qemuTestParseCapabilities(capsFile))) + goto cleanup; + + if (!(copy = virQEMUCapsNewCopy(orig))) + goto cleanup; + + if (!(actual = virQEMUCapsFormatCache(copy, 0, 0))) + goto cleanup; + + if (virTestCompareToFile(actual, capsFile) < 0) + goto cleanup; + + ret = 0; + + cleanup: + VIR_FREE(capsFile); + virObjectUnref(caps); + virObjectUnref(orig); + virObjectUnref(copy); + VIR_FREE(actual); + return ret; +} + + static int mymain(void) { @@ -103,6 +147,9 @@ mymain(void) data.base = name; \ if (virTestRun(name "(" arch ")", testQemuCaps, &data) < 0) \ ret = -1; \ + if (virTestRun("copy " name "(" arch ")", \ + testQemuCapsCopy, &data) < 0) \ + ret = -1; \ } while (0) DO_TEST("x86_64", "caps_1.2.2"); -- 2.9.2