- Devel - libvirt List Archives

[PATCH] docs: compiling: Add link to latest openSUSE libvirt package
by Jim Fehlig 30 Sep '22

30 Sep '22

This is a follow-up to fbd6b2480a, adding a link to the latest libvirt package for openSUSE. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/compiling.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/compiling.rst b/docs/compiling.rst index bc43a929da..2a740ad76e 100644 --- a/docs/compiling.rst +++ b/docs/compiling.rst @@ -24,6 +24,10 @@ allow installing the most recent versions of virtualization packages: The ``app-emulation/libvirt`` is regularly updated, but newest versions are usually marked as testing by the ``~*`` keyword. + **openSUSE** + + Refer to https://build.opensuse.org/package/show/Virtualization/libvirt + Preparing sources ----------------- -- 2.37.1

2 1

[PATCH] qemuNamespaceMknodOne: Call g_file_read_link() in async-signal-safe fashion
by Michal Privoznik 30 Sep '22

30 Sep '22

When creating a node in QEMU's namespace the whole link chain is created with it. Here, we use g_file_read_link() from the child (running inside the namespace) to learn whether a link exists and points to expected target. Now, when building the namespace there can't be any symlinks and this g_file_read_link() returns NULL always. And because we pass a local GError variable to it, glib tries to set it to a localized error message. This comes with creating a (static) hash table inside of g_strerror() and is guarded with a mutex. The hash table is also allocated using GSlice allocator instead of g_malloc, and since the latter is safe to use after fork (because it's documented to use plain malloc), glib went with the former, naturally. Now, GSlice allocator has plenty of internal mutexes and thus hitting a locked mutex is not that hard. Fortunately, we don't care about any error from g_file_read_link() and thus we can pass NULL which avoids calling g_strerror(). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2120965 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index a2c31310d9..311c66d46e 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -957,10 +957,9 @@ qemuNamespaceMknodOne(qemuNamespaceMknodItem *data) } if (isLink) { - g_autoptr(GError) gerr = NULL; g_autofree char *target = NULL; - if ((target = g_file_read_link(data->file, &gerr)) && + if ((target = g_file_read_link(data->file, NULL)) && STREQ(target, data->target)) { VIR_DEBUG("Skipping symlink %s -> %s which exists and points to correct target", data->file, data->target); -- 2.35.1

2 1

Re: [PATCH v2] rpc: fix memory leak in virNetServerClientNew and virNetServerProgramDispatchCall
by Michal Prívozník 30 Sep '22

30 Sep '22

On 9/30/22 04:32, Jiang Jiacheng wrote: > I see, maybe we could free dispatcher->arg_filter and > dispatcher->ret_filter together in error label like this: > error: > if (dispatcher) { > xdr_free(dispatcher->arg_filter, arg); > xdr_free(dispatcher->ret_filter, ret); > } > and in successful path, we can free them before return. Yes, this is what I tested just before suggesting it. Michal

1 0

[libvirt] [PATCH v2] qemu: Remove host-passthrough validation check for host-phys-bits=on
by Lin Ma 29 Sep '22

29 Sep '22

Besides the -cpu host, The host-phys-bits=on applies to custom or max cpu model, So the host-passthrough validation check is unnecessary for maxphysaddr with mode='passthrough'. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/qemu/qemu_validate.c | 7 ------- .../cpu-phys-bits-passthrough2.err | 2 +- .../cpu-phys-bits-passthrough2.xml | 4 ++-- .../cpu-phys-bits-passthrough3.err | 1 - .../cpu-phys-bits-passthrough3.xml | 20 ------------------- tests/qemuxml2argvtest.c | 1 - 6 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3327f6e24f..34fa10ae32 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -344,13 +344,6 @@ qemuValidateDomainDefCpu(virQEMUDriver *driver, switch (addr->mode) { case VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH: - if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU maximum physical address bits mode '%s' can only be used with '%s' CPUs"), - virCPUMaxPhysAddrModeTypeToString(addr->mode), - virCPUModeTypeToString(VIR_CPU_MODE_HOST_PASSTHROUGH)); - return -1; - } if (addr->bits != -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("CPU maximum physical address bits number specification cannot be used with mode='%s'"), diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err index 22009cc6e6..28f2e43432 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err @@ -1 +1 @@ -unsupported configuration: CPU maximum physical address bits mode 'passthrough' can only be used with 'host-passthrough' CPUs +unsupported configuration: CPU maximum physical address bits number specification cannot be used with mode='passthrough' diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml index 511bbf9949..a94e567dcb 100644 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml +++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml @@ -8,8 +8,8 @@ <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> - <cpu mode='host-model'> - <maxphysaddr mode='passthrough'/> + <cpu mode='host-passthrough'> + <maxphysaddr mode='passthrough' bits='42'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err deleted file mode 100644 index 28f2e43432..0000000000 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: CPU maximum physical address bits number specification cannot be used with mode='passthrough' diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml deleted file mode 100644 index a94e567dcb..0000000000 --- a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml +++ /dev/null @@ -1,20 +0,0 @@ -<domain type='kvm'> - <name>foo</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='x86_64' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu mode='host-passthrough'> - <maxphysaddr mode='passthrough' bits='42'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b7c3bc0e2d..c8b69bbd7a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3240,7 +3240,6 @@ mymain(void) DO_TEST("cpu-phys-bits-emulate2", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-phys-bits-emulate3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough2", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough3", QEMU_CAPS_KVM); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.26.2

3 2

[PATCH] qemuNamespaceMknodPaths: Don't fork needlessly
by Michal Privoznik 29 Sep '22

29 Sep '22

The qemuNamespaceMknodPaths() function is responsible for creating files/directories in QEMU's mount namespace. When called, it is given list of paths that have to be created in the namespace. It processes this list and removes items that are not directly under /dev, but on a 'shared' filesystem (note that all other mount points are preserved). And it may so happen that after this pre-process no files/directories need to be created in the namespace. If that's the case, exit early and avoid fork()-ing only to find out the same. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_namespace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c index 09e235e120..a2c31310d9 100644 --- a/src/qemu/qemu_namespace.c +++ b/src/qemu/qemu_namespace.c @@ -1293,6 +1293,9 @@ qemuNamespaceMknodPaths(virDomainObj *vm, goto cleanup; } + if (data.nitems == 0) + return 0; + for (i = 0; i < data.nitems; i++) { qemuNamespaceMknodItem *item = &data.items[i]; if (item->target && -- 2.35.1

2 1

[PATCH] qemuProcessReconnect: Don't build memory paths
by Michal Privoznik 29 Sep '22

29 Sep '22

Let me take you on a short trip to history. A long time ago, libvirt would configure all QEMUs to use $hugetlbfs/libvirt/qemu for their hugepages setup. This was problematic, because it did not allow enough separation between guests. Therefore in v3.0.0-rc1~367 the path changed to a per-domain basis: $hugetlbfs/libvirt/qemu/$domainShortName And to help with migration on daemon restart a call to qemuProcessBuildDestroyMemoryPaths() was added to qemuProcessReconnect() (well, it was named qemuProcessBuildDestroyHugepagesPath() back then, see v3.10.0-rc1~174). This was desirable then, because the memory hotplug code did not call the function, it simply assumes per-domain paths to exist. But this changed in v3.5.0-rc1~92 after which the per-domain paths are created on memory hotplug too. Therefore, it's no longer necessary to create these paths in qemuProcessReconnect(). They are created exactly when needed (domain startup and memory hotplug). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b05ad059c3..998f4aa63c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8785,9 +8785,6 @@ qemuProcessReconnect(void *opaque) goto cleanup; } - if (qemuProcessBuildDestroyMemoryPaths(driver, obj, NULL, true) < 0) - goto error; - if ((qemuDomainAssignAddresses(obj->def, priv->qemuCaps, driver, obj, false)) < 0) { goto error; -- 2.35.1

2 1

[PATCH] virdomainjob: preserveJob: memdup the cb structure instead of copying it
by Kristina Hanicova 29 Sep '22

29 Sep '22

In case of variable 'oldjob' (job structure) in qemuProcessReconnect() the init function was not called and the cb pointer was just copied from the existing job structure in virDomainObjPreserveJob(). This caused that the job and oldjob had the same pointer, which was later freed at the end of the qemuProcessReconnect() function by automatic call to virDomainObjClearJob(). This caused an invalid read in case of a daemon crash as the job structure was trying to read cb which had been already freed. This patch changes the copying to g_memdup that allocates different pointer, which can be later safely freed. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/virdomainjob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index aca801af38..0c67e84ef1 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -210,7 +210,7 @@ virDomainObjPreserveJob(virDomainJobObj *currJob, if (currJob->cb && currJob->cb->allocJobPrivate && !(currJob->privateData = currJob->cb->allocJobPrivate())) return -1; - job->cb = currJob->cb; + job->cb = g_memdup(currJob->cb, sizeof(*currJob->cb)); virDomainObjResetJob(currJob); virDomainObjResetAsyncJob(currJob); -- 2.37.3

2 1

Re: Why host device disappear in libvirt doman xml?
by Michal Prívozník 29 Sep '22

29 Sep '22

[I'm going to repeat this for the last time, please keep the list on CC list] On 9/29/22 10:15, 陈新隆 wrote: > Like pic below, `cat /run/libvirt/qemu/<domain>.xml` outputs <device > alias='ua-gpu-gpu0' /> , `virsh dumpxml <domain>` does not outputs gpu > hostdev. > It's usually better to paste the text, especially since you've posted a picture of a text. So, the first virsh dumpxml | grep gpu shows empty output. Then, virsh dumpxml --inactive | grep gpu shows a line where 'ua-gpu-gpu0' alias is declared for something. Without context lines is hard to tell for what. Then, you grep /run/libvirt/qemu/$dom.xml where 'gpu' string appears in two capabilities, and one <device alias=''/>. Now, as I've said before, it's not uncommon for live XML and inactive XML to be different. So something has hot-unplugged a device with ua-gpu-gpu0 alias. And since there is no context lines I can't confirm what device it was. And lastly, the XML file under /run is considered libvirt internal and unless I can try to explain some stuff, but knowing libvirt internals is a must here. Those <flag/> elements are what we call QEMU capabilities (flags that libvirt looks for when determining what features is QEMU capable of). The fact that they have 'gpu' substring is just a coincidence. Then the <device/> element is a list of device aliases used by QEMU devices. Again, internal. > Since the domain is running, then both two commands represent the live > xml of the domain. Why are there two different output results about gpu > devices ? Which output should I follow ? NO, I think I made that clear. Since the domain is running, 'virsh dumpxml' gives you live XML and 'virsh dumpxml --inactive' gives you inactive XML. These two are completely different and the only thing that they are required to have the same is domain name and domain UUID. Have you read that wiki page I suggested couple of e-mails ago? If you think a device disappears from your domain then you need to talk to developers of the software you are using (if I recall correctly you mentioned KubeVirt?). > > image.png > > This is a windows vm, connect to vnc server, taskmgr and display adapter > proves that there's no gpu device now. Yep, so something hot-unplugged the device. I suspect the management software on top of libvirt. Libvirt does not detach any device on its own. And since this is NVIDIA I would not be surprised if it was a licensing issue, or something similar. Michal

1 0

[PATCH v2 RESEND] qemu: fix memory leak about virDomainEventTunableNew
by luzhipeng 27 Sep '22

27 Sep '22

From: lu zhipeng <luzhipeng(a)cestc.cn> For prevent memory leak and easier to use, So change virDomainEventTunableNew to get virTypedParameterPtr *params and set it = NULL. Signed-off-by: lu zhipeng <luzhipeng(a)cestc.cn> --- src/conf/domain_event.c | 14 +++++++------- src/conf/domain_event.h | 4 ++-- src/qemu/qemu_driver.c | 22 ++++++++++------------ src/remote/remote_driver.c | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index ff8ea2c389..ff39975104 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1495,8 +1495,8 @@ static virObjectEvent * virDomainEventTunableNew(int id, const char *name, unsigned char *uuid, - virTypedParameterPtr params, - int nparams) + virTypedParameterPtr *params, + int nparams) { virDomainEventTunable *ev; @@ -1508,19 +1508,19 @@ virDomainEventTunableNew(int id, id, name, uuid))) goto error; - ev->params = params; + ev->params = *params; ev->nparams = nparams; - + *params = NULL; return (virObjectEvent *)ev; error: - virTypedParamsFree(params, nparams); + virTypedParamsFree(*params, nparams); return NULL; } virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(obj->def->id, @@ -1532,7 +1532,7 @@ virDomainEventTunableNewFromObj(virDomainObj *obj, virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams) { return virDomainEventTunableNew(dom->id, diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 4a9f6b988b..f4016dc1e9 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -195,11 +195,11 @@ virDomainEventDeviceRemovalFailedNewFromDom(virDomainPtr dom, virObjectEvent * virDomainEventTunableNewFromObj(virDomainObj *obj, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * virDomainEventTunableNewFromDom(virDomainPtr dom, - virTypedParameterPtr params, + virTypedParameterPtr *params, int nparams); virObjectEvent * diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 94b70872d4..3db4592945 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4472,12 +4472,12 @@ qemuDomainPinVcpuLive(virDomainObj *vm, &eventMaxparams, paramField, str) < 0) goto cleanup; - event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams); - + event = virDomainEventTunableNewFromObj(vm, &eventParams, eventNparams); ret = 0; cleanup: virObjectEventStateQueue(driver->domainEventState, event); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -4681,7 +4681,7 @@ qemuDomainPinEmulator(virDomainPtr dom, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -4700,6 +4700,7 @@ qemuDomainPinEmulator(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -5078,7 +5079,7 @@ qemuDomainPinIOThread(virDomainPtr dom, &eventMaxparams, paramField, str) < 0) goto endjob; - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); } if (persistentDef) { @@ -5106,6 +5107,7 @@ qemuDomainPinIOThread(virDomainPtr dom, cleanup: virObjectEventStateQueue(driver->domainEventState, event); virDomainObjEndAPI(&vm); + virTypedParamsFree(eventParams, eventNparams); return ret; } @@ -9633,8 +9635,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } @@ -9654,8 +9655,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } #undef SCHED_RANGE_CHECK @@ -16159,8 +16159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainSaveStatus(vm); if (eventNparams) { - event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams); - eventNparams = 0; + event = virDomainEventTunableNewFromDom(dom, &eventParams, eventNparams); virObjectEventStateQueue(driver->domainEventState, event); } } @@ -16202,8 +16201,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, VIR_FREE(info.group_name); VIR_FREE(conf_info.group_name); virDomainObjEndAPI(&vm); - if (eventNparams) - virTypedParamsFree(eventParams, eventNparams); + virTypedParamsFree(eventParams, eventNparams); return ret; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a4efe101a3..b0dba9057b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5078,7 +5078,7 @@ remoteDomainBuildEventCallbackTunable(virNetClientProgram *prog G_GNUC_UNUSED, return; } - event = virDomainEventTunableNewFromDom(dom, params, nparams); + event = virDomainEventTunableNewFromDom(dom, &params, nparams); virObjectUnref(dom); -- 2.31.1

2 2

[PATCH v2] cpu_map: Introduce Neoverse N1/N2/V1
by Zhenyu Zhang 27 Sep '22

27 Sep '22

Add Neoverse N1/N2/V1 as a supported cpu model. Signed-off-by: Zhenyu Zhang <zhenyzha(a)redhat.com> v1: https://listman.redhat.com/archives/libvir-list/2022-September/234294.html Changelog ========= v2: * Introduce Neoverse N1/N2/V1 (Martin) * Corrected ampere vendor value (Martin) --- src/cpu_map/arm_Neoverse-N1.xml | 7 +++++++ src/cpu_map/arm_Neoverse-N2.xml | 7 +++++++ src/cpu_map/arm_Neoverse-V1.xml | 7 +++++++ src/cpu_map/arm_vendors.xml | 1 + src/cpu_map/index.xml | 5 +++++ src/cpu_map/meson.build | 3 +++ 6 files changed, 30 insertions(+) create mode 100644 src/cpu_map/arm_Neoverse-N1.xml create mode 100644 src/cpu_map/arm_Neoverse-N2.xml create mode 100644 src/cpu_map/arm_Neoverse-V1.xml diff --git a/src/cpu_map/arm_Neoverse-N1.xml b/src/cpu_map/arm_Neoverse-N1.xml new file mode 100644 index 0000000000..db25813cd9 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N1.xml @@ -0,0 +1,7 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='Ampere'/> + <pvr value='0xd0c'/> + </model> +</cpus> + diff --git a/src/cpu_map/arm_Neoverse-N2.xml b/src/cpu_map/arm_Neoverse-N2.xml new file mode 100644 index 0000000000..8e8c9d202c --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N2.xml @@ -0,0 +1,7 @@ +<cpus> + <model name='Neoverse-N2'> + <vendor name='Ampere'/> + <pvr value='0xd49'/> + </model> +</cpus> + diff --git a/src/cpu_map/arm_Neoverse-V1.xml b/src/cpu_map/arm_Neoverse-V1.xml new file mode 100644 index 0000000000..82a7d86b08 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-V1.xml @@ -0,0 +1,7 @@ +<cpus> + <model name='Neoverse-V1'> + <vendor name='Ampere'/> + <pvr value='0xd40'/> + </model> +</cpus> + diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml index 92d10565f4..3bbaf35ab7 100644 --- a/src/cpu_map/arm_vendors.xml +++ b/src/cpu_map/arm_vendors.xml @@ -13,4 +13,5 @@ <vendor name='Marvell' value='0x56'/> <vendor name='Intel' value='0x69'/> <vendor name='Phytium' value='0x70'/> + <vendor name='Ampere' value='0xc0'/> </cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..01fa61f4a4 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -98,6 +98,11 @@ <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> +  + <include filename='arm_Neoverse-N1.xml'/> + <include filename='arm_Neoverse-N2.xml'/> + <include filename='arm_Neoverse-V1.xml'/> +  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..55c3703006 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,9 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_Neoverse-N1.xml', + 'arm_Neoverse-N2.xml', + 'arm_Neoverse-V1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

2 4