| 
									
										
										
										
											2009-11-19 16:45:21 +00:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * ARM11MPCore internal peripheral emulation. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (c) 2006-2007 CodeSourcery. | 
					
						
							|  |  |  |  * Written by Paul Brook | 
					
						
							|  |  |  |  * | 
					
						
							| 
									
										
										
										
											2011-06-26 12:21:35 +10:00
										 |  |  |  * This code is licensed under the GPL. | 
					
						
							| 
									
										
										
										
											2009-11-19 16:45:21 +00:00
										 |  |  |  */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-01-26 18:17:28 +00:00
										 |  |  | #include "qemu/osdep.h"
 | 
					
						
							| 
									
										
											  
											
												include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef.  Since then, we've moved to include qemu/osdep.h
everywhere.  Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h.  That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h.  Include qapi/error.h in .c files that need it and don't
get it now.  Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly.  Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h.  Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third.  Unfortunately, the number depending on
qapi-types.h shrinks only a little.  More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
											
										 
											2016-03-14 09:01:28 +01:00
										 |  |  | #include "qapi/error.h"
 | 
					
						
							| 
									
										
										
										
											2019-05-23 16:35:07 +02:00
										 |  |  | #include "qemu/module.h"
 | 
					
						
							| 
									
										
										
										
											2013-08-19 01:27:19 +02:00
										 |  |  | #include "hw/cpu/arm11mpcore.h"
 | 
					
						
							| 
									
										
										
										
											2013-08-18 23:38:15 +02:00
										 |  |  | #include "hw/intc/realview_gic.h"
 | 
					
						
							| 
									
										
										
										
											2019-08-12 07:23:42 +02:00
										 |  |  | #include "hw/irq.h"
 | 
					
						
							| 
									
										
										
										
											2019-08-12 07:23:51 +02:00
										 |  |  | #include "hw/qdev-properties.h"
 | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2020-02-24 15:09:24 +05:30
										 |  |  | #define ARM11MPCORE_NUM_GIC_PRIORITY_BITS    4
 | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-04-13 11:39:08 +00:00
										 |  |  | static void mpcore_priv_set_irq(void *opaque, int irq, int level) | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |     ARM11MPCorePriveState *s = (ARM11MPCorePriveState *)opaque; | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  |     qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level); | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  | static void mpcore_priv_map_setup(ARM11MPCorePriveState *s) | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | { | 
					
						
							|  |  |  |     int i; | 
					
						
							| 
									
										
										
										
											2013-08-18 20:07:36 +02:00
										 |  |  |     SysBusDevice *scubusdev = SYS_BUS_DEVICE(&s->scu); | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     DeviceState *gicdev = DEVICE(&s->gic); | 
					
						
							|  |  |  |     SysBusDevice *gicbusdev = SYS_BUS_DEVICE(&s->gic); | 
					
						
							|  |  |  |     SysBusDevice *timerbusdev = SYS_BUS_DEVICE(&s->mptimer); | 
					
						
							|  |  |  |     SysBusDevice *wdtbusdev = SYS_BUS_DEVICE(&s->wdtimer); | 
					
						
							| 
									
										
										
										
											2013-08-18 20:07:36 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  |     memory_region_add_subregion(&s->container, 0, | 
					
						
							|  |  |  |                                 sysbus_mmio_get_region(scubusdev, 0)); | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |     /* GIC CPU interfaces: "current CPU" at 0x100, then specific CPUs
 | 
					
						
							|  |  |  |      * at 0x200, 0x300... | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     for (i = 0; i < (s->num_cpu + 1); i++) { | 
					
						
							| 
									
										
										
										
											2012-10-23 12:30:10 +02:00
										 |  |  |         hwaddr offset = 0x100 + (i * 0x100); | 
					
						
							| 
									
										
										
										
											2012-04-13 11:39:08 +00:00
										 |  |  |         memory_region_add_subregion(&s->container, offset, | 
					
						
							|  |  |  |                                     sysbus_mmio_get_region(gicbusdev, i + 1)); | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |     } | 
					
						
							|  |  |  |     /* Add the regions for timer and watchdog for "current CPU" and
 | 
					
						
							|  |  |  |      * for each specific CPU. | 
					
						
							|  |  |  |      */ | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |     for (i = 0; i < (s->num_cpu + 1); i++) { | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |         /* Timers at 0x600, 0x700, ...; watchdogs at 0x620, 0x720, ... */ | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |         hwaddr offset = 0x600 + i * 0x100; | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |         memory_region_add_subregion(&s->container, offset, | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |                                     sysbus_mmio_get_region(timerbusdev, i)); | 
					
						
							|  |  |  |         memory_region_add_subregion(&s->container, offset + 0x20, | 
					
						
							|  |  |  |                                     sysbus_mmio_get_region(wdtbusdev, i)); | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |     } | 
					
						
							| 
									
										
										
										
											2012-04-13 11:39:08 +00:00
										 |  |  |     memory_region_add_subregion(&s->container, 0x1000, | 
					
						
							|  |  |  |                                 sysbus_mmio_get_region(gicbusdev, 0)); | 
					
						
							|  |  |  |     /* Wire up the interrupt from each watchdog and timer.
 | 
					
						
							|  |  |  |      * For each core the timer is PPI 29 and the watchdog PPI 30. | 
					
						
							|  |  |  |      */ | 
					
						
							|  |  |  |     for (i = 0; i < s->num_cpu; i++) { | 
					
						
							|  |  |  |         int ppibase = (s->num_irq - 32) + i * 32; | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |         sysbus_connect_irq(timerbusdev, i, | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |                            qdev_get_gpio_in(gicdev, ppibase + 29)); | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |         sysbus_connect_irq(wdtbusdev, i, | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |                            qdev_get_gpio_in(gicdev, ppibase + 30)); | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  | static void mpcore_priv_realize(DeviceState *dev, Error **errp) | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     SysBusDevice *sbd = SYS_BUS_DEVICE(dev); | 
					
						
							| 
									
										
										
										
											2013-07-24 23:59:01 +02:00
										 |  |  |     ARM11MPCorePriveState *s = ARM11MPCORE_PRIV(dev); | 
					
						
							| 
									
										
										
										
											2013-08-18 20:07:36 +02:00
										 |  |  |     DeviceState *scudev = DEVICE(&s->scu); | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     DeviceState *gicdev = DEVICE(&s->gic); | 
					
						
							|  |  |  |     DeviceState *mptimerdev = DEVICE(&s->mptimer); | 
					
						
							|  |  |  |     DeviceState *wdtimerdev = DEVICE(&s->wdtimer); | 
					
						
							| 
									
										
										
										
											2013-08-18 20:07:36 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  |     qdev_prop_set_uint32(scudev, "num-cpu", s->num_cpu); | 
					
						
							| 
									
										
											  
											
												error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away.  Convert
    if (!foo(..., &err)) {
        ...
        error_propagate(errp, err);
        ...
        return ...
    }
to
    if (!foo(..., errp)) {
        ...
        ...
        return ...
    }
where nothing else needs @err.  Coccinelle script:
    @rule1 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
         if (
    (
    -        fun(args, &err, args2)
    +        fun(args, errp, args2)
    |
    -        !fun(args, &err, args2)
    +        !fun(args, errp, args2)
    |
    -        fun(args, &err, args2) op c1
    +        fun(args, errp, args2) op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    )
         }
    @rule2 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    expression var;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
    -    var = fun(args, &err, args2);
    +    var = fun(args, errp, args2);
         ... when != err
         if (
    (
             var
    |
             !var
    |
             var op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    |
             return var;
    )
         }
    @depends on rule1 || rule2@
    identifier err;
    @@
    -    Error *err = NULL;
         ... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
         if (fun(args, &err)) {
             goto out
         }
         ...
     out:
         error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly.  I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err".  For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there.  Converted manually.
Line breaks tidied up manually.  One nested declaration of @local_err
deleted manually.  Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
											
										 
											2020-07-07 18:06:02 +02:00
										 |  |  |     if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2012-04-13 11:39:08 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu); | 
					
						
							|  |  |  |     qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq); | 
					
						
							| 
									
										
										
										
											2020-02-24 15:09:24 +05:30
										 |  |  |     qdev_prop_set_uint32(gicdev, "num-priority-bits", | 
					
						
							|  |  |  |                          ARM11MPCORE_NUM_GIC_PRIORITY_BITS); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away.  Convert
    if (!foo(..., &err)) {
        ...
        error_propagate(errp, err);
        ...
        return ...
    }
to
    if (!foo(..., errp)) {
        ...
        ...
        return ...
    }
where nothing else needs @err.  Coccinelle script:
    @rule1 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
         if (
    (
    -        fun(args, &err, args2)
    +        fun(args, errp, args2)
    |
    -        !fun(args, &err, args2)
    +        !fun(args, errp, args2)
    |
    -        fun(args, &err, args2) op c1
    +        fun(args, errp, args2) op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    )
         }
    @rule2 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    expression var;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
    -    var = fun(args, &err, args2);
    +    var = fun(args, errp, args2);
         ... when != err
         if (
    (
             var
    |
             !var
    |
             var op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    |
             return var;
    )
         }
    @depends on rule1 || rule2@
    identifier err;
    @@
    -    Error *err = NULL;
         ... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
         if (fun(args, &err)) {
             goto out
         }
         ...
     out:
         error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly.  I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err".  For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there.  Converted manually.
Line breaks tidied up manually.  One nested declaration of @local_err
deleted manually.  Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
											
										 
											2020-07-07 18:06:02 +02:00
										 |  |  |     if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) { | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2012-04-13 11:39:08 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     /* Pass through outbound IRQ lines from the GIC */ | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     sysbus_pass_irq(sbd, SYS_BUS_DEVICE(&s->gic)); | 
					
						
							| 
									
										
										
										
											2012-04-13 11:39:08 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  |     /* Pass through inbound GPIO lines to the GIC */ | 
					
						
							| 
									
										
										
										
											2013-07-24 23:59:01 +02:00
										 |  |  |     qdev_init_gpio_in(dev, mpcore_priv_set_irq, s->num_irq - 32); | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     qdev_prop_set_uint32(mptimerdev, "num-cpu", s->num_cpu); | 
					
						
							| 
									
										
											  
											
												error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away.  Convert
    if (!foo(..., &err)) {
        ...
        error_propagate(errp, err);
        ...
        return ...
    }
to
    if (!foo(..., errp)) {
        ...
        ...
        return ...
    }
where nothing else needs @err.  Coccinelle script:
    @rule1 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
         if (
    (
    -        fun(args, &err, args2)
    +        fun(args, errp, args2)
    |
    -        !fun(args, &err, args2)
    +        !fun(args, errp, args2)
    |
    -        fun(args, &err, args2) op c1
    +        fun(args, errp, args2) op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    )
         }
    @rule2 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    expression var;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
    -    var = fun(args, &err, args2);
    +    var = fun(args, errp, args2);
         ... when != err
         if (
    (
             var
    |
             !var
    |
             var op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    |
             return var;
    )
         }
    @depends on rule1 || rule2@
    identifier err;
    @@
    -    Error *err = NULL;
         ... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
         if (fun(args, &err)) {
             goto out
         }
         ...
     out:
         error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly.  I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err".  For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there.  Converted manually.
Line breaks tidied up manually.  One nested declaration of @local_err
deleted manually.  Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
											
										 
											2020-07-07 18:06:02 +02:00
										 |  |  |     if (!sysbus_realize(SYS_BUS_DEVICE(&s->mptimer), errp)) { | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     qdev_prop_set_uint32(wdtimerdev, "num-cpu", s->num_cpu); | 
					
						
							| 
									
										
											  
											
												error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away.  Convert
    if (!foo(..., &err)) {
        ...
        error_propagate(errp, err);
        ...
        return ...
    }
to
    if (!foo(..., errp)) {
        ...
        ...
        return ...
    }
where nothing else needs @err.  Coccinelle script:
    @rule1 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
         if (
    (
    -        fun(args, &err, args2)
    +        fun(args, errp, args2)
    |
    -        !fun(args, &err, args2)
    +        !fun(args, errp, args2)
    |
    -        fun(args, &err, args2) op c1
    +        fun(args, errp, args2) op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    )
         }
    @rule2 forall@
    identifier fun, err, errp, lbl;
    expression list args, args2;
    expression var;
    binary operator op;
    constant c1, c2;
    symbol false;
    @@
    -    var = fun(args, &err, args2);
    +    var = fun(args, errp, args2);
         ... when != err
         if (
    (
             var
    |
             !var
    |
             var op c1
    )
            )
         {
             ... when != err
                 when != lbl:
                 when strict
    -        error_propagate(errp, err);
             ... when != err
    (
             return;
    |
             return c2;
    |
             return false;
    |
             return var;
    )
         }
    @depends on rule1 || rule2@
    identifier err;
    @@
    -    Error *err = NULL;
         ... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
         if (fun(args, &err)) {
             goto out
         }
         ...
     out:
         error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly.  I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err".  For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there.  Converted manually.
Line breaks tidied up manually.  One nested declaration of @local_err
deleted manually.  Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
											
										 
											2020-07-07 18:06:02 +02:00
										 |  |  |     if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdtimer), errp)) { | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |         return; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2011-12-05 14:09:18 +00:00
										 |  |  |     mpcore_priv_map_setup(s); | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2009-11-19 16:45:21 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-08-18 20:48:33 +02:00
										 |  |  | static void mpcore_priv_initfn(Object *obj) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     SysBusDevice *sbd = SYS_BUS_DEVICE(obj); | 
					
						
							|  |  |  |     ARM11MPCorePriveState *s = ARM11MPCORE_PRIV(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     memory_region_init(&s->container, OBJECT(s), | 
					
						
							|  |  |  |                        "mpcore-priv-container", 0x2000); | 
					
						
							|  |  |  |     sysbus_init_mmio(sbd, &s->container); | 
					
						
							| 
									
										
										
										
											2013-08-18 20:07:36 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
This is the same transformation as in the previous commit, except
sysbus_init_child_obj() and realize are too separated for the commit's
Coccinelle script to handle, typically because sysbus_init_child_obj()
is in a device's instance_init() method, and the matching realize is
in its realize() method.
Perhaps a Coccinelle wizard could make it transform that pattern, but
I'm just a bungler, and the best I can do is transforming the two
separate parts separately:
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(child, true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    @@
    -    qdev_init_nofail(DEVICE(child));
    +    sysbus_realize(SYS_BUS_DEVICE(child), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    expression dev;
    @@
         dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    identifier dev;
    @@
         DeviceState *dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression parent, name, size, type;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
This script is *unsound*: we need to manually verify init and realize
conversions are properly paired.
This commit has only the pairs where object_initialize_child()'s
@child and sysbus_realize()'s @dev argument text match exactly within
the same source file.
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-49-armbru@redhat.com>
											
										 
											2020-06-10 07:32:37 +02:00
										 |  |  |     object_initialize_child(obj, "scu", &s->scu, TYPE_ARM11_SCU); | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
This is the same transformation as in the previous commit, except
sysbus_init_child_obj() and realize are too separated for the commit's
Coccinelle script to handle, typically because sysbus_init_child_obj()
is in a device's instance_init() method, and the matching realize is
in its realize() method.
Perhaps a Coccinelle wizard could make it transform that pattern, but
I'm just a bungler, and the best I can do is transforming the two
separate parts separately:
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(child, true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    @@
    -    qdev_init_nofail(DEVICE(child));
    +    sysbus_realize(SYS_BUS_DEVICE(child), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    expression dev;
    @@
         dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    identifier dev;
    @@
         DeviceState *dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression parent, name, size, type;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
This script is *unsound*: we need to manually verify init and realize
conversions are properly paired.
This commit has only the pairs where object_initialize_child()'s
@child and sysbus_realize()'s @dev argument text match exactly within
the same source file.
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-49-armbru@redhat.com>
											
										 
											2020-06-10 07:32:37 +02:00
										 |  |  |     object_initialize_child(obj, "gic", &s->gic, TYPE_ARM_GIC); | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     /* Request the legacy 11MPCore GIC behaviour: */ | 
					
						
							|  |  |  |     qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 0); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
This is the same transformation as in the previous commit, except
sysbus_init_child_obj() and realize are too separated for the commit's
Coccinelle script to handle, typically because sysbus_init_child_obj()
is in a device's instance_init() method, and the matching realize is
in its realize() method.
Perhaps a Coccinelle wizard could make it transform that pattern, but
I'm just a bungler, and the best I can do is transforming the two
separate parts separately:
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(child, true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    @@
    -    qdev_init_nofail(DEVICE(child));
    +    sysbus_realize(SYS_BUS_DEVICE(child), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    expression dev;
    @@
         dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    identifier dev;
    @@
         DeviceState *dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression parent, name, size, type;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
This script is *unsound*: we need to manually verify init and realize
conversions are properly paired.
This commit has only the pairs where object_initialize_child()'s
@child and sysbus_realize()'s @dev argument text match exactly within
the same source file.
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-49-armbru@redhat.com>
											
										 
											2020-06-10 07:32:37 +02:00
										 |  |  |     object_initialize_child(obj, "mptimer", &s->mptimer, TYPE_ARM_MPTIMER); | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2
This is the same transformation as in the previous commit, except
sysbus_init_child_obj() and realize are too separated for the commit's
Coccinelle script to handle, typically because sysbus_init_child_obj()
is in a device's instance_init() method, and the matching realize is
in its realize() method.
Perhaps a Coccinelle wizard could make it transform that pattern, but
I'm just a bungler, and the best I can do is transforming the two
separate parts separately:
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(OBJECT(child), true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression errp;
    expression child;
    symbol true;
    @@
    -    object_property_set_bool(child, true, "realized", errp);
    +    sysbus_realize(SYS_BUS_DEVICE(child), errp);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    @@
    -    qdev_init_nofail(DEVICE(child));
    +    sysbus_realize(SYS_BUS_DEVICE(child), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    expression dev;
    @@
         dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression child;
    identifier dev;
    @@
         DeviceState *dev = DEVICE(child);
         ...
    -    qdev_init_nofail(dev);
    +    sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
    // only correct with a matching sysbus_init_child_obj() transformation!
    @@
    expression parent, name, size, type;
    expression child;
    symbol true;
    @@
    -    sysbus_init_child_obj(parent, name, child, size, type);
    +    sysbus_init_child_XXX(parent, name, child, size, type);
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, child, sizeof(*child), type)
    +    object_initialize_child(parent, propname, child, type)
    @@
    expression parent, propname, type;
    expression child;
    @@
    -    sysbus_init_child_XXX(parent, propname, &child, sizeof(child), type)
    +    object_initialize_child(parent, propname, &child, type)
This script is *unsound*: we need to manually verify init and realize
conversions are properly paired.
This commit has only the pairs where object_initialize_child()'s
@child and sysbus_realize()'s @dev argument text match exactly within
the same source file.
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c.  Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-49-armbru@redhat.com>
											
										 
											2020-06-10 07:32:37 +02:00
										 |  |  |     object_initialize_child(obj, "wdtimer", &s->wdtimer, TYPE_ARM_MPTIMER); | 
					
						
							| 
									
										
										
										
											2013-08-18 20:48:33 +02:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-01-24 13:12:29 -06:00
										 |  |  | static Property mpcore_priv_properties[] = { | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |     DEFINE_PROP_UINT32("num-cpu", ARM11MPCorePriveState, num_cpu, 1), | 
					
						
							| 
									
										
										
										
											2012-03-02 11:56:39 +00:00
										 |  |  |     /* The ARM11 MPCORE TRM says the on-chip controller may have
 | 
					
						
							|  |  |  |      * anything from 0 to 224 external interrupt IRQ lines (with another | 
					
						
							|  |  |  |      * 32 internal). We default to 32+32, which is the number provided by | 
					
						
							|  |  |  |      * the ARM11 MPCore test chip in the Realview Versatile Express | 
					
						
							|  |  |  |      * coretile. Other boards may differ and should set this property | 
					
						
							|  |  |  |      * appropriately. Some Linux kernels may not boot if the hardware | 
					
						
							|  |  |  |      * has more IRQ lines than the kernel expects. | 
					
						
							|  |  |  |      */ | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |     DEFINE_PROP_UINT32("num-irq", ARM11MPCorePriveState, num_irq, 64), | 
					
						
							| 
									
										
										
										
											2012-01-24 13:12:29 -06:00
										 |  |  |     DEFINE_PROP_END_OF_LIST(), | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void mpcore_priv_class_init(ObjectClass *klass, void *data) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2011-12-07 21:34:16 -06:00
										 |  |  |     DeviceClass *dc = DEVICE_CLASS(klass); | 
					
						
							| 
									
										
										
										
											2012-01-24 13:12:29 -06:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-08-18 22:04:31 +02:00
										 |  |  |     dc->realize = mpcore_priv_realize; | 
					
						
							| 
									
										
										
										
											2020-01-10 19:30:32 +04:00
										 |  |  |     device_class_set_props(dc, mpcore_priv_properties); | 
					
						
							| 
									
										
										
										
											2012-01-24 13:12:29 -06:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-01-10 16:19:07 +01:00
										 |  |  | static const TypeInfo mpcore_priv_info = { | 
					
						
							| 
									
										
										
										
											2013-07-24 23:59:01 +02:00
										 |  |  |     .name          = TYPE_ARM11MPCORE_PRIV, | 
					
						
							| 
									
										
										
										
											2011-12-07 21:34:16 -06:00
										 |  |  |     .parent        = TYPE_SYS_BUS_DEVICE, | 
					
						
							| 
									
										
										
										
											2013-02-28 18:23:13 +00:00
										 |  |  |     .instance_size = sizeof(ARM11MPCorePriveState), | 
					
						
							| 
									
										
										
										
											2013-08-18 20:48:33 +02:00
										 |  |  |     .instance_init = mpcore_priv_initfn, | 
					
						
							| 
									
										
										
										
											2011-12-07 21:34:16 -06:00
										 |  |  |     .class_init    = mpcore_priv_class_init, | 
					
						
							| 
									
										
										
										
											2009-11-19 16:45:21 +00:00
										 |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-02-09 15:20:55 +01:00
										 |  |  | static void arm11mpcore_register_types(void) | 
					
						
							| 
									
										
										
										
											2009-11-19 16:45:21 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2011-12-07 21:34:16 -06:00
										 |  |  |     type_register_static(&mpcore_priv_info); | 
					
						
							| 
									
										
										
										
											2009-11-19 16:45:21 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-02-09 15:20:55 +01:00
										 |  |  | type_init(arm11mpcore_register_types) |