Remove reduntant qemu: from error functions
This patch removes redundant "qemu:" from error functions. The link to the bitesized task is: http://wiki.qemu-project.org/Contribute/BiteSizedTasks#Error_checking Signed-off-by: Ishani Chugh <chugh.ishani@research.iiit.ac.in> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
		
							parent
							
								
									12a95f320a
								
							
						
					
					
						commit
						d0e31a105e
					
				@ -189,7 +189,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
 | 
				
			|||||||
                                                  ram_size - initrd_offset);
 | 
					                                                  ram_size - initrd_offset);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            if (initrd_size < 0) {
 | 
					            if (initrd_size < 0) {
 | 
				
			||||||
                error_report("qemu: could not load initrd '%s'",
 | 
					                error_report("could not load initrd '%s'",
 | 
				
			||||||
                             initrd_filename);
 | 
					                             initrd_filename);
 | 
				
			||||||
                exit(EXIT_FAILURE);
 | 
					                exit(EXIT_FAILURE);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
				
			|||||||
@ -197,7 +197,7 @@ void nios2_load_kernel(Nios2CPU *cpu, hwaddr ddr_base,
 | 
				
			|||||||
                                                  ram_size - initrd_offset);
 | 
					                                                  ram_size - initrd_offset);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            if (initrd_size < 0) {
 | 
					            if (initrd_size < 0) {
 | 
				
			||||||
                error_report("qemu: could not load initrd '%s'",
 | 
					                error_report("could not load initrd '%s'",
 | 
				
			||||||
                             initrd_filename);
 | 
					                             initrd_filename);
 | 
				
			||||||
                exit(EXIT_FAILURE);
 | 
					                exit(EXIT_FAILURE);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
				
			|||||||
@ -610,7 +610,7 @@ static void ppc_powernv_init(MachineState *machine)
 | 
				
			|||||||
    /* Create the processor chips */
 | 
					    /* Create the processor chips */
 | 
				
			||||||
    chip_typename = g_strdup_printf(TYPE_PNV_CHIP "-%s", machine->cpu_model);
 | 
					    chip_typename = g_strdup_printf(TYPE_PNV_CHIP "-%s", machine->cpu_model);
 | 
				
			||||||
    if (!object_class_by_name(chip_typename)) {
 | 
					    if (!object_class_by_name(chip_typename)) {
 | 
				
			||||||
        error_report("qemu: invalid CPU model '%s' for %s machine",
 | 
					        error_report("invalid CPU model '%s' for %s machine",
 | 
				
			||||||
                     machine->cpu_model, MACHINE_GET_CLASS(machine)->name);
 | 
					                     machine->cpu_model, MACHINE_GET_CLASS(machine)->name);
 | 
				
			||||||
        exit(1);
 | 
					        exit(1);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
@ -496,10 +496,10 @@ static void sclp_realize(DeviceState *dev, Error **errp)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);
 | 
					    ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);
 | 
				
			||||||
    if (ret == -E2BIG) {
 | 
					    if (ret == -E2BIG) {
 | 
				
			||||||
        error_setg(&err, "qemu: host supports a maximum of %" PRIu64 " GB",
 | 
					        error_setg(&err, "host supports a maximum of %" PRIu64 " GB",
 | 
				
			||||||
                   hw_limit >> 30);
 | 
					                   hw_limit >> 30);
 | 
				
			||||||
    } else if (ret) {
 | 
					    } else if (ret) {
 | 
				
			||||||
        error_setg(&err, "qemu: setting the guest size failed");
 | 
					        error_setg(&err, "setting the guest size failed");
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
out:
 | 
					out:
 | 
				
			||||||
 | 
				
			|||||||
@ -50,7 +50,7 @@ static void tricore_load_kernel(CPUTriCoreState *env)
 | 
				
			|||||||
                           NULL, 0,
 | 
					                           NULL, 0,
 | 
				
			||||||
                           EM_TRICORE, 1, 0);
 | 
					                           EM_TRICORE, 1, 0);
 | 
				
			||||||
    if (kernel_size <= 0) {
 | 
					    if (kernel_size <= 0) {
 | 
				
			||||||
        error_report("qemu: no kernel file '%s'",
 | 
					        error_report("no kernel file '%s'",
 | 
				
			||||||
                tricoretb_binfo.kernel_filename);
 | 
					                tricoretb_binfo.kernel_filename);
 | 
				
			||||||
        exit(1);
 | 
					        exit(1);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										4
									
								
								numa.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								numa.c
									
									
									
									
									
								
							@ -174,7 +174,7 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp)
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (node->has_mem && node->has_memdev) {
 | 
					    if (node->has_mem && node->has_memdev) {
 | 
				
			||||||
        error_setg(errp, "qemu: cannot specify both mem= and memdev=");
 | 
					        error_setg(errp, "cannot specify both mem= and memdev=");
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -182,7 +182,7 @@ static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp)
 | 
				
			|||||||
        have_memdevs = node->has_memdev;
 | 
					        have_memdevs = node->has_memdev;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (node->has_memdev != have_memdevs) {
 | 
					    if (node->has_memdev != have_memdevs) {
 | 
				
			||||||
        error_setg(errp, "qemu: memdev option must be specified for either "
 | 
					        error_setg(errp, "memdev option must be specified for either "
 | 
				
			||||||
                   "all or no nodes");
 | 
					                   "all or no nodes");
 | 
				
			||||||
        return;
 | 
					        return;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user