monitor: Add delvm and loadvm argument completion
Signed-off-by: Hani Benhabiles <hani@linux.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
		
							parent
							
								
									ddd6b45ce2
								
							
						
					
					
						commit
						b21631f3b5
					
				@ -335,6 +335,7 @@ ETEXI
 | 
				
			|||||||
        .params     = "tag|id",
 | 
					        .params     = "tag|id",
 | 
				
			||||||
        .help       = "restore a VM snapshot from its tag or id",
 | 
					        .help       = "restore a VM snapshot from its tag or id",
 | 
				
			||||||
        .mhandler.cmd = do_loadvm,
 | 
					        .mhandler.cmd = do_loadvm,
 | 
				
			||||||
 | 
					        .command_completion = loadvm_completion,
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
STEXI
 | 
					STEXI
 | 
				
			||||||
@ -350,6 +351,7 @@ ETEXI
 | 
				
			|||||||
        .params     = "tag|id",
 | 
					        .params     = "tag|id",
 | 
				
			||||||
        .help       = "delete a VM snapshot from its tag or id",
 | 
					        .help       = "delete a VM snapshot from its tag or id",
 | 
				
			||||||
        .mhandler.cmd = do_delvm,
 | 
					        .mhandler.cmd = do_delvm,
 | 
				
			||||||
 | 
					        .command_completion = delvm_completion,
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
STEXI
 | 
					STEXI
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								hmp.h
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								hmp.h
									
									
									
									
									
								
							@ -112,5 +112,7 @@ void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
 | 
				
			|||||||
void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str);
 | 
					void host_net_add_completion(ReadLineState *rs, int nb_args, const char *str);
 | 
				
			||||||
void host_net_remove_completion(ReadLineState *rs, int nb_args,
 | 
					void host_net_remove_completion(ReadLineState *rs, int nb_args,
 | 
				
			||||||
                                const char *str);
 | 
					                                const char *str);
 | 
				
			||||||
 | 
					void delvm_completion(ReadLineState *rs, int nb_args, const char *str);
 | 
				
			||||||
 | 
					void loadvm_completion(ReadLineState *rs, int nb_args, const char *str);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										48
									
								
								monitor.c
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								monitor.c
									
									
									
									
									
								
							@ -70,6 +70,7 @@
 | 
				
			|||||||
#include "qmp-commands.h"
 | 
					#include "qmp-commands.h"
 | 
				
			||||||
#include "hmp.h"
 | 
					#include "hmp.h"
 | 
				
			||||||
#include "qemu/thread.h"
 | 
					#include "qemu/thread.h"
 | 
				
			||||||
 | 
					#include "block/qapi.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* for pic/irq_info */
 | 
					/* for pic/irq_info */
 | 
				
			||||||
#if defined(TARGET_SPARC)
 | 
					#if defined(TARGET_SPARC)
 | 
				
			||||||
@ -4648,6 +4649,53 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void vm_completion(ReadLineState *rs, const char *str)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    size_t len;
 | 
				
			||||||
 | 
					    BlockDriverState *bs = NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    len = strlen(str);
 | 
				
			||||||
 | 
					    readline_set_completion_index(rs, len);
 | 
				
			||||||
 | 
					    while ((bs = bdrv_next(bs))) {
 | 
				
			||||||
 | 
					        SnapshotInfoList *snapshots, *snapshot;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (!bdrv_can_snapshot(bs)) {
 | 
				
			||||||
 | 
					            continue;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        if (bdrv_query_snapshot_info_list(bs, &snapshots, NULL)) {
 | 
				
			||||||
 | 
					            continue;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        snapshot = snapshots;
 | 
				
			||||||
 | 
					        while (snapshot) {
 | 
				
			||||||
 | 
					            char *completion = snapshot->value->name;
 | 
				
			||||||
 | 
					            if (!strncmp(str, completion, len)) {
 | 
				
			||||||
 | 
					                readline_add_completion(rs, completion);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            completion = snapshot->value->id;
 | 
				
			||||||
 | 
					            if (!strncmp(str, completion, len)) {
 | 
				
			||||||
 | 
					                readline_add_completion(rs, completion);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            snapshot = snapshot->next;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        qapi_free_SnapshotInfoList(snapshots);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void delvm_completion(ReadLineState *rs, int nb_args, const char *str)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    if (nb_args == 2) {
 | 
				
			||||||
 | 
					        vm_completion(rs, str);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void loadvm_completion(ReadLineState *rs, int nb_args, const char *str)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    if (nb_args == 2) {
 | 
				
			||||||
 | 
					        vm_completion(rs, str);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void monitor_find_completion_by_table(Monitor *mon,
 | 
					static void monitor_find_completion_by_table(Monitor *mon,
 | 
				
			||||||
                                             const mon_cmd_t *cmd_table,
 | 
					                                             const mon_cmd_t *cmd_table,
 | 
				
			||||||
                                             char **args,
 | 
					                                             char **args,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user