mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-23 21:15:20 +00:00
cpu: Drop feature filtering from virCPUUpdate
Because of the changes done in the previous commit, @host is already a migratable CPU and there's no need to do any additional filtering. Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
959e72d323
commit
5f96b3feb6
@ -2549,8 +2549,7 @@ x86Baseline(virCPUDefPtr *cpus,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
x86UpdateHostModel(virCPUDefPtr guest,
|
x86UpdateHostModel(virCPUDefPtr guest,
|
||||||
const virCPUDef *host,
|
const virCPUDef *host)
|
||||||
virCPUx86MapPtr map)
|
|
||||||
{
|
{
|
||||||
virCPUDefPtr updated = NULL;
|
virCPUDefPtr updated = NULL;
|
||||||
size_t i;
|
size_t i;
|
||||||
@ -2559,11 +2558,9 @@ x86UpdateHostModel(virCPUDefPtr guest,
|
|||||||
if (!(updated = virCPUDefCopyWithoutModel(host)))
|
if (!(updated = virCPUDefCopyWithoutModel(host)))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
/* Remove non-migratable features by default */
|
|
||||||
updated->type = VIR_CPU_TYPE_GUEST;
|
updated->type = VIR_CPU_TYPE_GUEST;
|
||||||
updated->mode = VIR_CPU_MODE_CUSTOM;
|
updated->mode = VIR_CPU_MODE_CUSTOM;
|
||||||
if (virCPUDefCopyModelFilter(updated, host, true,
|
if (virCPUDefCopyModel(updated, host, true) < 0)
|
||||||
x86FeatureIsMigratable, map) < 0)
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
if (guest->vendor_id) {
|
if (guest->vendor_id) {
|
||||||
@ -2627,7 +2624,7 @@ virCPUx86Update(virCPUDefPtr guest,
|
|||||||
|
|
||||||
if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
|
if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
|
||||||
guest->match == VIR_CPU_MATCH_MINIMUM)
|
guest->match == VIR_CPU_MATCH_MINIMUM)
|
||||||
ret = x86UpdateHostModel(guest, host, map);
|
ret = x86UpdateHostModel(guest, host);
|
||||||
else
|
else
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user