diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 0e5c86ae1b..9e37186776 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -377,8 +377,8 @@ ISADevice *pc_find_fdc0(void) if (state.multiple) { error_report("warning: multiple floppy disk controllers with " - "iobase=0x3f0 have been found;\n" - "the one being picked for CMOS setup might not reflect " + "iobase=0x3f0 have been found"); + error_printf("the one being picked for CMOS setup might not reflect " "your intent"); } diff --git a/kvm-all.c b/kvm-all.c index bd9e7641b2..9148889921 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2063,9 +2063,9 @@ void kvm_device_access(int fd, int group, uint64_t attr, write ? KVM_SET_DEVICE_ATTR : KVM_GET_DEVICE_ATTR, &kvmattr); if (err < 0) { - error_report("KVM_%s_DEVICE_ATTR failed: %s\n" - "Group %d attr 0x%016" PRIx64, write ? "SET" : "GET", - strerror(-err), group, attr); + error_report("KVM_%s_DEVICE_ATTR failed: %s", + write ? "SET" : "GET", strerror(-err)); + error_printf("Group %d attr 0x%016" PRIx64, group, attr); abort(); } } diff --git a/qemu-nbd.c b/qemu-nbd.c index 023eacd1c8..a4cf847976 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -599,9 +599,8 @@ int main(int argc, char **argv) } if ((argc - optind) != 1) { - error_report("Invalid number of argument.\n" - "Try `%s --help' for more information.", - argv[0]); + error_report("Invalid number of arguments"); + error_printf("Try `%s --help' for more information.\n", argv[0]); exit(EXIT_FAILURE); }