diff mbox series

[v31,23/23] fix warning.

Message ID 20200223132750.69480-24-ysato@users.sourceforge.jp (mailing list archive)
State New, archived
Headers show
Series Add RX archtecture support | expand

Commit Message

Yoshinori Sato Feb. 23, 2020, 1:27 p.m. UTC 
Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
---
 hw/rx/rx-virt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé Feb. 24, 2020, 8:51 a.m. UTC | #1 
On 2/23/20 2:27 PM, Yoshinori Sato wrote:
> Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> ---
>   hw/rx/rx-virt.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c
> index 6cf7936201..4ee6647728 100644
> --- a/hw/rx/rx-virt.c
> +++ b/hw/rx/rx-virt.c
> @@ -90,8 +90,10 @@ static void rxvirt_init(MachineState *machine)
>   
>       /* Load kernel and dtb */
>       if (kernel_filename) {
> -        /* The kernel image is loaded into
> -           the latter half of the SDRAM space. */
> +        /*
> +          The kernel image is loaded into
> +          the latter half of the SDRAM space.
> +        */
>           kernel_offset = machine->ram_size / 2;
>           rx_load_image(RXCPU(first_cpu), kernel_filename,
>                         SDRAM_BASE + kernel_offset, kernel_offset);
> 

Hopefully the maintainer taking this can squash this fix to patch #17 
"hw/rx: RX Target hardware definition".
Yoshinori Sato Feb. 24, 2020, 1:56 p.m. UTC | #2 
On Mon, 24 Feb 2020 17:51:30 +0900,
Philippe Mathieu-Daudé wrote:
> 
> On 2/23/20 2:27 PM, Yoshinori Sato wrote:
> > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> > ---
> >   hw/rx/rx-virt.c | 6 ++++--
> >   1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c
> > index 6cf7936201..4ee6647728 100644
> > --- a/hw/rx/rx-virt.c
> > +++ b/hw/rx/rx-virt.c
> > @@ -90,8 +90,10 @@ static void rxvirt_init(MachineState *machine)
> >         /* Load kernel and dtb */
> >       if (kernel_filename) {
> > -        /* The kernel image is loaded into
> > -           the latter half of the SDRAM space. */
> > +        /*
> > +          The kernel image is loaded into
> > +          the latter half of the SDRAM space.
> > +        */
> >           kernel_offset = machine->ram_size / 2;
> >           rx_load_image(RXCPU(first_cpu), kernel_filename,
> >                         SDRAM_BASE + kernel_offset, kernel_offset);
> > 
> 
> Hopefully the maintainer taking this can squash this fix to patch #17
> "hw/rx: RX Target hardware definition".
> 

Oh, Sorry.
I'll sent v23.
Philippe Mathieu-Daudé Feb. 24, 2020, 2 p.m. UTC | #3 
On Mon, Feb 24, 2020 at 2:56 PM Yoshinori Sato
<ysato@users.sourceforge.jp> wrote:
> On Mon, 24 Feb 2020 17:51:30 +0900,
> Philippe Mathieu-Daudé wrote:
> >
> > On 2/23/20 2:27 PM, Yoshinori Sato wrote:
> > > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> > > ---
> > >   hw/rx/rx-virt.c | 6 ++++--
> > >   1 file changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c
> > > index 6cf7936201..4ee6647728 100644
> > > --- a/hw/rx/rx-virt.c
> > > +++ b/hw/rx/rx-virt.c
> > > @@ -90,8 +90,10 @@ static void rxvirt_init(MachineState *machine)
> > >         /* Load kernel and dtb */
> > >       if (kernel_filename) {
> > > -        /* The kernel image is loaded into
> > > -           the latter half of the SDRAM space. */
> > > +        /*
> > > +          The kernel image is loaded into
> > > +          the latter half of the SDRAM space.
> > > +        */
> > >           kernel_offset = machine->ram_size / 2;
> > >           rx_load_image(RXCPU(first_cpu), kernel_filename,
> > >                         SDRAM_BASE + kernel_offset, kernel_offset);
> > >
> >
> > Hopefully the maintainer taking this can squash this fix to patch #17
> > "hw/rx: RX Target hardware definition".
> >
>
> Oh, Sorry.
> I'll sent v23.

No please don't! This is not needed.
Peter Maydell Feb. 24, 2020, 2:28 p.m. UTC | #4 
On Sun, 23 Feb 2020 at 13:33, Yoshinori Sato <ysato@users.sourceforge.jp> wrote:
>
> Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> ---
>  hw/rx/rx-virt.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c
> index 6cf7936201..4ee6647728 100644
> --- a/hw/rx/rx-virt.c
> +++ b/hw/rx/rx-virt.c
> @@ -90,8 +90,10 @@ static void rxvirt_init(MachineState *machine)
>
>      /* Load kernel and dtb */
>      if (kernel_filename) {
> -        /* The kernel image is loaded into
> -           the latter half of the SDRAM space. */
> +        /*
> +          The kernel image is loaded into
> +          the latter half of the SDRAM space.
> +        */

The comment format we prefer is described in CODING_STYLE.rst;
for block comments, and it looks like this:
    /*
     * Leading and closing slash-star and star-slash
     * on their own line; each other line has a star
     * in the left column.
     */

thanks
-- PMM
Yoshinori Sato Feb. 24, 2020, 3:02 p.m. UTC | #5 
On Mon, 24 Feb 2020 23:28:24 +0900,
Peter Maydell wrote:
> 
> On Sun, 23 Feb 2020 at 13:33, Yoshinori Sato <ysato@users.sourceforge.jp> wrote:
> >
> > Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
> > ---
> >  hw/rx/rx-virt.c | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c
> > index 6cf7936201..4ee6647728 100644
> > --- a/hw/rx/rx-virt.c
> > +++ b/hw/rx/rx-virt.c
> > @@ -90,8 +90,10 @@ static void rxvirt_init(MachineState *machine)
> >
> >      /* Load kernel and dtb */
> >      if (kernel_filename) {
> > -        /* The kernel image is loaded into
> > -           the latter half of the SDRAM space. */
> > +        /*
> > +          The kernel image is loaded into
> > +          the latter half of the SDRAM space.
> > +        */
> 
> The comment format we prefer is described in CODING_STYLE.rst;
> for block comments, and it looks like this:
>     /*
>      * Leading and closing slash-star and star-slash
>      * on their own line; each other line has a star
>      * in the left column.
>      */
> 
> thanks
> -- PMM

My local file using your suggested style.
    91      /* Load kernel and dtb */
    92      if (kernel_filename) {
    93          /*
    94           * The kernel image is loaded into
    95           * the latter half of the SDRAM space.
    96           */
    97          kernel_offset = machine->ram_size / 2;
    98          rx_load_image(RXCPU(first_cpu), kernel_filename,
    99                        SDRAM_BASE + kernel_offset, kernel_offset);

Check that I may make a mistake in the file.
diff mbox series

Patch

diff --git a/hw/rx/rx-virt.c b/hw/rx/rx-virt.c
index 6cf7936201..4ee6647728 100644
--- a/hw/rx/rx-virt.c
+++ b/hw/rx/rx-virt.c
@@ -90,8 +90,10 @@  static void rxvirt_init(MachineState *machine)
 
     /* Load kernel and dtb */
     if (kernel_filename) {
-        /* The kernel image is loaded into
-           the latter half of the SDRAM space. */
+        /*
+          The kernel image is loaded into
+          the latter half of the SDRAM space.
+        */
         kernel_offset = machine->ram_size / 2;
         rx_load_image(RXCPU(first_cpu), kernel_filename,
                       SDRAM_BASE + kernel_offset, kernel_offset);