vl.c: Output error on invalid machine type
Output error message using qemu's error_report() function when user provides the invalid machine type on the command line. This also saves time to find what issue is when you downgrade from one version of qemu to another that doesn't support required machine type yet (the version user downgraded to have to have this patch applied too, of course). Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> [Replace printf with error_printf, suggested by Markus Armbruster. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
		
							parent
							
								
									83d1c8ae88
								
							
						
					
					
						commit
						025172d56e
					
				
							
								
								
									
										21
									
								
								vl.c
								
								
								
								
							
							
						
						
									
										21
									
								
								vl.c
								
								
								
								
							| 
						 | 
				
			
			@ -2651,15 +2651,20 @@ static MachineClass *machine_parse(const char *name)
 | 
			
		|||
    if (mc) {
 | 
			
		||||
        return mc;
 | 
			
		||||
    }
 | 
			
		||||
    printf("Supported machines are:\n");
 | 
			
		||||
    for (el = machines; el; el = el->next) {
 | 
			
		||||
        MachineClass *mc = el->data;
 | 
			
		||||
        QEMUMachine *m = mc->qemu_machine;
 | 
			
		||||
        if (m->alias) {
 | 
			
		||||
            printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
 | 
			
		||||
    if (name && !is_help_option(name)) {
 | 
			
		||||
        error_report("Unsupported machine type");
 | 
			
		||||
        error_printf("Use -machine help to list supported machines!\n");
 | 
			
		||||
    } else {
 | 
			
		||||
        printf("Supported machines are:\n");
 | 
			
		||||
        for (el = machines; el; el = el->next) {
 | 
			
		||||
            MachineClass *mc = el->data;
 | 
			
		||||
            QEMUMachine *m = mc->qemu_machine;
 | 
			
		||||
            if (m->alias) {
 | 
			
		||||
                printf("%-20s %s (alias of %s)\n", m->alias, m->desc, m->name);
 | 
			
		||||
            }
 | 
			
		||||
            printf("%-20s %s%s\n", m->name, m->desc,
 | 
			
		||||
                   m->is_default ? " (default)" : "");
 | 
			
		||||
        }
 | 
			
		||||
        printf("%-20s %s%s\n", m->name, m->desc,
 | 
			
		||||
               m->is_default ? " (default)" : "");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    g_slist_free(machines);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue