1- use log:: { error, info} ;
1+ use log:: { error, info, debug } ;
22
33use memflow:: cglue;
44use memflow:: connector:: cpu_state:: * ;
@@ -31,22 +31,23 @@ impl<P: MemoryView + Process> QemuProcfs<P> {
3131 pub fn new < O : Os < IntoProcessType = P > > (
3232 mut os : O ,
3333 map_override : Option < CTup2 < Address , umem > > ,
34- process_name : Option < String > ,
34+ qemu_binary_name : Option < String > ,
3535 ) -> Result < Self > {
3636 let mut proc = None ;
3737
3838 let callback = & mut |info : ProcessInfo | {
3939
40- let matches = process_name
40+ let matches = qemu_binary_name
4141 . as_ref ( )
4242 . map ( |nm| & * info. name == nm)
4343 . unwrap_or_else ( || is_qemu ( & info) ) ;
44-
4544 if proc. is_none ( ) && matches {
45+ debug ! ( "Found QEMU process: {:#?}" , info) ;
4646 proc = Some ( info) ;
4747 }
48-
48+
4949 proc. is_none ( )
50+
5051 } ;
5152
5253 os. process_info_list_callback ( callback. into ( ) ) ?;
@@ -65,12 +66,12 @@ impl<P: MemoryView + Process> QemuProcfs<P> {
6566 mut os : O ,
6667 name : & str ,
6768 map_override : Option < CTup2 < Address , umem > > ,
68- process_name : Option < String > ,
69+ qemu_binary_name : Option < String > ,
6970 ) -> Result < Self > {
7071 let mut proc = None ;
7172
7273 let callback = & mut |info : ProcessInfo | {
73- let matches = process_name
74+ let matches = qemu_binary_name
7475 . as_ref ( )
7576 . map ( |nm| & * info. name == nm)
7677 . unwrap_or_else ( || is_qemu ( & info) ) ;
@@ -79,6 +80,7 @@ impl<P: MemoryView + Process> QemuProcfs<P> {
7980 && qemu_arg_opt ( info. command_line . split_whitespace ( ) , "-name" , "guest" ) . as_deref ( )
8081 == Some ( name)
8182 {
83+ debug ! ( "Found QEMU process with guest name '{}': {:#?}" , name, info) ;
8284 proc = Some ( info) ;
8385 }
8486
@@ -214,7 +216,7 @@ fn validator() -> ArgsValidator {
214216 ArgsValidator :: new ( )
215217 . arg ( ArgDescriptor :: new ( "map_base" ) . description ( "override of VM memory base" ) )
216218 . arg ( ArgDescriptor :: new ( "map_size" ) . description ( "override of VM memory size" ) )
217- . arg ( ArgDescriptor :: new ( "qemu_process_name " ) . description ( "override default QEMU binary name" ) )
219+ . arg ( ArgDescriptor :: new ( "qemu_binary_name " ) . description ( "override default QEMU binary name" ) )
218220}
219221
220222/// Creates a new Qemu Procfs instance.
@@ -276,19 +278,19 @@ pub fn create_connector_with_os<O: Os>(
276278 )
277279 . map ( |( start, size) | CTup2 ( Address :: from ( start) , size) ) ;
278280
279- let process_name_override = args
280- . get ( "qemu_process_name " )
281+ let qemu_binary_name_override = args
282+ . get ( "qemu_binary_name " )
281283 . map ( |s| s. to_string ( ) ) ;
282284
283285
284286 if let Some ( name) = name. or_else ( || args. get ( "name" ) ) {
285287 if let Ok ( pid) = Pid :: from_str_radix ( name, 10 ) {
286288 QemuProcfs :: with_pid ( os, pid, map_override)
287289 } else {
288- QemuProcfs :: with_guest_name ( os, name, map_override, process_name_override )
290+ QemuProcfs :: with_guest_name ( os, name, map_override, qemu_binary_name_override )
289291 }
290292 } else {
291- QemuProcfs :: new ( os, map_override, process_name_override )
293+ QemuProcfs :: new ( os, map_override, qemu_binary_name_override )
292294 }
293295 }
294296 Err ( err) => {
0 commit comments