Message ID | 01981dd2-aa15-fbb1-f344-f1065fa06951@inria.fr (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hmat acpi: Don't require initiator value in -numa | expand |
On Thu, Jun 30, 2022 at 09:40:19AM +0200, Brice Goglin wrote: ... > > Before this patch, we had to add ",initiator=X" to "-numa node,nodeid=2,memdev=ram2". > The lstopo output difference between initiator=1 and no initiator is: > @@ -1,10 +1,10 @@ > Machine (2966MB total) + Package P#0 > + NUMANode P#2 (979MB) > Group0 > NUMANode P#0 (980MB) > Core P#0 + PU P#0 > Core P#1 + PU P#1 > Group0 > NUMANode P#1 (1007MB) > - NUMANode P#2 (979MB) > Core P#2 + PU P#2 > Core P#3 + PU P#3 > > Corresponding changes in the HMAT MPDA structure: > @@ -49,10 +49,10 @@ > [078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes] > [07Ah 0122 2] Reserved : 0000 > [07Ch 0124 4] Length : 00000028 > -[080h 0128 2] Flags (decoded below) : 0001 > - Processor Proximity Domain Valid : 1 > +[080h 0128 2] Flags (decoded below) : 0000 Including diff output like this is what is confusing mail processing tools. Just escape the diff in the output and this will make git happy. E.g.: The lstopo output difference between initiator=1 and no initiator is: | @@ -1,10 +1,10 @@ | Machine (2966MB total) + Package P#0 | + NUMANode P#2 (979MB) | Group0 | NUMANode P#0 (980MB) | Core P#0 + PU P#0 | Core P#1 + PU P#1 | Group0 | NUMANode P#1 (1007MB) | - NUMANode P#2 (979MB) | Core P#2 + PU P#2 | Core P#3 + PU P#3 | | Corresponding changes in the HMAT MPDA structure: | @@ -49,10 +49,10 @@ | [078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes] | [07Ah 0122 2] Reserved : 0000 | [07Ch 0124 4] Length : 00000028 | -[080h 0128 2] Flags (decoded below) : 0001 | - Processor Proximity Domain Valid : 1 | +[080h 0128 2] Flags (decoded below) : 0000
diff --git a/hw/core/machine.c b/hw/core/machine.c index a673302cce..d4d7e77401 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1173,9 +1173,7 @@ static void numa_validate_initiator(NumaState *numa_state) for (i = 0; i < numa_state->num_nodes; i++) { if (numa_info[i].initiator == MAX_NODES) { - error_report("The initiator of NUMA node %d is missing, use " - "'-numa node,initiator' option to declare it", i); - exit(1); + continue; } if (!numa_info[numa_info[i].initiator].present) {