qemu: Copy missing QEMU caps elements

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-08-04 16:48:40 +02:00
parent 79057b8b3b
commit c611c886f5

View File

@ -354,6 +354,8 @@ struct virQEMUCapsMachineType {
* correctly. It does not have to be ABI-stable, as * correctly. It does not have to be ABI-stable, as
* the cache will be discarded & repopulated if the * the cache will be discarded & repopulated if the
* timestamp on the libvirtd binary changes. * timestamp on the libvirtd binary changes.
*
* And don't forget to update virQEMUCapsNewCopy.
*/ */
struct _virQEMUCaps { struct _virQEMUCaps {
virObject object; virObject object;
@ -2016,6 +2018,11 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
ret->usedQMP = qemuCaps->usedQMP; ret->usedQMP = qemuCaps->usedQMP;
if (VIR_STRDUP(ret->binary, qemuCaps->binary) < 0)
goto error;
ret->ctime = qemuCaps->ctime;
virBitmapCopy(ret->flags, qemuCaps->flags); virBitmapCopy(ret->flags, qemuCaps->flags);
ret->version = qemuCaps->version; ret->version = qemuCaps->version;
@ -2044,6 +2051,12 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
ret->machineTypes[i].maxCpus = qemuCaps->machineTypes[i].maxCpus; 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; return ret;
error: error: