Commit 433672b0 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

error: Clean up errors with embedded newlines (again) 



The arguments of error_report() should yield a short error string
without newlines.

A few places try to print additional help after the error message by
embedding newlines in the error string.  That's nice, but let's do it
the right way.  Commit 474c2134 cleaned up some, but they keep coming
back.  Offenders tracked down with the Coccinelle semantic patch from
commit 312fd5f2.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Pavel Fedin <p.fedin@samsung.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@pond.sub.org>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent bf89e874

hw/i386/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -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");

    }

kvm-all.c

+3 −3
Original line number Diff line number Diff line
@@ -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();

    }

}

qemu-nbd.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

    }