added the inpsect block command ('xb') to print the contents within a block device to the monitor.
PATCH 1/1 added the inpsect block command ('xb') to print the contents within a block device to the monitor.
'xb' (examine block) is almost identical in usage to 'x' and 'xp', having the same targuments for those commands , albeit preceded by a drive name.
---
Implemented the xb (examine block) command to print the contents of a block device to the console.
It is effectively a clone of the x/xp commands (examine memory / examine physical memory), having the same arguments for those commands, albeit preceded by the name of a block driver.
e.g. usage
xd floppy0 /510c 0
--- hmp-commands.hx | 14 +++++++ include/monitor/hmp.h | 1 + monitor/hmp-cmds.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+)
hmp-commands.hx +14 -0
@@ -472,6 +472,20 @@ ERST .cmd = hmp_memory_dump, }, +SRST +``xb/``\ *fmt* *addr* + Block memory dump starting at *addr*. +ERST + + { + .name = "xb", + .args_type = "device:s, fmt:/,addr:l", + .params = "device /fmt addr", + .help = "block memory dump starting at 'addr'", + .cmd = hmp_block_dump, + }, + + SRST ``x/``\ *fmt* *addr* Virtual memory dump starting at *addr*.
include/monitor/hmp.h +1 -0
@@ -182,6 +182,7 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict);void hmp_info_sev (Monitor *mon,const QDict *qdict);void hmp_info_sgx (Monitor *mon,const QDict *qdict);void hmp_info_via (Monitor *mon,const QDict *qdict); +void hmp_block_dump (Monitor *mon,const QDict *qdict);void hmp_memory_dump (Monitor *mon,const QDict *qdict);void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict);void hmp_info_registers (Monitor *mon,const QDict *qdict);
monitor/hmp-cmds.c +104 -0
124 lines not on this page · raw message
---
base-commit: 443e02410695b35a27fad18217424b6370358be7
change-id: 20260726-xbcmd-7fa889067f15
Best regards,
Signature · 1 line
Tripp R <[email protected]>
Quoted 1 line · * Tripp R ([email protected]) wrote:
'xb' (examine block) is almost identical in usage to 'x' and 'xp', having the same targuments for those commands , albeit preceded by a drive name.
Hi Tripp,
Thanks for resending this. Note that normally you'd mark this as being a 'v2' version.
I'm copying in Kevin and Hanna from the Block layer; although there's still some work to do here.
Quoted 4 lines
---
Implemented the xb (examine block) command to print the contents of a block device to the console.It is effectively a clone of the x/xp commands (examine memory / examine physical memory), having the same arguments for those commands, albeit preceded by the name of a block driver.
OK, these are still a bit weirdly formatted; you seem to have spaces added between 'block device' and 'examine physical' rather than the line actually being broken into two lines.
Quoted 3 lines
e.g. usage
xd floppy0 /510c 0
Remember to include the explanation.
Also, I'd shorten the subject, something like
[PATCH] Add the inspect block command ('xb')
Quoted 12 lines
Signed-off-by Tripp R <[email protected]>--- hmp-commands.hx | 14 +++++++ include/monitor/hmp.h | 1 + monitor/hmp-cmds.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+)hmp-commands.hx +0
-0
hmp-commands.hx ERST · line 477
Quoted 6 lines
hmp-commands.hx +3
-0@@ -472,6 +472,20 @@ ERST .cmd = hmp_memory_dump, }, +SRST +``xb/``\ *fmt* *addr* + Block memory dump starting at *addr*.
Block *device* not memory - or just 'Block dump'
hmp-commands.hx ERST · line 484
Quoted 7 lines
hmp-commands.hx +7
-0+ERST + + { + .name = "xb", + .args_type = "device:s, fmt:/,addr:l", + .params = "device /fmt addr", + .help = "block memory dump starting at 'addr'",
again not 'block memory'
Quoted 25 lines
hmp-commands.hx +4
-0+ .cmd = hmp_block_dump, + }, + + SRST ``x/``\ *fmt* *addr* Virtual memory dump starting at *addr*.include/monitor/hmp.h +1
-0@@ -182,6 +182,7 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict);void hmp_info_sev (Monitor *mon,const QDict *qdict);void hmp_info_sgx (Monitor *mon,const QDict *qdict);void hmp_info_via (Monitor *mon,const QDict *qdict); +void hmp_block_dump (Monitor *mon,const QDict *qdict);void hmp_memory_dump (Monitor *mon,const QDict *qdict);void hmp_physical_memory_dump (Monitor *mon,const QDict *qdict);void hmp_info_registers (Monitor *mon,const QDict *qdict);monitor/hmp-cmds.c +0
-0
monitor/hmp-cmds.c line 47
Quoted 9 lines
monitor/hmp-cmds.c +4
-0@@ -39,8 +39,12 @@#include "system/hw_accel.h" #include "system/memory.h" #include "system/system.h" +#include "system/block-backend-common.h" +#include "system/block-backend-io.h" +#include "system/block-backend-global-state.h" #include "disas/disas.h" +
Stray extra line
Quoted 21 lines
monitor/hmp-cmds.c +14
-0/* Please update hmp-commands.hx when adding or changing commands */ static HMPCommand hmp_info_cmds[] = { #include "hmp-commands-info.h"@@ -584,6 +588,89 @@ void hmp_info_registers(Monitor *mon, const QDict *qdict) } } + +static void block_dump (Monitor *mon,BlockBackend * blk,int count,int format, +int wsize,int64_t offset) +{ +uint8_t buf[16 ]; + +uint16_t max_digits =0 ; + +switch (format) { +case 'o' : + max_digits =DIV_ROUND_UP (wsize *8 ,3 ); +break ; +default : +case 'x' :
monitor/hmp-cmds.c void hmp_info_registers(Monitor *mon, const QDict *qdict) · line 614
Quoted 10 lines
monitor/hmp-cmds.c +10
-0+ max_digits = (wsize *8 ) /4 ; +break ; +case 'u' : +case 'd' : + max_digits =DIV_ROUND_UP (wsize *8 *10 ,33 ); +break ; +case 'c' : + wsize =1 ; +break ; + }
This code is a copy/paste out of memory_dump; it's always best to avoid copy paste - so if you can move this code out of memory_dump into a function - e.g. digits_for_format say, and then just call it from both places it would be best.
Quoted 18 lines
monitor/hmp-cmds.c +18
-0+while (count >0 ) { +int bytes =MIN (16 , count * wsize); + +if (blk_pread (blk, offset, bytes, buf,0 ) <0 ) { +monitor_printf (mon, +"Read failed at 0x%" PRIx64"\n" , + offset); +return ; + } + +monitor_printf (mon,"%08" PRIx64": " , offset); + +for (int i =0 ; i < bytes; i += wsize) { +uint64_t v; + +switch (wsize) { +case 1 : + v = buf[i];
monitor/hmp-cmds.c void hmp_info_registers(Monitor *mon, const QDict *qdict) · line 644
Quoted 10 lines
monitor/hmp-cmds.c +10
-0+break ; +case 2 : + v =lduw_le_p (buf + i); +break ; +case 4 : + v =ldl_le_p (buf + i); +break ; +case 8 : + v =ldq_le_p (buf + i); +break ;
I don't think you need to use the magic ld*_le_p functions here - those are normally used for access to guest ram, which the 'x' command does; you can use normal C casts etc here.
Quoted 11 lines
monitor/hmp-cmds.c +11
-0+default : + v=0 ; + } +switch (format) { +case 'o' : +monitor_printf (mon,"0%*" PRIo64, max_digits, v); +break ; +case 'x' : +monitor_printf (mon,"0x%0*" PRIx64, max_digits, v); +break ; +case 'u' :
monitor/hmp-cmds.c void hmp_info_registers(Monitor *mon, const QDict *qdict) · line 665
Quoted 10 lines
monitor/hmp-cmds.c +10
-0+monitor_printf (mon,"%*" PRIu64, max_digits, v); +break ; +case 'd' : +monitor_printf (mon,"%*" PRId64, max_digits, v); +break ; +case 'c' : +monitor_printc (mon, v); +break ; + } + }
Again this is a block of code copied from memory_dump; so better to share a function rather than copy.
monitor/hmp-cmds.c void hmp_info_registers(Monitor *mon, const QDict *qdict) · line 670
Quoted 4 lines
monitor/hmp-cmds.c +4
-0+monitor_printf (mon,"\n" ); + + offset += bytes; + count -= bytes / wsize;
OK, so you're printing one entry per line rather than memory_dump's fancier trick of printing a few on a line; I prefer memory_dumps way of doing it - your example dump of 510 bytes must be annoying to scroll through!
Dave
Quoted 40 lines
monitor/hmp-cmds.c +20
-1+ } +} +static void memory_dump (Monitor *mon,int count,int format,int wsize,uint64_t addr,bool is_physical) {@@ -692,6 +779,23 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize, } } +void hmp_block_dump (Monitor *mon,const QDict *qdict) +{ +int count =qdict_get_int (qdict,"count" ); +int format =qdict_get_int (qdict,"format" ); +int size =qdict_get_int (qdict,"size" ); +vaddr addr =qdict_get_int (qdict,"addr" ); +const char * dblock =qdict_get_str (qdict,"device" ); + +BlockBackend *blk =blk_by_name (dblock); + +if (!blk) { +monitor_printf (mon,"Invalid block device name '%s'.\n\r" , dblock); +return ; + } +block_dump (mon,blk, count, format, size, addr); +} +void hmp_memory_dump (Monitor *mon,const QDict *qdict) {int count =qdict_get_int (qdict,"count" ); ---base-commit:
443e02410695b35a27fad18217424b6370358be7
change-id: 20260726-xbcmd-7fa889067f15Best regards,
Signature · 1 line
Tripp R <[email protected]>
Signature · 4 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/