aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bash-completion/lscpu3
-rw-r--r--misc-utils/lsclocks.1.adoc5
-rw-r--r--misc-utils/lsclocks.c2
-rw-r--r--sys-utils/lscpu.1.adoc14
-rw-r--r--sys-utils/lscpu.c49
-rw-r--r--sys-utils/lsmem.1.adoc5
-rw-r--r--sys-utils/lsmem.c2
-rw-r--r--tests/expected/lsmem/lsmem-s390-zvm-6g138
-rw-r--r--tests/expected/lsmem/lsmem-x86_64-16g416
-rwxr-xr-xtests/ts/lsmem/lsmem2
10 files changed, 375 insertions, 261 deletions
diff --git a/bash-completion/lscpu b/bash-completion/lscpu
index fc55a1922c..9cae8953b0 100644
--- a/bash-completion/lscpu
+++ b/bash-completion/lscpu
@@ -22,7 +22,7 @@ _lscpu_module()
COMPREPLY=( $(compgen -P "$prefix" -W "$OPTS" -S ',' -- $realcur) )
return 0
;;
- '-h'|'--help'|'-V'|'--version')
+ '-H'|'-h'|'--help'|'-V'|'--version')
return 0
;;
esac
@@ -41,6 +41,7 @@ _lscpu_module()
--physical
--output-all
--raw
+ --list-columns
--help
--version"
COMPREPLY=( $(compgen -W "${OPTS_ALL[*]}" -- $cur) )
diff --git a/misc-utils/lsclocks.1.adoc b/misc-utils/lsclocks.1.adoc
index fd9ca96df8..ebe0b13531 100644
--- a/misc-utils/lsclocks.1.adoc
+++ b/misc-utils/lsclocks.1.adoc
@@ -66,6 +66,11 @@ Can be specified multiple times.
Also display CPU clock of specified process.
Can be specified multiple times.
+== ENVIRONMENT
+
+LSCLOCKS_COLUMNS=::
+Specifies a comma-separated list of output columns to print. All columns listed in *OUTPUT COLUMNS* can be used.
+
include::man-common/help-version.adoc[]
== OUTPUT COLUMNS
diff --git a/misc-utils/lsclocks.c b/misc-utils/lsclocks.c
index aeecddec91..1d4f567bb3 100644
--- a/misc-utils/lsclocks.c
+++ b/misc-utils/lsclocks.c
@@ -667,6 +667,8 @@ int main(int argc, char **argv)
columns[ncolumns++] = COL_ISO_TIME;
}
+ if (!outarg)
+ outarg = getenv("LSCLOCKS_COLUMNS");
if (outarg && string_add_to_idarray(outarg, columns, ARRAY_SIZE(columns),
&ncolumns, column_name_to_id) < 0)
return EXIT_FAILURE;
diff --git a/sys-utils/lscpu.1.adoc b/sys-utils/lscpu.1.adoc
index c8694e767a..ce48b9ff45 100644
--- a/sys-utils/lscpu.1.adoc
+++ b/sys-utils/lscpu.1.adoc
@@ -104,11 +104,23 @@ Display physical IDs for all columns with topology elements (core, socket, etc.)
+
The CPU logical numbers are not affected by this option.
+== ENVIRONMENT
+
+LSCPU_COLUMNS=::
+Specifies a comma-separated list of output columns to print. All columns listed by *--list-columns* for the options *-e* and *-p* can be used.
+
+LSCPU_CACHES_COLUMNS=::
+Same as *LSCPU_COLUMNS* with the difference that columns only listed for the *-C* option can be used.
+
include::man-common/help-version.adoc[]
== COLUMNS
-A list of valid column labels can be viewed with the *--help* option.
+A list of valid column labels can be viewed with the *--list-columns* option.
+
+== NOTES
+
+The default output is subject to change. So whenever possible, you should avoid using default output in your scripts.
== BUGS
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 99799594e7..fe996ebf93 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -34,6 +34,7 @@
#include "optutils.h"
#include "c_strtod.h"
#include "sysfs.h"
+#include "column-list-table.h"
#include "lscpu.h"
@@ -1182,7 +1183,6 @@ static void print_summary(struct lscpu_cxt *cxt)
static void __attribute__((__noreturn__)) usage(void)
{
FILE *out = stdout;
- size_t i;
fputs(USAGE_HEADER, out);
fprintf(out, _(" %s [options]\n"), program_invocation_short_name);
@@ -1206,17 +1206,34 @@ static void __attribute__((__noreturn__)) usage(void)
fputs(_(" --hierarchic[=when] use subsections in summary (auto, never, always)\n"), out);
fputs(_(" --output-all print all available columns for -e, -p or -C\n"), out);
fputs(USAGE_SEPARATOR, out);
+ fputs(_(" -H, --list-columns list the available columns\n"), out);
fprintf(out, USAGE_HELP_OPTIONS(25));
- fputs(_("\nAvailable output columns for -e or -p:\n"), out);
- for (i = 0; i < ARRAY_SIZE(coldescs_cpu); i++)
- fprintf(out, " %13s %s\n", coldescs_cpu[i].name, _(coldescs_cpu[i].help));
+ fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));
- fputs(_("\nAvailable output columns for -C:\n"), out);
- for (i = 0; i < ARRAY_SIZE(coldescs_cache); i++)
- fprintf(out, " %13s %s\n", coldescs_cache[i].name, _(coldescs_cache[i].help));
+ exit(EXIT_SUCCESS);
+}
- fprintf(out, USAGE_MAN_TAIL("lscpu(1)"));
+static void __attribute__((__noreturn__)) list_columns(struct lscpu_cxt *cxt)
+{
+ struct libscols_table *col_tb = xcolumn_list_table_new("lscpu-columns", stdout, cxt->raw, cxt->json);
+ struct libscols_table *col_caches_tb = xcolumn_list_table_new("lscpu-caches-columns", stdout, cxt->raw, cxt->json);
+
+ fputs(_("Available output columns for -e or -p:\n"), stdout);
+ for (size_t i = 0; i < ARRAY_SIZE(coldescs_cpu); i++)
+ xcolumn_list_table_append_line(col_tb, coldescs_cpu[i].name,
+ coldescs_cpu[i].json_type, NULL,
+ _(coldescs_cpu[i].help));
+ scols_print_table(col_tb);
+ scols_unref_table(col_tb);
+
+ fputs(_("\nAvailable output columns for -C:\n"), stdout);
+ for (size_t i = 0; i < ARRAY_SIZE(coldescs_cache); i++)
+ xcolumn_list_table_append_line(col_caches_tb, coldescs_cache[i].name,
+ coldescs_cache[i].json_type, NULL,
+ _(coldescs_cache[i].help));
+ scols_print_table(col_caches_tb);
+ scols_unref_table(col_caches_tb);
exit(EXIT_SUCCESS);
}
@@ -1224,7 +1241,7 @@ static void __attribute__((__noreturn__)) usage(void)
int main(int argc, char *argv[])
{
struct lscpu_cxt *cxt;
- int c, all = 0;
+ int c, all = 0, collist = 0;
int columns[ARRAY_SIZE(coldescs_cpu)];
int cpu_modifier_specified = 0;
char *outarg = NULL;
@@ -1250,6 +1267,7 @@ int main(int argc, char *argv[])
{ "version", no_argument, NULL, 'V' },
{ "output-all", no_argument, NULL, OPT_OUTPUT_ALL },
{ "hierarchic", optional_argument, NULL, OPT_HIERARCHIC },
+ { "list-columns", no_argument, NULL, 'H' },
{ NULL, 0, NULL, 0 }
};
@@ -1267,7 +1285,7 @@ int main(int argc, char *argv[])
cxt = lscpu_new_context();
- while ((c = getopt_long(argc, argv, "aBbC::ce::hJp::rs:xyV", longopts, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "aBbC::ce::HhJp::rs:xyV", longopts, NULL)) != -1) {
err_exclusive_options(c, longopts, excl, excl_st);
@@ -1336,6 +1354,9 @@ int main(int argc, char *argv[])
} else
hierarchic = 1;
break;
+ case 'H':
+ collist = 1;
+ break;
case 'h':
usage();
case 'V':
@@ -1345,6 +1366,9 @@ int main(int argc, char *argv[])
}
}
+ if (collist)
+ list_columns(cxt);
+
if (all && ncolumns == 0) {
size_t maxsz = cxt->mode == LSCPU_OUTPUT_CACHES ?
ARRAY_SIZE(coldescs_cache) :
@@ -1395,6 +1419,11 @@ int main(int argc, char *argv[])
if (hierarchic == -1)
hierarchic = isatty(STDOUT_FILENO); /* default */
+ if (!outarg && (cxt->mode == LSCPU_OUTPUT_CACHES))
+ outarg = getenv("LSCPU_CACHES_COLUMNS");
+ if (!outarg && ((cxt->mode == LSCPU_OUTPUT_PARSABLE) || (cxt->mode == LSCPU_OUTPUT_READABLE)))
+ outarg = getenv("LSCPU_COLUMNS");
+
switch(cxt->mode) {
case LSCPU_OUTPUT_SUMMARY:
print_summary(cxt);
diff --git a/sys-utils/lsmem.1.adoc b/sys-utils/lsmem.1.adoc
index 337c8b4b75..d588051a81 100644
--- a/sys-utils/lsmem.1.adoc
+++ b/sys-utils/lsmem.1.adoc
@@ -65,6 +65,11 @@ This option controls summary lines output. The optional argument _when_ can be *
include::man-common/help-version.adoc[]
+== ENVIRONMENT
+
+LSMEM_COLUMNS=::
+Specifies a comma-separated list of output columns to print. All columns listed in *--help* can be used.
+
== AUTHORS
*lsmem* was originally written by Gerald Schaefer for s390-tools in Perl. The C version for util-linux was written by Clemens von Mann, Heiko Carstens and Karel Zak.
diff --git a/sys-utils/lsmem.c b/sys-utils/lsmem.c
index f36e2b1e30..39967bfc96 100644
--- a/sys-utils/lsmem.c
+++ b/sys-utils/lsmem.c
@@ -691,6 +691,8 @@ int main(int argc, char **argv)
add_column(columns, ncolumns++, COL_BLOCK);
}
+ if (!outarg)
+ outarg = getenv("LSMEM_COLUMNS");
if (outarg && string_add_to_idarray(outarg, columns, ARRAY_SIZE(columns),
&ncolumns, column_name_to_id) < 0)
return EXIT_FAILURE;
diff --git a/tests/expected/lsmem/lsmem-s390-zvm-6g b/tests/expected/lsmem/lsmem-s390-zvm-6g
index 9f4014aba9..ac576e1ab5 100644
--- a/tests/expected/lsmem/lsmem-s390-zvm-6g
+++ b/tests/expected/lsmem/lsmem-s390-zvm-6g
@@ -43,32 +43,32 @@ Total offline memory: 1.3G
---
-$ lsmem --all --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
-RANGE SIZE STATE REMOVABLE BLOCK NODE
-0x0000000000000000-0x000000000fffffff 256M online yes 0 0
-0x0000000010000000-0x000000001fffffff 256M online yes 1 0
-0x0000000020000000-0x000000002fffffff 256M online yes 2 0
-0x0000000030000000-0x000000003fffffff 256M online yes 3 0
-0x0000000040000000-0x000000004fffffff 256M online yes 4 0
-0x0000000050000000-0x000000005fffffff 256M online yes 5 0
-0x0000000060000000-0x000000006fffffff 256M online yes 6 0
-0x0000000070000000-0x000000007fffffff 256M online no 7 0
-0x0000000080000000-0x000000008fffffff 256M online yes 8 0
-0x0000000090000000-0x000000009fffffff 256M online yes 9 0
-0x00000000a0000000-0x00000000afffffff 256M online no 10 0
-0x00000000b0000000-0x00000000bfffffff 256M online no 11 0
-0x00000000c0000000-0x00000000cfffffff 256M online yes 12 0
-0x00000000d0000000-0x00000000dfffffff 256M online yes 13 0
-0x00000000e0000000-0x00000000efffffff 256M offline 14 0
-0x00000000f0000000-0x00000000ffffffff 256M online yes 15 0
-0x0000000100000000-0x000000010fffffff 256M online no 16 0
-0x0000000110000000-0x000000011fffffff 256M online no 17 0
-0x0000000120000000-0x000000012fffffff 256M online yes 18 0
-0x0000000130000000-0x000000013fffffff 256M online yes 19 0
-0x0000000140000000-0x000000014fffffff 256M offline 20 0
-0x0000000150000000-0x000000015fffffff 256M offline 21 0
-0x0000000160000000-0x000000016fffffff 256M offline 22 0
-0x0000000170000000-0x000000017fffffff 256M offline 23 0
+$ lsmem --all --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES
+RANGE SIZE STATE REMOVABLE BLOCK NODE ZONES
+0x0000000000000000-0x000000000fffffff 256M online yes 0 0 DMA
+0x0000000010000000-0x000000001fffffff 256M online yes 1 0 DMA
+0x0000000020000000-0x000000002fffffff 256M online yes 2 0 DMA
+0x0000000030000000-0x000000003fffffff 256M online yes 3 0 DMA
+0x0000000040000000-0x000000004fffffff 256M online yes 4 0 DMA
+0x0000000050000000-0x000000005fffffff 256M online yes 5 0 DMA
+0x0000000060000000-0x000000006fffffff 256M online yes 6 0 DMA
+0x0000000070000000-0x000000007fffffff 256M online no 7 0 DMA/Normal
+0x0000000080000000-0x000000008fffffff 256M online yes 8 0 Normal
+0x0000000090000000-0x000000009fffffff 256M online yes 9 0 Normal
+0x00000000a0000000-0x00000000afffffff 256M online no 10 0 Normal
+0x00000000b0000000-0x00000000bfffffff 256M online no 11 0 Normal
+0x00000000c0000000-0x00000000cfffffff 256M online yes 12 0 Normal
+0x00000000d0000000-0x00000000dfffffff 256M online yes 13 0 Normal
+0x00000000e0000000-0x00000000efffffff 256M offline 14 0 Normal
+0x00000000f0000000-0x00000000ffffffff 256M online yes 15 0 Normal
+0x0000000100000000-0x000000010fffffff 256M online no 16 0 Normal
+0x0000000110000000-0x000000011fffffff 256M online no 17 0 Normal/Movable
+0x0000000120000000-0x000000012fffffff 256M online yes 18 0 Movable/Normal
+0x0000000130000000-0x000000013fffffff 256M online yes 19 0 Movable
+0x0000000140000000-0x000000014fffffff 256M offline 20 0 Movable
+0x0000000150000000-0x000000015fffffff 256M offline 21 0 Movable
+0x0000000160000000-0x000000016fffffff 256M offline 22 0 Movable
+0x0000000170000000-0x000000017fffffff 256M offline 23 0 Movable
Memory block size: 256M
Total online memory: 4.8G
@@ -76,22 +76,24 @@ Total offline memory: 1.3G
---
-$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
-RANGE SIZE STATE REMOVABLE BLOCK NODE
-0x0000000000000000-0x000000006fffffff 1.8G online yes 0-6 0
-0x0000000070000000-0x000000007fffffff 256M online no 7 0
-0x0000000080000000-0x000000009fffffff 512M online yes 8-9 0
-0x00000000a0000000-0x00000000bfffffff 512M online no 10-11 0
-0x00000000c0000000-0x00000000dfffffff 512M online yes 12-13 0
-0x00000000e0000000-0x00000000efffffff 256M offline 14 0
-0x00000000f0000000-0x00000000ffffffff 256M online yes 15 0
-0x0000000100000000-0x000000011fffffff 512M online no 16-17 0
-0x0000000120000000-0x000000013fffffff 512M online yes 18-19 0
-0x0000000140000000-0x000000017fffffff 1G offline 20-23 0
+$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES
+RANGE SIZE STATE REMOVABLE BLOCK NODE ZONES
+0x0000000000000000-0x000000006fffffff 1.8G online yes 0-6 0 DMA
+0x0000000070000000-0x000000007fffffff 256M online no 7 0 DMA/Normal
+0x0000000080000000-0x000000009fffffff 512M online yes 8-9 0 Normal
+0x00000000a0000000-0x00000000bfffffff 512M online no 10-11 0 Normal
+0x00000000c0000000-0x00000000dfffffff 512M online yes 12-13 0 Normal
+0x00000000e0000000-0x00000000efffffff 256M offline 14 0 Normal
+0x00000000f0000000-0x00000000ffffffff 256M online yes 15 0 Normal
+0x0000000100000000-0x000000010fffffff 256M online no 16 0 Normal
+0x0000000110000000-0x000000011fffffff 256M online no 17 0 Normal/Movable
+0x0000000120000000-0x000000012fffffff 256M online yes 18 0 Movable/Normal
+0x0000000130000000-0x000000013fffffff 256M online yes 19 0 Movable
+0x0000000140000000-0x000000017fffffff 1G offline 20-23 0 Movable
---
-$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES
{
"memory": [
{
@@ -100,70 +102,96 @@ $ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE
"state": "online",
"removable": true,
"block": "0-6",
- "node": 0
+ "node": 0,
+ "zones": "DMA"
},{
"range": "0x0000000070000000-0x000000007fffffff",
"size": "256M",
"state": "online",
"removable": false,
"block": "7",
- "node": 0
+ "node": 0,
+ "zones": "DMA/Normal"
},{
"range": "0x0000000080000000-0x000000009fffffff",
"size": "512M",
"state": "online",
"removable": true,
"block": "8-9",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000000a0000000-0x00000000bfffffff",
"size": "512M",
"state": "online",
"removable": false,
"block": "10-11",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000000c0000000-0x00000000dfffffff",
"size": "512M",
"state": "online",
"removable": true,
"block": "12-13",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000000e0000000-0x00000000efffffff",
"size": "256M",
"state": "offline",
"removable": false,
"block": "14",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000000f0000000-0x00000000ffffffff",
"size": "256M",
"state": "online",
"removable": true,
"block": "15",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
- "range": "0x0000000100000000-0x000000011fffffff",
- "size": "512M",
+ "range": "0x0000000100000000-0x000000010fffffff",
+ "size": "256M",
"state": "online",
"removable": false,
- "block": "16-17",
- "node": 0
+ "block": "16",
+ "node": 0,
+ "zones": "Normal"
},{
- "range": "0x0000000120000000-0x000000013fffffff",
- "size": "512M",
+ "range": "0x0000000110000000-0x000000011fffffff",
+ "size": "256M",
+ "state": "online",
+ "removable": false,
+ "block": "17",
+ "node": 0,
+ "zones": "Normal/Movable"
+ },{
+ "range": "0x0000000120000000-0x000000012fffffff",
+ "size": "256M",
+ "state": "online",
+ "removable": true,
+ "block": "18",
+ "node": 0,
+ "zones": "Movable/Normal"
+ },{
+ "range": "0x0000000130000000-0x000000013fffffff",
+ "size": "256M",
"state": "online",
"removable": true,
- "block": "18-19",
- "node": 0
+ "block": "19",
+ "node": 0,
+ "zones": "Movable"
},{
"range": "0x0000000140000000-0x000000017fffffff",
"size": "1G",
"state": "offline",
"removable": false,
"block": "20-23",
- "node": 0
+ "node": 0,
+ "zones": "Movable"
}
]
}
diff --git a/tests/expected/lsmem/lsmem-x86_64-16g b/tests/expected/lsmem/lsmem-x86_64-16g
index 7c39f3ae4c..663a8fe1da 100644
--- a/tests/expected/lsmem/lsmem-x86_64-16g
+++ b/tests/expected/lsmem/lsmem-x86_64-16g
@@ -62,136 +62,136 @@ Total offline memory: 0B
---
-$ lsmem --all --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
-RANGE SIZE STATE REMOVABLE BLOCK NODE
-0x0000000000000000-0x0000000007ffffff 128M online no 0 0
-0x0000000008000000-0x000000000fffffff 128M online yes 1 0
-0x0000000010000000-0x0000000017ffffff 128M online yes 2 0
-0x0000000018000000-0x000000001fffffff 128M online yes 3 0
-0x0000000020000000-0x0000000027ffffff 128M online yes 4 0
-0x0000000028000000-0x000000002fffffff 128M online yes 5 0
-0x0000000030000000-0x0000000037ffffff 128M online yes 6 0
-0x0000000038000000-0x000000003fffffff 128M online no 7 0
-0x0000000040000000-0x0000000047ffffff 128M online yes 8 0
-0x0000000048000000-0x000000004fffffff 128M online yes 9 0
-0x0000000050000000-0x0000000057ffffff 128M online yes 10 0
-0x0000000058000000-0x000000005fffffff 128M online yes 11 0
-0x0000000060000000-0x0000000067ffffff 128M online yes 12 0
-0x0000000068000000-0x000000006fffffff 128M online yes 13 0
-0x0000000070000000-0x0000000077ffffff 128M online yes 14 0
-0x0000000078000000-0x000000007fffffff 128M online no 15 0
-0x0000000080000000-0x0000000087ffffff 128M online yes 16 0
-0x0000000088000000-0x000000008fffffff 128M online yes 17 0
-0x0000000090000000-0x0000000097ffffff 128M online yes 18 0
-0x0000000098000000-0x000000009fffffff 128M online yes 19 0
-0x00000000a0000000-0x00000000a7ffffff 128M online yes 20 0
-0x00000000a8000000-0x00000000afffffff 128M online yes 21 0
-0x00000000b0000000-0x00000000b7ffffff 128M online no 22 0
-0x00000000b8000000-0x00000000bfffffff 128M online no 23 0
-0x0000000100000000-0x0000000107ffffff 128M online no 32 0
-0x0000000108000000-0x000000010fffffff 128M online no 33 0
-0x0000000110000000-0x0000000117ffffff 128M online no 34 0
-0x0000000118000000-0x000000011fffffff 128M online no 35 0
-0x0000000120000000-0x0000000127ffffff 128M online no 36 0
-0x0000000128000000-0x000000012fffffff 128M online no 37 0
-0x0000000130000000-0x0000000137ffffff 128M online no 38 0
-0x0000000138000000-0x000000013fffffff 128M online no 39 0
-0x0000000140000000-0x0000000147ffffff 128M online no 40 0
-0x0000000148000000-0x000000014fffffff 128M online no 41 0
-0x0000000150000000-0x0000000157ffffff 128M online no 42 0
-0x0000000158000000-0x000000015fffffff 128M online no 43 0
-0x0000000160000000-0x0000000167ffffff 128M online no 44 0
-0x0000000168000000-0x000000016fffffff 128M online no 45 0
-0x0000000170000000-0x0000000177ffffff 128M online no 46 0
-0x0000000178000000-0x000000017fffffff 128M online no 47 0
-0x0000000180000000-0x0000000187ffffff 128M online no 48 0
-0x0000000188000000-0x000000018fffffff 128M online no 49 0
-0x0000000190000000-0x0000000197ffffff 128M online no 50 0
-0x0000000198000000-0x000000019fffffff 128M online no 51 0
-0x00000001a0000000-0x00000001a7ffffff 128M online no 52 0
-0x00000001a8000000-0x00000001afffffff 128M online yes 53 0
-0x00000001b0000000-0x00000001b7ffffff 128M online no 54 0
-0x00000001b8000000-0x00000001bfffffff 128M online no 55 0
-0x00000001c0000000-0x00000001c7ffffff 128M online yes 56 0
-0x00000001c8000000-0x00000001cfffffff 128M online yes 57 0
-0x00000001d0000000-0x00000001d7ffffff 128M online yes 58 0
-0x00000001d8000000-0x00000001dfffffff 128M online yes 59 0
-0x00000001e0000000-0x00000001e7ffffff 128M online yes 60 0
-0x00000001e8000000-0x00000001efffffff 128M online yes 61 0
-0x00000001f0000000-0x00000001f7ffffff 128M online yes 62 0
-0x00000001f8000000-0x00000001ffffffff 128M online yes 63 0
-0x0000000200000000-0x0000000207ffffff 128M online no 64 0
-0x0000000208000000-0x000000020fffffff 128M online yes 65 0
-0x0000000210000000-0x0000000217ffffff 128M online yes 66 0
-0x0000000218000000-0x000000021fffffff 128M online yes 67 0
-0x0000000220000000-0x0000000227ffffff 128M online no 68 0
-0x0000000228000000-0x000000022fffffff 128M online no 69 0
-0x0000000230000000-0x0000000237ffffff 128M online no 70 0
-0x0000000238000000-0x000000023fffffff 128M online yes 71 0
-0x0000000240000000-0x0000000247ffffff 128M online yes 72 0
-0x0000000248000000-0x000000024fffffff 128M online yes 73 0
-0x0000000250000000-0x0000000257ffffff 128M online yes 74 0
-0x0000000258000000-0x000000025fffffff 128M online yes 75 0
-0x0000000260000000-0x0000000267ffffff 128M online yes 76 0
-0x0000000268000000-0x000000026fffffff 128M online yes 77 0
-0x0000000270000000-0x0000000277ffffff 128M online yes 78 0
-0x0000000278000000-0x000000027fffffff 128M online no 79 0
-0x0000000280000000-0x0000000287ffffff 128M online no 80 0
-0x0000000288000000-0x000000028fffffff 128M online no 81 0
-0x0000000290000000-0x0000000297ffffff 128M online yes 82 0
-0x0000000298000000-0x000000029fffffff 128M online no 83 0
-0x00000002a0000000-0x00000002a7ffffff 128M online no 84 0
-0x00000002a8000000-0x00000002afffffff 128M online yes 85 0
-0x00000002b0000000-0x00000002b7ffffff 128M online yes 86 0
-0x00000002b8000000-0x00000002bfffffff 128M online yes 87 0
-0x00000002c0000000-0x00000002c7ffffff 128M online yes 88 0
-0x00000002c8000000-0x00000002cfffffff 128M online no 89 0
-0x00000002d0000000-0x00000002d7ffffff 128M online no 90 0
-0x00000002d8000000-0x00000002dfffffff 128M online no 91 0
-0x00000002e0000000-0x00000002e7ffffff 128M online yes 92 0
-0x00000002e8000000-0x00000002efffffff 128M online yes 93 0
-0x00000002f0000000-0x00000002f7ffffff 128M online no 94 0
-0x00000002f8000000-0x00000002ffffffff 128M online no 95 0
-0x0000000300000000-0x0000000307ffffff 128M online no 96 0
-0x0000000308000000-0x000000030fffffff 128M online no 97 0
-0x0000000310000000-0x0000000317ffffff 128M online no 98 0
-0x0000000318000000-0x000000031fffffff 128M online no 99 0
-0x0000000320000000-0x0000000327ffffff 128M online no 100 0
-0x0000000328000000-0x000000032fffffff 128M online no 101 0
-0x0000000330000000-0x0000000337ffffff 128M online no 102 0
-0x0000000338000000-0x000000033fffffff 128M online no 103 0
-0x0000000340000000-0x0000000347ffffff 128M online no 104 0
-0x0000000348000000-0x000000034fffffff 128M online no 105 0
-0x0000000350000000-0x0000000357ffffff 128M online yes 106 0
-0x0000000358000000-0x000000035fffffff 128M online no 107 0
-0x0000000360000000-0x0000000367ffffff 128M online no 108 0
-0x0000000368000000-0x000000036fffffff 128M online no 109 0
-0x0000000370000000-0x0000000377ffffff 128M online yes 110 0
-0x0000000378000000-0x000000037fffffff 128M online no 111 0
-0x0000000380000000-0x0000000387ffffff 128M online no 112 0
-0x0000000388000000-0x000000038fffffff 128M online no 113 0
-0x0000000390000000-0x0000000397ffffff 128M online no 114 0
-0x0000000398000000-0x000000039fffffff 128M online no 115 0
-0x00000003a0000000-0x00000003a7ffffff 128M online no 116 0
-0x00000003a8000000-0x00000003afffffff 128M online no 117 0
-0x00000003b0000000-0x00000003b7ffffff 128M online no 118 0
-0x00000003b8000000-0x00000003bfffffff 128M online no 119 0
-0x00000003c0000000-0x00000003c7ffffff 128M online no 120 0
-0x00000003c8000000-0x00000003cfffffff 128M online yes 121 0
-0x00000003d0000000-0x00000003d7ffffff 128M online yes 122 0
-0x00000003d8000000-0x00000003dfffffff 128M online yes 123 0
-0x00000003e0000000-0x00000003e7ffffff 128M online yes 124 0
-0x00000003e8000000-0x00000003efffffff 128M online no 125 0
-0x00000003f0000000-0x00000003f7ffffff 128M online no 126 0
-0x00000003f8000000-0x00000003ffffffff 128M online no 127 0
-0x0000000400000000-0x0000000407ffffff 128M online no 128 0
-0x0000000408000000-0x000000040fffffff 128M online no 129 0
-0x0000000410000000-0x0000000417ffffff 128M online no 130 0
-0x0000000418000000-0x000000041fffffff 128M online no 131 0
-0x0000000420000000-0x0000000427ffffff 128M online no 132 0
-0x0000000428000000-0x000000042fffffff 128M online no 133 0
-0x0000000430000000-0x0000000437ffffff 128M online yes 134 0
-0x0000000438000000-0x000000043fffffff 128M online no 135 0
+$ lsmem --all --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES
+RANGE SIZE STATE REMOVABLE BLOCK NODE ZONES
+0x0000000000000000-0x0000000007ffffff 128M online no 0 0 None
+0x0000000008000000-0x000000000fffffff 128M online yes 1 0 DMA32
+0x0000000010000000-0x0000000017ffffff 128M online yes 2 0 DMA32
+0x0000000018000000-0x000000001fffffff 128M online yes 3 0 DMA32
+0x0000000020000000-0x0000000027ffffff 128M online yes 4 0 DMA32
+0x0000000028000000-0x000000002fffffff 128M online yes 5 0 DMA32
+0x0000000030000000-0x0000000037ffffff 128M online yes 6 0 DMA32
+0x0000000038000000-0x000000003fffffff 128M online no 7 0 DMA32
+0x0000000040000000-0x0000000047ffffff 128M online yes 8 0 DMA32
+0x0000000048000000-0x000000004fffffff 128M online yes 9 0 DMA32
+0x0000000050000000-0x0000000057ffffff 128M online yes 10 0 DMA32
+0x0000000058000000-0x000000005fffffff 128M online yes 11 0 DMA32
+0x0000000060000000-0x0000000067ffffff 128M online yes 12 0 DMA32
+0x0000000068000000-0x000000006fffffff 128M online yes 13 0 DMA32
+0x0000000070000000-0x0000000077ffffff 128M online yes 14 0 DMA32
+0x0000000078000000-0x000000007fffffff 128M online no 15 0 DMA32
+0x0000000080000000-0x0000000087ffffff 128M online yes 16 0 DMA32
+0x0000000088000000-0x000000008fffffff 128M online yes 17 0 DMA32
+0x0000000090000000-0x0000000097ffffff 128M online yes 18 0 DMA32
+0x0000000098000000-0x000000009fffffff 128M online yes 19 0 DMA32
+0x00000000a0000000-0x00000000a7ffffff 128M online yes 20 0 DMA32
+0x00000000a8000000-0x00000000afffffff 128M online yes 21 0 DMA32
+0x00000000b0000000-0x00000000b7ffffff 128M online no 22 0 DMA32
+0x00000000b8000000-0x00000000bfffffff 128M online no 23 0 DMA32
+0x0000000100000000-0x0000000107ffffff 128M online no 32 0 Normal
+0x0000000108000000-0x000000010fffffff 128M online no 33 0 Normal
+0x0000000110000000-0x0000000117ffffff 128M online no 34 0 Normal
+0x0000000118000000-0x000000011fffffff 128M online no 35 0 Normal
+0x0000000120000000-0x0000000127ffffff 128M online no 36 0 Normal
+0x0000000128000000-0x000000012fffffff 128M online no 37 0 Normal
+0x0000000130000000-0x0000000137ffffff 128M online no 38 0 Normal
+0x0000000138000000-0x000000013fffffff 128M online no 39 0 Normal
+0x0000000140000000-0x0000000147ffffff 128M online no 40 0 Normal
+0x0000000148000000-0x000000014fffffff 128M online no 41 0 Normal
+0x0000000150000000-0x0000000157ffffff 128M online no 42 0 Normal
+0x0000000158000000-0x000000015fffffff 128M online no 43 0 Normal
+0x0000000160000000-0x0000000167ffffff 128M online no 44 0 Normal
+0x0000000168000000-0x000000016fffffff 128M online no 45 0 Normal
+0x0000000170000000-0x0000000177ffffff 128M online no 46 0 Normal
+0x0000000178000000-0x000000017fffffff 128M online no 47 0 Normal
+0x0000000180000000-0x0000000187ffffff 128M online no 48 0 Normal
+0x0000000188000000-0x000000018fffffff 128M online no 49 0 Normal
+0x0000000190000000-0x0000000197ffffff 128M online no 50 0 Normal
+0x0000000198000000-0x000000019fffffff 128M online no 51 0 Normal
+0x00000001a0000000-0x00000001a7ffffff 128M online no 52 0 Normal
+0x00000001a8000000-0x00000001afffffff 128M online yes 53 0 Normal
+0x00000001b0000000-0x00000001b7ffffff 128M online no 54 0 Normal
+0x00000001b8000000-0x00000001bfffffff 128M online no 55 0 Normal
+0x00000001c0000000-0x00000001c7ffffff 128M online yes 56 0 Normal
+0x00000001c8000000-0x00000001cfffffff 128M online yes 57 0 Normal
+0x00000001d0000000-0x00000001d7ffffff 128M online yes 58 0 Normal
+0x00000001d8000000-0x00000001dfffffff 128M online yes 59 0 Normal
+0x00000001e0000000-0x00000001e7ffffff 128M online yes 60 0 Normal
+0x00000001e8000000-0x00000001efffffff 128M online yes 61 0 Normal
+0x00000001f0000000-0x00000001f7ffffff 128M online yes 62 0 Normal
+0x00000001f8000000-0x00000001ffffffff 128M online yes 63 0 Normal
+0x0000000200000000-0x0000000207ffffff 128M online no 64 0 Normal
+0x0000000208000000-0x000000020fffffff 128M online yes 65 0 Normal
+0x0000000210000000-0x0000000217ffffff 128M online yes 66 0 Normal
+0x0000000218000000-0x000000021fffffff 128M online yes 67 0 Normal
+0x0000000220000000-0x0000000227ffffff 128M online no 68 0 Normal
+0x0000000228000000-0x000000022fffffff 128M online no 69 0 Normal
+0x0000000230000000-0x0000000237ffffff 128M online no 70 0 Normal
+0x0000000238000000-0x000000023fffffff 128M online yes 71 0 Normal
+0x0000000240000000-0x0000000247ffffff 128M online yes 72 0 Normal
+0x0000000248000000-0x000000024fffffff 128M online yes 73 0 Normal
+0x0000000250000000-0x0000000257ffffff 128M online yes 74 0 Normal
+0x0000000258000000-0x000000025fffffff 128M online yes 75 0 Normal
+0x0000000260000000-0x0000000267ffffff 128M online yes 76 0 Normal
+0x0000000268000000-0x000000026fffffff 128M online yes 77 0 Normal
+0x0000000270000000-0x0000000277ffffff 128M online yes 78 0 Normal
+0x0000000278000000-0x000000027fffffff 128M online no 79 0 Normal
+0x0000000280000000-0x0000000287ffffff 128M online no 80 0 Normal
+0x0000000288000000-0x000000028fffffff 128M online no 81 0 Normal
+0x0000000290000000-0x0000000297ffffff 128M online yes 82 0 Normal
+0x0000000298000000-0x000000029fffffff 128M online no 83 0 Normal
+0x00000002a0000000-0x00000002a7ffffff 128M online no 84 0 Normal
+0x00000002a8000000-0x00000002afffffff 128M online yes 85 0 Normal
+0x00000002b0000000-0x00000002b7ffffff 128M online yes 86 0 Normal
+0x00000002b8000000-0x00000002bfffffff 128M online yes 87 0 Normal
+0x00000002c0000000-0x00000002c7ffffff 128M online yes 88 0 Normal
+0x00000002c8000000-0x00000002cfffffff 128M online no 89 0 Normal
+0x00000002d0000000-0x00000002d7ffffff 128M online no 90 0 Normal
+0x00000002d8000000-0x00000002dfffffff 128M online no 91 0 Normal
+0x00000002e0000000-0x00000002e7ffffff 128M online yes 92 0 Normal
+0x00000002e8000000-0x00000002efffffff 128M online yes 93 0 Normal
+0x00000002f0000000-0x00000002f7ffffff 128M online no 94 0 Normal
+0x00000002f8000000-0x00000002ffffffff 128M online no 95 0 Normal
+0x0000000300000000-0x0000000307ffffff 128M online no 96 0 Normal
+0x0000000308000000-0x000000030fffffff 128M online no 97 0 Normal
+0x0000000310000000-0x0000000317ffffff 128M online no 98 0 Normal
+0x0000000318000000-0x000000031fffffff 128M online no 99 0 Normal
+0x0000000320000000-0x0000000327ffffff 128M online no 100 0 Normal
+0x0000000328000000-0x000000032fffffff 128M online no 101 0 Normal
+0x0000000330000000-0x0000000337ffffff 128M online no 102 0 Normal
+0x0000000338000000-0x000000033fffffff 128M online no 103 0 Normal
+0x0000000340000000-0x0000000347ffffff 128M online no 104 0 Normal
+0x0000000348000000-0x000000034fffffff 128M online no 105 0 Normal
+0x0000000350000000-0x0000000357ffffff 128M online yes 106 0 Normal
+0x0000000358000000-0x000000035fffffff 128M online no 107 0 Normal
+0x0000000360000000-0x0000000367ffffff 128M online no 108 0 Normal
+0x0000000368000000-0x000000036fffffff 128M online no 109 0 Normal
+0x0000000370000000-0x0000000377ffffff 128M online yes 110 0 Normal
+0x0000000378000000-0x000000037fffffff 128M online no 111 0 Normal
+0x0000000380000000-0x0000000387ffffff 128M online no 112 0 Normal
+0x0000000388000000-0x000000038fffffff 128M online no 113 0 Normal
+0x0000000390000000-0x0000000397ffffff 128M online no 114 0 Normal
+0x0000000398000000-0x000000039fffffff 128M online no 115 0 Normal
+0x00000003a0000000-0x00000003a7ffffff 128M online no 116 0 Normal
+0x00000003a8000000-0x00000003afffffff 128M online no 117 0 Normal
+0x00000003b0000000-0x00000003b7ffffff 128M online no 118 0 Normal
+0x00000003b8000000-0x00000003bfffffff 128M online no 119 0 Normal
+0x00000003c0000000-0x00000003c7ffffff 128M online no 120 0 Normal
+0x00000003c8000000-0x00000003cfffffff 128M online yes 121 0 Normal
+0x00000003d0000000-0x00000003d7ffffff 128M online yes 122 0 Normal
+0x00000003d8000000-0x00000003dfffffff 128M online yes 123 0 Normal
+0x00000003e0000000-0x00000003e7ffffff 128M online yes 124 0 Normal
+0x00000003e8000000-0x00000003efffffff 128M online no 125 0 Normal
+0x00000003f0000000-0x00000003f7ffffff 128M online no 126 0 Normal
+0x00000003f8000000-0x00000003ffffffff 128M online no 127 0 Normal
+0x0000000400000000-0x0000000407ffffff 128M online no 128 0 Normal
+0x0000000408000000-0x000000040fffffff 128M online no 129 0 Normal
+0x0000000410000000-0x0000000417ffffff 128M online no 130 0 Normal
+0x0000000418000000-0x000000041fffffff 128M online no 131 0 Normal
+0x0000000420000000-0x0000000427ffffff 128M online no 132 0 Normal
+0x0000000428000000-0x000000042fffffff 128M online no 133 0 Normal
+0x0000000430000000-0x0000000437ffffff 128M online yes 134 0 Normal
+0x0000000438000000-0x000000043fffffff 128M online no 135 0 None
Memory block size: 128M
Total online memory: 16G
@@ -199,42 +199,42 @@ Total offline memory: 0B
---
-$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
-RANGE SIZE STATE REMOVABLE BLOCK NODE
-0x0000000000000000-0x0000000007ffffff 128M online no 0 0
-0x0000000008000000-0x0000000037ffffff 768M online yes 1-6 0
-0x0000000038000000-0x000000003fffffff 128M online no 7 0
-0x0000000040000000-0x0000000077ffffff 896M online yes 8-14 0
-0x0000000078000000-0x000000007fffffff 128M online no 15 0
-0x0000000080000000-0x00000000afffffff 768M online yes 16-21 0
-0x00000000b0000000-0x00000000bfffffff 256M online no 22-23 0
-0x0000000100000000-0x00000001a7ffffff 2.6G online no 32-52 0
-0x00000001a8000000-0x00000001afffffff 128M online yes 53 0
-0x00000001b0000000-0x00000001bfffffff 256M online no 54-55 0
-0x00000001c0000000-0x00000001ffffffff 1G online yes 56-63 0
-0x0000000200000000-0x0000000207ffffff 128M online no 64 0
-0x0000000208000000-0x000000021fffffff 384M online yes 65-67 0
-0x0000000220000000-0x0000000237ffffff 384M online no 68-70 0
-0x0000000238000000-0x0000000277ffffff 1G online yes 71-78 0
-0x0000000278000000-0x000000028fffffff 384M online no 79-81 0
-0x0000000290000000-0x0000000297ffffff 128M online yes 82 0
-0x0000000298000000-0x00000002a7ffffff 256M online no 83-84 0
-0x00000002a8000000-0x00000002c7ffffff 512M online yes 85-88 0
-0x00000002c8000000-0x00000002dfffffff 384M online no 89-91 0
-0x00000002e0000000-0x00000002efffffff 256M online yes 92-93 0
-0x00000002f0000000-0x000000034fffffff 1.5G online no 94-105 0
-0x0000000350000000-0x0000000357ffffff 128M online yes 106 0
-0x0000000358000000-0x000000036fffffff 384M online no 107-109 0
-0x0000000370000000-0x0000000377ffffff 128M online yes 110 0
-0x0000000378000000-0x00000003c7ffffff 1.3G online no 111-120 0
-0x00000003c8000000-0x00000003e7ffffff 512M online yes 121-124 0
-0x00000003e8000000-0x000000042fffffff 1.1G online no 125-133 0
-0x0000000430000000-0x0000000437ffffff 128M online yes 134 0
-0x0000000438000000-0x000000043fffffff 128M online no 135 0
+$ lsmem --raw --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES
+RANGE SIZE STATE REMOVABLE BLOCK NODE ZONES
+0x0000000000000000-0x0000000007ffffff 128M online no 0 0 None
+0x0000000008000000-0x0000000037ffffff 768M online yes 1-6 0 DMA32
+0x0000000038000000-0x000000003fffffff 128M online no 7 0 DMA32
+0x0000000040000000-0x0000000077ffffff 896M online yes 8-14 0 DMA32
+0x0000000078000000-0x000000007fffffff 128M online no 15 0 DMA32
+0x0000000080000000-0x00000000afffffff 768M online yes 16-21 0 DMA32
+0x00000000b0000000-0x00000000bfffffff 256M online no 22-23 0 DMA32
+0x0000000100000000-0x00000001a7ffffff 2.6G online no 32-52 0 Normal
+0x00000001a8000000-0x00000001afffffff 128M online yes 53 0 Normal
+0x00000001b0000000-0x00000001bfffffff 256M online no 54-55 0 Normal
+0x00000001c0000000-0x00000001ffffffff 1G online yes 56-63 0 Normal
+0x0000000200000000-0x0000000207ffffff 128M online no 64 0 Normal
+0x0000000208000000-0x000000021fffffff 384M online yes 65-67 0 Normal
+0x0000000220000000-0x0000000237ffffff 384M online no 68-70 0 Normal
+0x0000000238000000-0x0000000277ffffff 1G online yes 71-78 0 Normal
+0x0000000278000000-0x000000028fffffff 384M online no 79-81 0 Normal
+0x0000000290000000-0x0000000297ffffff 128M online yes 82 0 Normal
+0x0000000298000000-0x00000002a7ffffff 256M online no 83-84 0 Normal
+0x00000002a8000000-0x00000002c7ffffff 512M online yes 85-88 0 Normal
+0x00000002c8000000-0x00000002dfffffff 384M online no 89-91 0 Normal
+0x00000002e0000000-0x00000002efffffff 256M online yes 92-93 0 Normal
+0x00000002f0000000-0x000000034fffffff 1.5G online no 94-105 0 Normal
+0x0000000350000000-0x0000000357ffffff 128M online yes 106 0 Normal
+0x0000000358000000-0x000000036fffffff 384M online no 107-109 0 Normal
+0x0000000370000000-0x0000000377ffffff 128M online yes 110 0 Normal
+0x0000000378000000-0x00000003c7ffffff 1.3G online no 111-120 0 Normal
+0x00000003c8000000-0x00000003e7ffffff 512M online yes 121-124 0 Normal
+0x00000003e8000000-0x000000042fffffff 1.1G online no 125-133 0 Normal
+0x0000000430000000-0x0000000437ffffff 128M online yes 134 0 Normal
+0x0000000438000000-0x000000043fffffff 128M online no 135 0 None
---
-$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE
+$ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES --split RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES
{
"memory": [
{
@@ -243,210 +243,240 @@ $ lsmem --json --output RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE --split RANGE,SIZE
"state": "online",
"removable": false,
"block": "0",
- "node": 0
+ "node": 0,
+ "zones": "None"
},{
"range": "0x0000000008000000-0x0000000037ffffff",
"size": "768M",
"state": "online",
"removable": true,
"block": "1-6",
- "node": 0
+ "node": 0,
+ "zones": "DMA32"
},{
"range": "0x0000000038000000-0x000000003fffffff",
"size": "128M",
"state": "online",
"removable": false,
"block": "7",
- "node": 0
+ "node": 0,
+ "zones": "DMA32"
},{
"range": "0x0000000040000000-0x0000000077ffffff",
"size": "896M",
"state": "online",
"removable": true,
"block": "8-14",
- "node": 0
+ "node": 0,
+ "zones": "DMA32"
},{
"range": "0x0000000078000000-0x000000007fffffff",
"size": "128M",
"state": "online",
"removable": false,
"block": "15",
- "node": 0
+ "node": 0,
+ "zones": "DMA32"
},{
"range": "0x0000000080000000-0x00000000afffffff",
"size": "768M",
"state": "online",
"removable": true,
"block": "16-21",
- "node": 0
+ "node": 0,
+ "zones": "DMA32"
},{
"range": "0x00000000b0000000-0x00000000bfffffff",
"size": "256M",
"state": "online",
"removable": false,
"block": "22-23",
- "node": 0
+ "node": 0,
+ "zones": "DMA32"
},{
"range": "0x0000000100000000-0x00000001a7ffffff",
"size": "2.6G",
"state": "online",
"removable": false,
"block": "32-52",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000001a8000000-0x00000001afffffff",
"size": "128M",
"state": "online",
"removable": true,
"block": "53",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000001b0000000-0x00000001bfffffff",
"size": "256M",
"state": "online",
"removable": false,
"block": "54-55",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000001c0000000-0x00000001ffffffff",
"size": "1G",
"state": "online",
"removable": true,
"block": "56-63",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000200000000-0x0000000207ffffff",
"size": "128M",
"state": "online",
"removable": false,
"block": "64",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000208000000-0x000000021fffffff",
"size": "384M",
"state": "online",
"removable": true,
"block": "65-67",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000220000000-0x0000000237ffffff",
"size": "384M",
"state": "online",
"removable": false,
"block": "68-70",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000238000000-0x0000000277ffffff",
"size": "1G",
"state": "online",
"removable": true,
"block": "71-78",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000278000000-0x000000028fffffff",
"size": "384M",
"state": "online",
"removable": false,
"block": "79-81",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000290000000-0x0000000297ffffff",
"size": "128M",
"state": "online",
"removable": true,
"block": "82",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000298000000-0x00000002a7ffffff",
"size": "256M",
"state": "online",
"removable": false,
"block": "83-84",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000002a8000000-0x00000002c7ffffff",
"size": "512M",
"state": "online",
"removable": true,
"block": "85-88",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000002c8000000-0x00000002dfffffff",
"size": "384M",
"state": "online",
"removable": false,
"block": "89-91",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000002e0000000-0x00000002efffffff",
"size": "256M",
"state": "online",
"removable": true,
"block": "92-93",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000002f0000000-0x000000034fffffff",
"size": "1.5G",
"state": "online",
"removable": false,
"block": "94-105",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000350000000-0x0000000357ffffff",
"size": "128M",
"state": "online",
"removable": true,
"block": "106",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000358000000-0x000000036fffffff",
"size": "384M",
"state": "online",
"removable": false,
"block": "107-109",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000370000000-0x0000000377ffffff",
"size": "128M",
"state": "online",
"removable": true,
"block": "110",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000378000000-0x00000003c7ffffff",
"size": "1.3G",
"state": "online",
"removable": false,
"block": "111-120",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000003c8000000-0x00000003e7ffffff",
"size": "512M",
"state": "online",
"removable": true,
"block": "121-124",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x00000003e8000000-0x000000042fffffff",
"size": "1.1G",
"state": "online",
"removable": false,
"block": "125-133",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000430000000-0x0000000437ffffff",
"size": "128M",
"state": "online",
"removable": true,
"block": "134",
- "node": 0
+ "node": 0,
+ "zones": "Normal"
},{
"range": "0x0000000438000000-0x000000043fffffff",
"size": "128M",
"state": "online",
"removable": false,
"block": "135",
- "node": 0
+ "node": 0,
+ "zones": "None"
}
]
}
diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem
index 7dce0f2222..8654ae3d80 100755
--- a/tests/ts/lsmem/lsmem
+++ b/tests/ts/lsmem/lsmem
@@ -24,7 +24,7 @@ ts_check_test_command "$TS_CMD_LSMEM"
ts_check_prog "tar"
ts_check_prog "bzip2"
-LSCOLUMNS="RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE"
+LSCOLUMNS="RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE,ZONES"
function do_lsmem {
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 08:48:52 +0000