External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Move and rename x86ModelCopySignatures

Browse Source 
Later in this series the function will work on a newly introduced
virCPUx86Signatures structure. Let's move it to the place were all
related functions will be added and rename the function as
virCPUx86SignaturesCopy for easier review of the virCPUx86Signatures
patch.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2020-03-26 15:07:42 +01:00
parent a32a3e934f
commit a8ec1d746e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/cpu/cpu_x86.c
View File

@ -1090,23 +1090,9 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
} }
static void
x86ModelFree(virCPUx86ModelPtr model)
{
if (!model)
return;
g_free(model->name);
g_free(model->signatures);
virCPUx86DataClear(&model->data);
g_free(model);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
static int static int
x86ModelCopySignatures(virCPUx86ModelPtr dst, virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
virCPUx86ModelPtr src) virCPUx86ModelPtr src)
{ {
size_t i; size_t i;
@ -1124,6 +1110,20 @@ x86ModelCopySignatures(virCPUx86ModelPtr dst,
} }
static void
x86ModelFree(virCPUx86ModelPtr model)
{
if (!model)
return;
g_free(model->name);
g_free(model->signatures);
virCPUx86DataClear(&model->data);
g_free(model);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
static virCPUx86ModelPtr static virCPUx86ModelPtr
x86ModelCopy(virCPUx86ModelPtr model) x86ModelCopy(virCPUx86ModelPtr model)
{ {
@ -1132,7 +1132,7 @@ x86ModelCopy(virCPUx86ModelPtr model)
copy = g_new0(virCPUx86Model, 1); copy = g_new0(virCPUx86Model, 1);
copy->name = g_strdup(model->name); copy->name = g_strdup(model->name);
if (x86ModelCopySignatures(copy, model) < 0) { if (virCPUx86SignaturesCopy(copy, model) < 0) {
x86ModelFree(copy); x86ModelFree(copy);
return NULL; return NULL;
} }
@ -1360,7 +1360,7 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
} }
model->vendor = ancestor->vendor; model->vendor = ancestor->vendor;
if (x86ModelCopySignatures(model, ancestor) < 0) if (virCPUx86SignaturesCopy(model, ancestor) < 0)
return -1; return -1;
x86DataCopy(&model->data, &ancestor->data); x86DataCopy(&model->data, &ancestor->data);