[PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Mark Pryor]

Signed-off-by: Mark Pryor <pryorm09@gmail.com>
---
 src/kbd.c   | 6 +++---
 src/mouse.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kbd.c b/src/kbd.c
index 33a95a3..fbcecc3 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -11,7 +11,7 @@
 #include "hw/ps2port.h" // ps2_kbd_command
 #include "hw/usb-hid.h" // usb_kbd_command
 #include "output.h" // debug_enter
-#include "stacks.h" // stack_hop
+#include "stacks.h" // yield
 #include "string.h" // memset
 #include "util.h" // kbd_init
 
@@ -117,8 +117,8 @@ static int
 kbd_command(int command, u8 *param)
 {
     if (usb_kbd_active())
-        return stack_hop(command, (u32)param, usb_kbd_command);
-    return stack_hop(command, (u32)param, ps2_kbd_command);
+        return usb_kbd_command(command, param);
+    return ps2_kbd_command(command, param);
 }
 
 // read keyboard input
diff --git a/src/mouse.c b/src/mouse.c
index 92ae921..100255d 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -10,7 +10,7 @@
 #include "hw/ps2port.h" // ps2_mouse_command
 #include "hw/usb-hid.h" // usb_mouse_command
 #include "output.h" // dprintf
-#include "stacks.h" // stack_hop
+#include "stacks.h" // stack_hop_back
 #include "util.h" // mouse_init
 
 void
@@ -27,8 +27,8 @@ static int
 mouse_command(int command, u8 *param)
 {
     if (usb_mouse_active())
-        return stack_hop(command, (u32)param, usb_mouse_command);
-    return stack_hop(command, (u32)param, ps2_mouse_command);
+        return usb_mouse_command(command, param);
+    return ps2_mouse_command(command, param);
 }
 
 #define RET_SUCCESS      0x00
-- 
2.1.4

Re: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Jan Beulich]

>>> On 08.10.15 at 21:36, <pryorm09@gmail.com> wrote:
> Signed-off-by: Mark Pryor <pryorm09@gmail.com>

Without any description I cannot see what is being fixed here, or why
there are _different_ comment changes on the inclusion of the same
comment. Since I assume that whatever issue there was has been
taken care of upstream, I'd suggest - just like for the other patch - to
instead request inclusion of the respective upstream commit (again
obeying ./MAINTAINERS of the affected Xen branch).

Jan

> ---
>  src/kbd.c   | 6 +++---
>  src/mouse.c | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/kbd.c b/src/kbd.c
> index 33a95a3..fbcecc3 100644
> --- a/src/kbd.c
> +++ b/src/kbd.c
> @@ -11,7 +11,7 @@
>  #include "hw/ps2port.h" // ps2_kbd_command
>  #include "hw/usb-hid.h" // usb_kbd_command
>  #include "output.h" // debug_enter
> -#include "stacks.h" // stack_hop
> +#include "stacks.h" // yield
>  #include "string.h" // memset
>  #include "util.h" // kbd_init
>  
> @@ -117,8 +117,8 @@ static int
>  kbd_command(int command, u8 *param)
>  {
>      if (usb_kbd_active())
> -        return stack_hop(command, (u32)param, usb_kbd_command);
> -    return stack_hop(command, (u32)param, ps2_kbd_command);
> +        return usb_kbd_command(command, param);
> +    return ps2_kbd_command(command, param);
>  }
>  
>  // read keyboard input
> diff --git a/src/mouse.c b/src/mouse.c
> index 92ae921..100255d 100644
> --- a/src/mouse.c
> +++ b/src/mouse.c
> @@ -10,7 +10,7 @@
>  #include "hw/ps2port.h" // ps2_mouse_command
>  #include "hw/usb-hid.h" // usb_mouse_command
>  #include "output.h" // dprintf
> -#include "stacks.h" // stack_hop
> +#include "stacks.h" // stack_hop_back
>  #include "util.h" // mouse_init
>  
>  void
> @@ -27,8 +27,8 @@ static int
>  mouse_command(int command, u8 *param)
>  {
>      if (usb_mouse_active())
> -        return stack_hop(command, (u32)param, usb_mouse_command);
> -    return stack_hop(command, (u32)param, ps2_mouse_command);
> +        return usb_mouse_command(command, param);
> +    return ps2_mouse_command(command, param);
>  }
>  
>  #define RET_SUCCESS      0x00
> -- 
> 2.1.4
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org 
> http://lists.xen.org/xen-devel 

Re: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Luis R. Rodriguez]

On Fri, Oct 9, 2015 at 12:34 AM, Jan Beulich <JBeulich@suse.com> wrote:
>>>> On 08.10.15 at 21:36, <pryorm09@gmail.com> wrote:
>> Signed-off-by: Mark Pryor <pryorm09@gmail.com>
>
> Without any description I cannot see what is being fixed here, or why
> there are _different_ comment changes on the inclusion of the same
> comment. Since I assume that whatever issue there was has been
> taken care of upstream, I'd suggest - just like for the other patch - to
> instead request inclusion of the respective upstream commit (again
> obeying ./MAINTAINERS of the affected Xen branch).

I'll submit a proper replacement patch with valid description.

 Luis

Re: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Luis R. Rodriguez]

On Thu, Nov 19, 2015 at 3:06 PM, Luis R. Rodriguez
<mcgrof@do-not-panic.com> wrote:
> On Fri, Oct 9, 2015 at 12:34 AM, Jan Beulich <JBeulich@suse.com> wrote:
>>>>> On 08.10.15 at 21:36, <pryorm09@gmail.com> wrote:
>>> Signed-off-by: Mark Pryor <pryorm09@gmail.com>
>>
>> Without any description I cannot see what is being fixed here, or why
>> there are _different_ comment changes on the inclusion of the same
>> comment. Since I assume that whatever issue there was has been
>> taken care of upstream, I'd suggest - just like for the other patch - to
>> instead request inclusion of the respective upstream commit (again
>> obeying ./MAINTAINERS of the affected Xen branch).
>
> I'll submit a proper replacement patch with valid description.

I submitted a replacement a while ago...

 Luis

Re: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Wei Liu]

On Fri, Feb 05, 2016 at 05:39:39PM -0800, Luis R. Rodriguez wrote:
> On Thu, Nov 19, 2015 at 3:06 PM, Luis R. Rodriguez
> <mcgrof@do-not-panic.com> wrote:
> > On Fri, Oct 9, 2015 at 12:34 AM, Jan Beulich <JBeulich@suse.com> wrote:
> >>>>> On 08.10.15 at 21:36, <pryorm09@gmail.com> wrote:
> >>> Signed-off-by: Mark Pryor <pryorm09@gmail.com>
> >>
> >> Without any description I cannot see what is being fixed here, or why
> >> there are _different_ comment changes on the inclusion of the same
> >> comment. Since I assume that whatever issue there was has been
> >> taken care of upstream, I'd suggest - just like for the other patch - to
> >> instead request inclusion of the respective upstream commit (again
> >> obeying ./MAINTAINERS of the affected Xen branch).
> >
> > I'll submit a proper replacement patch with valid description.
> 
> I submitted a replacement a while ago...
> 

Can you point me to the message-id of you email to xen-devel?

I can't seem to be able to find it in my archive.

FWIW I use "~f Luis ~h seabios" pattern in mutt and only found this
thread.

Wei.

>  Luis
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

Re: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Ian Campbell]

On Tue, 2016-02-09 at 09:58 +0000, Wei Liu wrote:
> On Fri, Feb 05, 2016 at 05:39:39PM -0800, Luis R. Rodriguez wrote:
> > On Thu, Nov 19, 2015 at 3:06 PM, Luis R. Rodriguez
> > <mcgrof@do-not-panic.com> wrote:
> > > On Fri, Oct 9, 2015 at 12:34 AM, Jan Beulich <JBeulich@suse.com>
> > > wrote:
> > > > > > > On 08.10.15 at 21:36, <pryorm09@gmail.com> wrote:
> > > > > Signed-off-by: Mark Pryor <pryorm09@gmail.com>
> > > > 
> > > > Without any description I cannot see what is being fixed here, or
> > > > why
> > > > there are _different_ comment changes on the inclusion of the same
> > > > comment. Since I assume that whatever issue there was has been
> > > > taken care of upstream, I'd suggest - just like for the other patch
> > > > - to
> > > > instead request inclusion of the respective upstream commit (again
> > > > obeying ./MAINTAINERS of the affected Xen branch).
> > > 
> > > I'll submit a proper replacement patch with valid description.
> > 
> > I submitted a replacement a while ago...
> > 
> 
> Can you point me to the message-id of you email to xen-devel?

    <    1448041672-3986-2-git-send-email-mcgrof@do-not-panic.com    >

> I can't seem to be able to find it in my archive.
> 
> FWIW I use "~f Luis ~h seabios" pattern in mutt and only found this
> thread.

It was:
	[PATCH 1/9] Revert "Use the extra stack for 16bit USB and PS2 keyboard/mouse commands."

which is something Jan just gave some feedback on this morning in
    <    56B9AC7D02000078000CFDE9@prv-mh.provo.novell.com>

I think that commit is in the version of SeaBIOS referenced by 4.6.0
already, since xen 4.6.0 points to seabios rel-1.8.2 and 

$ git describe --contains 12085439561f44107c7d3bea5a333a90ea987643
rel-1.8.0~94

Ian.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5

[Wei Liu]

On Tue, Feb 09, 2016 at 02:57:53PM +0000, Ian Campbell wrote:
> On Tue, 2016-02-09 at 09:58 +0000, Wei Liu wrote:
> > On Fri, Feb 05, 2016 at 05:39:39PM -0800, Luis R. Rodriguez wrote:
> > > On Thu, Nov 19, 2015 at 3:06 PM, Luis R. Rodriguez
> > > <mcgrof@do-not-panic.com> wrote:
> > > > On Fri, Oct 9, 2015 at 12:34 AM, Jan Beulich <JBeulich@suse.com>
> > > > wrote:
> > > > > > > > On 08.10.15 at 21:36, <pryorm09@gmail.com> wrote:
> > > > > > Signed-off-by: Mark Pryor <pryorm09@gmail.com>
> > > > > 
> > > > > Without any description I cannot see what is being fixed here, or
> > > > > why
> > > > > there are _different_ comment changes on the inclusion of the same
> > > > > comment. Since I assume that whatever issue there was has been
> > > > > taken care of upstream, I'd suggest - just like for the other patch
> > > > > - to
> > > > > instead request inclusion of the respective upstream commit (again
> > > > > obeying ./MAINTAINERS of the affected Xen branch).
> > > > 
> > > > I'll submit a proper replacement patch with valid description.
> > > 
> > > I submitted a replacement a while ago...
> > > 
> > 
> > Can you point me to the message-id of you email to xen-devel?
> 
>     <    1448041672-3986-2-git-send-email-mcgrof@do-not-panic.com    >
> 
> > I can't seem to be able to find it in my archive.
> > 
> > FWIW I use "~f Luis ~h seabios" pattern in mutt and only found this
> > thread.
> 
> It was:
> 	[PATCH 1/9] Revert "Use the extra stack for 16bit USB and PS2 keyboard/mouse commands."
> 
> which is something Jan just gave some feedback on this morning in
>     <    56B9AC7D02000078000CFDE9@prv-mh.provo.novell.com>
> 
> I think that commit is in the version of SeaBIOS referenced by 4.6.0
> already, since xen 4.6.0 points to seabios rel-1.8.2 and 
> 
> $ git describe --contains 12085439561f44107c7d3bea5a333a90ea987643
> rel-1.8.0~94
> 

OK. Nothing for me to worry about then. I just checked, it already is
present in our tree.

Wei.

> Ian.