NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Use glib allocation for virCPU{,x86}Data

Browse Source 
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-25 10:28:26 +01:00
parent 8452779049
commit 8008685830
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cpu/cpu_x86.c
View File

@ -468,8 +468,9 @@ virCPUx86DataClear(virCPUx86Data *data)
if (!data) if (!data)
return; return;
VIR_FREE(data->items); g_free(data->items);
} }
G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virCPUx86Data, virCPUx86DataClear);
static void static void
@ -481,21 +482,19 @@ virCPUx86DataFree(virCPUDataPtr data)
virCPUx86DataClear(&data->data.x86); virCPUx86DataClear(&data->data.x86);
VIR_FREE(data); VIR_FREE(data);
} }
G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUData, virCPUx86DataFree);
static int static void
x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src) x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
{ {
size_t i; size_t i;
if (VIR_ALLOC_N(dst->items, src->len) < 0) dst->items = g_new0(virCPUx86DataItem, src->len);
return -1;
dst->len = src->len; dst->len = src->len;
for (i = 0; i < src->len; i++) for (i = 0; i < src->len; i++)
dst->items[i] = src->items[i]; dst->items[i] = src->items[i];
return 0;
} }
@ -781,9 +780,8 @@ x86DataToCPU(const virCPUx86Data *data,
cpu->model = g_strdup(model->name); cpu->model = g_strdup(model->name);
if (x86DataCopy(&copy, data) < 0 || x86DataCopy(&copy, data);
x86DataCopy(&modelData, &model->data) < 0) x86DataCopy(&modelData, &model->data);
goto error;
if ((vendor = x86DataToVendor(&copy, map))) if ((vendor = x86DataToVendor(&copy, map)))
cpu->vendor = g_strdup(vendor->name); cpu->vendor = g_strdup(vendor->name);
@ -1183,11 +1181,11 @@ x86ModelCopy(virCPUx86ModelPtr model)
copy->name = g_strdup(model->name); copy->name = g_strdup(model->name);
if (x86ModelCopySignatures(copy, model) < 0 || if (x86ModelCopySignatures(copy, model) < 0) {
x86DataCopy(&copy->data, &model->data) < 0) {
x86ModelFree(copy); x86ModelFree(copy);
return NULL; return NULL;
} }
x86DataCopy(&copy->data, &model->data);
copy->vendor = model->vendor; copy->vendor = model->vendor;
@ -1415,10 +1413,11 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
} }
model->vendor = ancestor->vendor; model->vendor = ancestor->vendor;
if (x86ModelCopySignatures(model, ancestor) < 0 || if (x86ModelCopySignatures(model, ancestor) < 0)
x86DataCopy(&model->data, &ancestor->data) < 0)
return -1; return -1;
x86DataCopy(&model->data, &ancestor->data);
return 0; return 0;
} }
@ -1904,9 +1903,9 @@ x86Compute(virCPUDefPtr host,
x86DataSubtract(&guest_model->data, &cpu_disable->data); x86DataSubtract(&guest_model->data, &cpu_disable->data);
if (!(guestData = virCPUDataNew(arch)) || if (!(guestData = virCPUDataNew(arch)))
x86DataCopy(&guestData->data.x86, &guest_model->data) < 0)
goto error; goto error;
x86DataCopy(&guestData->data.x86, &guest_model->data);
*guest = guestData; *guest = guestData;
} }
@ -2139,9 +2138,11 @@ x86Decode(virCPUDefPtr cpu,
ssize_t i; ssize_t i;
int rc; int rc;
if (!cpuData || x86DataCopy(&data, cpuData) < 0) if (!cpuData)
return -1; return -1;
x86DataCopy(&data, cpuData);
if (!(map = virCPUx86GetMap())) if (!(map = virCPUx86GetMap()))
goto cleanup; goto cleanup;
@ -3055,13 +3056,11 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
!(modelDisabled = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE))) !(modelDisabled = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)))
goto cleanup; goto cleanup;
if (dataEnabled && if (dataEnabled)
x86DataCopy(&enabled, &dataEnabled->data.x86) < 0) x86DataCopy(&enabled, &dataEnabled->data.x86);
goto cleanup;
if (dataDisabled && if (dataDisabled)
x86DataCopy(&disabled, &dataDisabled->data.x86) < 0) x86DataCopy(&disabled, &dataDisabled->data.x86);
goto cleanup;
for (i = 0; i < map->nfeatures; i++) { for (i = 0; i < map->nfeatures; i++) {
virCPUx86FeaturePtr feature = map->features[i]; virCPUx86FeaturePtr feature = map->features[i];