|
 |
1bdc94 |
From af911371436ef3adf09fca4433f71f8f17631e1b Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Date: Mon, 2 Jul 2018 13:57:09 +0200
|
|
|
1bdc94 |
Subject: [PATCH 52/57] numa: clarify error message when node index is out of
|
|
|
1bdc94 |
range in -numa dist, ...
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Message-id: <1530539829-260581-1-git-send-email-imammedo@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81184
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH] numa: clarify error message when node index is out of range in -numa dist, ...
|
|
|
1bdc94 |
Bugzilla: 1578381
|
|
|
1bdc94 |
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Pankaj Gupta <pagupta@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
When using following CLI:
|
|
|
1bdc94 |
-numa dist,src=128,dst=1,val=20
|
|
|
1bdc94 |
user gets a rather confusing error message:
|
|
|
1bdc94 |
"Invalid node 128, max possible could be 128"
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Where 128 is number of nodes that QEMU supports (MAX_NODES),
|
|
|
1bdc94 |
while src/dst is an index up to that limit, so it should be
|
|
|
1bdc94 |
MAX_NODES - 1 in error message.
|
|
|
1bdc94 |
Make error message to explicitly state valid range for node
|
|
|
1bdc94 |
index to be more clear.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Message-Id: <1526483174-169008-1-git-send-email-imammedo@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 74f38e96b321ef8df2bf7fa1bd4f673ef06aca5b)
|
|
|
1bdc94 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
numa.c | 5 ++---
|
|
|
1bdc94 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/numa.c b/numa.c
|
|
|
1bdc94 |
index daf10d8..bb8f773 100644
|
|
|
1bdc94 |
--- a/numa.c
|
|
|
1bdc94 |
+++ b/numa.c
|
|
|
1bdc94 |
@@ -140,9 +140,8 @@ static void parse_numa_distance(NumaDistOptions *dist, Error **errp)
|
|
|
1bdc94 |
uint8_t val = dist->val;
|
|
|
1bdc94 |
|
|
|
1bdc94 |
if (src >= MAX_NODES || dst >= MAX_NODES) {
|
|
|
1bdc94 |
- error_setg(errp,
|
|
|
1bdc94 |
- "Invalid node %d, max possible could be %d",
|
|
|
1bdc94 |
- MAX(src, dst), MAX_NODES);
|
|
|
1bdc94 |
+ error_setg(errp, "Parameter '%s' expects an integer between 0 and %d",
|
|
|
1bdc94 |
+ src >= MAX_NODES ? "src" : "dst", MAX_NODES - 1);
|
|
|
1bdc94 |
return;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|