Patchwork serial: Update parameters after load

login
register
mail settings
Submitter Michal Novotny
Date Sept. 13, 2010, 1:47 p.m.
Message ID <4C8E2B60.1010909@redhat.com>
Download mbox | patch
Permalink /patch/64602/
State New
Headers show

Comments

Michal Novotny - Sept. 13, 2010, 1:47 p.m.
Hi,

this is the patch to update serial port parameters after guest is
already loaded.

Signed-off-by: Michal Novotny<minovotn@redhat.com>
---
  hw/serial.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
Edgar Iglesias - Sept. 15, 2010, 1:53 p.m.
On Mon, Sep 13, 2010 at 03:47:12PM +0200, Michal Novotny wrote:
> Hi,
> 
> this is the patch to update serial port parameters after guest is
> already loaded.

Hi

This patch didn't apply:

% git am -s ~/.maildir/minovotn/
Applying: serial: Update parameters after load
error: patch failed: hw/serial.c:674
error: hw/serial.c: patch does not apply
Patch failed at 0001 serial: Update parameters after load
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort"

> 
> Signed-off-by: Michal Novotny<minovotn@redhat.com>
                             ^^^^
                          missing space


I manually fixed both errors and applied it.

Cheers,
Edgar


> ---
>   hw/serial.c |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/serial.c b/hw/serial.c
> index 49431b2..bf74876 100644
> --- a/hw/serial.c
> +++ b/hw/serial.c
> @@ -674,6 +674,7 @@ static int serial_post_load(void *opaque, int version_id)
>       }
>       /* Initialize fcr via setter to perform essential side-effects */
>       serial_ioport_write(s, 0x02, s->fcr_vmstate);
> +    serial_update_parameters(s);
>       return 0;
>   }
> 
> -- 
> 1.7.2.3
Michal Novotny - Sept. 15, 2010, 2:39 p.m.
On 09/15/2010 03:53 PM, Edgar E. Iglesias wrote:
> On Mon, Sep 13, 2010 at 03:47:12PM +0200, Michal Novotny wrote:
>    
>> Hi,
>>
>> this is the patch to update serial port parameters after guest is
>> already loaded.
>>      
> Hi
>
> This patch didn't apply:
>
> % git am -s ~/.maildir/minovotn/
> Applying: serial: Update parameters after load
> error: patch failed: hw/serial.c:674
> error: hw/serial.c: patch does not apply
> Patch failed at 0001 serial: Update parameters after load
> When you have resolved this problem run "git am --resolved".
> If you would prefer to skip this patch, instead run "git am --skip".
> To restore the original branch and stop patching run "git am --abort"
>
>    
>> Signed-off-by: Michal Novotny<minovotn@redhat.com>
>>      
>                               ^^^^
>                            missing space
>    

Hi, thanks. Nevetheless should there be a space between name and e-mail 
address? I didn't know what's right so if there should be a space please 
tell me to take care of it next time.

Thanks for applying the patch.

Regards,
Michal

>
> I manually fixed both errors and applied it.
>
> Cheers,
> Edgar
>
>
>    
>> ---
>>    hw/serial.c |    1 +
>>    1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/hw/serial.c b/hw/serial.c
>> index 49431b2..bf74876 100644
>> --- a/hw/serial.c
>> +++ b/hw/serial.c
>> @@ -674,6 +674,7 @@ static int serial_post_load(void *opaque, int version_id)
>>        }
>>        /* Initialize fcr via setter to perform essential side-effects */
>>        serial_ioport_write(s, 0x02, s->fcr_vmstate);
>> +    serial_update_parameters(s);
>>        return 0;
>>    }
>>
>> -- 
>> 1.7.2.3
>>
Edgar Iglesias - Sept. 15, 2010, 2:45 p.m.
On Wed, Sep 15, 2010 at 04:39:20PM +0200, Michal Novotny wrote:
> On 09/15/2010 03:53 PM, Edgar E. Iglesias wrote:
> > On Mon, Sep 13, 2010 at 03:47:12PM +0200, Michal Novotny wrote:
> >    
> >> Hi,
> >>
> >> this is the patch to update serial port parameters after guest is
> >> already loaded.
> >>      
> > Hi
> >
> > This patch didn't apply:
> >
> > % git am -s ~/.maildir/minovotn/
> > Applying: serial: Update parameters after load
> > error: patch failed: hw/serial.c:674
> > error: hw/serial.c: patch does not apply
> > Patch failed at 0001 serial: Update parameters after load
> > When you have resolved this problem run "git am --resolved".
> > If you would prefer to skip this patch, instead run "git am --skip".
> > To restore the original branch and stop patching run "git am --abort"
> >
> >    
> >> Signed-off-by: Michal Novotny<minovotn@redhat.com>
> >>      
> >                               ^^^^
> >                            missing space
> >    
> 
> Hi, thanks. Nevetheless should there be a space between name and e-mail 
> address? I didn't know what's right so if there should be a space please 
> tell me to take care of it next time.

Hi Michal,

If you setup your git environment with your name and email, you can
pass the -s flag to commit or set the format.signoff config option
and git will generate the SoB line for you.

Cheers
Michal Novotny - Sept. 15, 2010, 3:04 p.m.
On 09/15/2010 04:45 PM, Edgar E. Iglesias wrote:
> On Wed, Sep 15, 2010 at 04:39:20PM +0200, Michal Novotny wrote:
>    
>> On 09/15/2010 03:53 PM, Edgar E. Iglesias wrote:
>>      
>>> On Mon, Sep 13, 2010 at 03:47:12PM +0200, Michal Novotny wrote:
>>>
>>>        
>>>> Hi,
>>>>
>>>> this is the patch to update serial port parameters after guest is
>>>> already loaded.
>>>>
>>>>          
>>> Hi
>>>
>>> This patch didn't apply:
>>>
>>> % git am -s ~/.maildir/minovotn/
>>> Applying: serial: Update parameters after load
>>> error: patch failed: hw/serial.c:674
>>> error: hw/serial.c: patch does not apply
>>> Patch failed at 0001 serial: Update parameters after load
>>> When you have resolved this problem run "git am --resolved".
>>> If you would prefer to skip this patch, instead run "git am --skip".
>>> To restore the original branch and stop patching run "git am --abort"
>>>
>>>
>>>        
>>>> Signed-off-by: Michal Novotny<minovotn@redhat.com>
>>>>
>>>>          
>>>                                ^^^^
>>>                             missing space
>>>
>>>        
>> Hi, thanks. Nevetheless should there be a space between name and e-mail
>> address? I didn't know what's right so if there should be a space please
>> tell me to take care of it next time.
>>      
> Hi Michal,
>
> If you setup your git environment with your name and email, you can
> pass the -s flag to commit or set the format.signoff config option
> and git will generate the SoB line for you.
>
> Cheers
>    
Ok, thanks. I'm already having it but I didn't know about the 
format.signoff option.

Thanks,
Michal

Patch

diff --git a/hw/serial.c b/hw/serial.c
index 49431b2..bf74876 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -674,6 +674,7 @@  static int serial_post_load(void *opaque, int version_id)
      }
      /* Initialize fcr via setter to perform essential side-effects */
      serial_ioport_write(s, 0x02, s->fcr_vmstate);
+    serial_update_parameters(s);
      return 0;
  }