Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:Update
libvirt
8f1a8ce3-cpu_x86-Rename-virCPUx86DataAddCPUID.p...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 8f1a8ce3-cpu_x86-Rename-virCPUx86DataAddCPUID.patch of Package libvirt
commit 8f1a8ce397d7514bee9f370a1531d668e01ec923 Author: Jiri Denemark <jdenemar@redhat.com> Date: Thu Mar 14 22:02:44 2019 +0100 cpu_x86: Rename virCPUx86DataAddCPUID It's called virCPUx86DataAdd now. Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Index: libvirt-5.1.0/src/cpu/cpu_x86.c =================================================================== --- libvirt-5.1.0.orig/src/cpu/cpu_x86.c +++ libvirt-5.1.0/src/cpu/cpu_x86.c @@ -1417,7 +1417,7 @@ virCPUx86DataParse(xmlXPathContextPtr ct _("failed to parse cpuid[%zu]"), i); goto error; } - if (virCPUx86DataAddCPUID(cpuData, &item) < 0) + if (virCPUx86DataAdd(cpuData, &item) < 0) goto error; } @@ -2023,7 +2023,7 @@ x86Encode(virArch arch, if (!(data_vendor = virCPUDataNew(arch))) goto error; - if (v && virCPUx86DataAddCPUID(data_vendor, &v->data) < 0) + if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0) goto error; } @@ -2099,13 +2099,13 @@ cpuidSetLeaf4(virCPUDataPtr data, virCPUx86DataItem item = *subLeaf0; virCPUx86CPUIDPtr cpuid = &item.cpuid; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; while (cpuid->eax & 0x1f) { cpuid->ecx_in++; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; } return 0; @@ -2124,13 +2124,13 @@ cpuidSetLeaf7(virCPUDataPtr data, virCPUx86CPUIDPtr cpuid = &item.cpuid; uint32_t sub; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; } return 0; @@ -2152,7 +2152,7 @@ cpuidSetLeafB(virCPUDataPtr data, virCPUx86CPUIDPtr cpuid = &item.cpuid; while (cpuid->ecx & 0xff00) { - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; cpuid->ecx_in++; cpuidCall(cpuid); @@ -2179,12 +2179,12 @@ cpuidSetLeafD(virCPUDataPtr data, virCPUx86CPUID sub1; uint32_t sub; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; cpuid->ecx_in = 1; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; sub0 = subLeaf0->cpuid; @@ -2201,7 +2201,7 @@ cpuidSetLeafD(virCPUDataPtr data, cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; } return 0; @@ -2226,7 +2226,7 @@ cpuidSetLeafResID(virCPUDataPtr data, virCPUx86CPUIDPtr cpuid = &item.cpuid; uint32_t sub; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; for (sub = 1; sub < 32; sub++) { @@ -2234,7 +2234,7 @@ cpuidSetLeafResID(virCPUDataPtr data, continue; cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; } return 0; @@ -2258,19 +2258,19 @@ cpuidSetLeaf12(virCPUDataPtr data, !(leaf7->cpuid.ebx & (1 << 2))) return 0; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; cpuid->eax_in = 0x12; cpuid->ecx_in = 1; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; cpuid->ecx_in = 2; cpuidCall(cpuid); while (cpuid->eax & 0xf) { - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; cpuid->ecx_in++; cpuidCall(cpuid); @@ -2291,13 +2291,13 @@ cpuidSetLeaf14(virCPUDataPtr data, virCPUx86CPUIDPtr cpuid = &item.cpuid; uint32_t sub; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; } return 0; @@ -2320,13 +2320,13 @@ cpuidSetLeaf17(virCPUDataPtr data, if (subLeaf0->cpuid.eax < 3) return 0; - if (virCPUx86DataAddCPUID(data, subLeaf0) < 0) + if (virCPUx86DataAdd(data, subLeaf0) < 0) return -1; for (sub = 1; sub <= subLeaf0->cpuid.eax; sub++) { cpuid->ecx_in = sub; cpuidCall(cpuid); - if (virCPUx86DataAddCPUID(data, &item) < 0) + if (virCPUx86DataAdd(data, &item) < 0) return -1; } return 0; @@ -2372,7 +2372,7 @@ cpuidSet(uint32_t base, virCPUDataPtr da else if (leaf == 0x17) rc = cpuidSetLeaf17(data, &item); else - rc = virCPUx86DataAddCPUID(data, &item); + rc = virCPUx86DataAdd(data, &item); if (rc < 0) return -1; @@ -2946,8 +2946,8 @@ virCPUx86ValidateFeatures(virCPUDefPtr c int -virCPUx86DataAddCPUID(virCPUDataPtr cpuData, - const virCPUx86DataItem *item) +virCPUx86DataAdd(virCPUDataPtr cpuData, + const virCPUx86DataItem *item) { return virCPUx86DataAddItem(&cpuData->data.x86, item); } @@ -2974,7 +2974,7 @@ virCPUx86DataSetVendor(virCPUDataPtr cpu if (virCPUx86VendorToCPUID(vendor, &item) < 0) return -1; - return virCPUx86DataAddCPUID(cpuData, &item); + return virCPUx86DataAdd(cpuData, &item); } Index: libvirt-5.1.0/src/cpu/cpu_x86.h =================================================================== --- libvirt-5.1.0.orig/src/cpu/cpu_x86.h +++ libvirt-5.1.0/src/cpu/cpu_x86.h @@ -26,8 +26,8 @@ extern struct cpuArchDriver cpuDriverX86; -int virCPUx86DataAddCPUID(virCPUDataPtr cpuData, - const virCPUx86DataItem *cpuid); +int virCPUx86DataAdd(virCPUDataPtr cpuData, + const virCPUx86DataItem *cpuid); int virCPUx86DataSetSignature(virCPUDataPtr cpuData, unsigned int family, Index: libvirt-5.1.0/src/libvirt_private.syms =================================================================== --- libvirt-5.1.0.orig/src/libvirt_private.syms +++ libvirt-5.1.0/src/libvirt_private.syms @@ -1204,7 +1204,7 @@ virCPUValidateFeatures; # cpu/cpu_x86.h -virCPUx86DataAddCPUID; +virCPUx86DataAdd; virCPUx86DataAddFeature; virCPUx86DataSetSignature; virCPUx86DataSetVendor; Index: libvirt-5.1.0/src/libxl/libxl_capabilities.c =================================================================== --- libvirt-5.1.0.orig/src/libxl/libxl_capabilities.c +++ libvirt-5.1.0/src/libxl/libxl_capabilities.c @@ -72,7 +72,7 @@ libxlCapsAddCPUID(virCPUDataPtr data, vi for (i = 0; i < ncaps; i++) { item.cpuid = cpuid[i]; - if (virCPUx86DataAddCPUID(data, &item) < 0) { + if (virCPUx86DataAdd(data, &item) < 0) { VIR_DEBUG("Failed to add CPUID(%x,%x)", cpuid[i].eax_in, cpuid[i].ecx_in); return -1; Index: libvirt-5.1.0/src/qemu/qemu_monitor_json.c =================================================================== --- libvirt-5.1.0.orig/src/qemu/qemu_monitor_json.c +++ libvirt-5.1.0/src/qemu/qemu_monitor_json.c @@ -7230,7 +7230,7 @@ qemuMonitorJSONParseCPUx86Features(virJS for (i = 0; i < virJSONValueArraySize(data); i++) { if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(data, i), &item.cpuid) < 0 || - virCPUx86DataAddCPUID(cpudata, &item) < 0) + virCPUx86DataAdd(cpudata, &item) < 0) goto error; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
