Commit 312fd5f2 authored by Markus Armbruster's avatar Markus Armbruster Committed by Anthony Liguori
Browse files

error: Strip trailing '\n' from error string arguments (again) 



Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back.  Tracked down with this Coccinelle semantic patch:

    @r@
	expression err, eno, cls, fmt;
	position p;
    @@
    (
	error_report(fmt, ...)@p
    |
	error_set(err, cls, fmt, ...)@p
    |
	error_set_errno(err, eno, cls, fmt, ...)@p
    |
	error_setg(err, fmt, ...)@p
    |
	error_setg_errno(err, eno, fmt, ...)@p
    )
    @script:python@
	fmt << r.fmt;
	p << r.p;
    @@
    if "\\n" in str(fmt):
	print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1a9522cc

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static struct glfs *qemu_gluster_init(GlusterConf *gconf, const char *filename) 
    ret = glfs_init(glfs);

    if (ret) {

        error_report("Gluster connection failed for server=%s port=%d "

             "volume=%s image=%s transport=%s\n", gconf->server, gconf->port,

             "volume=%s image=%s transport=%s", gconf->server, gconf->port,

             gconf->volname, gconf->image, gconf->transport);

        goto out;

    }

hmp.c

+1 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,7 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict) 


    opts = qemu_opts_parse(qemu_find_opts("chardev"), args, 1);

    if (opts == NULL) {

        error_setg(&err, "Parsing chardev args failed\n");

        error_setg(&err, "Parsing chardev args failed");

    } else {

        qemu_chr_new_from_opts(opts, NULL, &err);

    }

hw/9pfs/virtio-9p-proxy.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static int v9fs_request(V9fsProxy *proxy, int type, 
        }

        break;

    default:

        error_report("Invalid type %d\n", type);

        error_report("Invalid type %d", type);

        retval = -EINVAL;

        break;

    }

hw/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ PCIINTxRoute pci_device_route_intx_to_irq(PCIDevice *dev, int pin) 
    } while (dev);



    if (!bus->route_intx_to_irq) {

        error_report("PCI: Bug - unimplemented PCI INTx routing (%s)\n",

        error_report("PCI: Bug - unimplemented PCI INTx routing (%s)",

                     object_get_typename(OBJECT(bus->qbus.parent)));

        return (PCIINTxRoute) { PCI_INTX_DISABLED, -1 };

    }

hw/qdev.c

+2 −2
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ DeviceState *qdev_create(BusState *bus, const char *name) 
    dev = qdev_try_create(bus, name);

    if (!dev) {

        if (bus) {

            error_report("Unknown device '%s' for bus '%s'\n", name,

            error_report("Unknown device '%s' for bus '%s'", name,

                         object_get_typename(OBJECT(bus)));

            abort();

        } else {

            error_report("Unknown device '%s' for default sysbus\n", name);

            error_report("Unknown device '%s' for default sysbus", name);

            abort();

        }

    }