mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-11 15:27:47 +00:00
e958fb5b15
One of the main reasons for introducing host-model CPU definition in a domain capabilities XML was the inability to express disabled features in a host capabilities XML. That is, when a host CPU is, e.g., Haswell without x2apic support, host capabilities XML will have to report it as Westmere + a bunch of additional features., but we really want to use Haswell - x2apic when creating a host-model CPU. Unfortunately, I somehow forgot to do the last step and the code would just copy the CPU definition found in the host capabilities XML. This changed recently for new QEMU versions which allow us to query host CPU, but any slightly older QEMU will not benefit from any change I did. This patch makes sure the right CPU model is filled in the domain capabilities even with old QEMU. The issue was reported in https://bugzilla.redhat.com/show_bug.cgi?id=1426456 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
36 lines
1.2 KiB
C
36 lines
1.2 KiB
C
/*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "internal.h"
|
|
#include "qemu/qemu_capabilities.h"
|
|
#define __QEMU_CAPSRIV_H_ALLOW__
|
|
#include "qemu/qemu_capspriv.h"
|
|
#undef __QEMU_CAPSRIV_H_ALLOW__
|
|
|
|
|
|
virCPUDefPtr
|
|
virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps,
|
|
virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
|
|
virDomainVirtType type ATTRIBUTE_UNUSED)
|
|
{
|
|
if (!caps || !caps->host.cpu || !caps->host.cpu->model)
|
|
return NULL;
|
|
|
|
return virCPUDefCopy(caps->host.cpu);
|
|
}
|