cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From 348115bbd0d60fada6f7d9fa27848044690a4bc3 Mon Sep 17 00:00:00 2001
902636
From: "plai@redhat.com" <plai@redhat.com>
902636
Date: Thu, 21 May 2020 23:56:45 +0100
902636
Subject: [PATCH 02/12] numa: remove not needed check
902636
902636
RH-Author: plai@redhat.com
902636
Message-id: <20200521235655.27141-2-plai@redhat.com>
902636
Patchwork-id: 96738
902636
O-Subject: [RHEL8.2.1 AV qemu-kvm PATCH 01/11] numa: remove not needed check
902636
Bugzilla: 1600217
902636
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
902636
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
902636
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
902636
902636
From: Igor Mammedov <imammedo@redhat.com>
902636
902636
Currently parse_numa_node() is always called from already numa
902636
enabled context.
902636
Drop unnecessary check if numa is supported.
902636
902636
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
902636
Message-Id: <1576154936-178362-2-git-send-email-imammedo@redhat.com>
902636
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
902636
(cherry picked from commit 5275db59aa7ff8a26bd6aa5d07cb4d53de5cfab5)
902636
Signed-off-by: Paul Lai <plai@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 hw/core/numa.c | 7 +------
902636
 1 file changed, 1 insertion(+), 6 deletions(-)
902636
902636
diff --git a/hw/core/numa.c b/hw/core/numa.c
902636
index e3332a9..19f082d 100644
902636
--- a/hw/core/numa.c
902636
+++ b/hw/core/numa.c
902636
@@ -83,10 +83,6 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node,
902636
         return;
902636
     }
902636
 
902636
-    if (!mc->cpu_index_to_instance_props || !mc->get_default_cpu_node_id) {
902636
-        error_setg(errp, "NUMA is not supported by this machine-type");
902636
-        return;
902636
-    }
902636
     for (cpus = node->cpus; cpus; cpus = cpus->next) {
902636
         CpuInstanceProperties props;
902636
         if (cpus->value >= max_cpus) {
902636
@@ -178,9 +174,8 @@ void parse_numa_distance(MachineState *ms, NumaDistOptions *dist, Error **errp)
902636
 void set_numa_options(MachineState *ms, NumaOptions *object, Error **errp)
902636
 {
902636
     Error *err = NULL;
902636
-    MachineClass *mc = MACHINE_GET_CLASS(ms);
902636
 
902636
-    if (!mc->numa_mem_supported) {
902636
+    if (!ms->numa_state) {
902636
         error_setg(errp, "NUMA is not supported by this machine-type");
902636
         goto end;
902636
     }
902636
-- 
902636
1.8.3.1
902636