fix release-1.7.5 for gcc5

PATCH In review Mark Pryor 5 participants 7 messages Oct 8, 2015 – Feb 9, 2016

lore

Share & tools

lore

Mark Pryor

author

2015-10-08 19:36 UTC #0 lore raw

PATCH 1/1 fix release-1.7.5 for gcc5

Signed-off-by Mark Pryor <[email protected]>

---
 src/kbd.c   | 6 +++---
 src/mouse.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

src/kbd.c +3 -3

index 33a95a3..fbcecc3 100644
@@ -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

src/mouse.c +3 -3

index 92ae921..100255d 100644
@@ -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

Signature · 1 line

2.1.4

Jan Beulich

2015-10-09 07:34 UTC #1 lore raw

Quoted 2 lines

Quoted 1 line
Quoted 1 line · On 08.10.15 at 21:36, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>

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

Quoted 62 lines

---
 src/kbd.c   | 6 +++---
 src/mouse.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

src/kbd.c +3 -3

index 33a95a3..fbcecc3 100644
@@ -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

src/mouse.c +3 -3

index 92ae921..100255d 100644
@@ -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

Signature · 8 lines

2.1.4



_______________________________________________
Xen-devel mailing list
[email protected] 
http://lists.xen.org/xen-devel

Luis R. Rodriguez

2015-11-19 23:06 UTC #2 lore raw

Quoted 9 lines · Jan Beulich

Quoted 2 lines
Quoted 1 line
Quoted 1 line · On 08.10.15 at 21:36, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>
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

Luis R. Rodriguez

2016-02-06 01:40 UTC #3 lore raw

Quoted 4 lines · Luis R. Rodriguez

Quoted 3 lines · Jan Beulich
Quoted 2 lines
Quoted 1 line
Quoted 1 line · On 08.10.15 at 21:36, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>

Quoted 8 lines

Quoted 6 lines
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

Wei Liu

2016-02-09 09:58 UTC #4 lore raw

Quoted 13 lines · Luis R. Rodriguez

Quoted 11 lines · Luis R. Rodriguez
Quoted 9 lines · Jan Beulich
Quoted 2 lines
Quoted 1 line
Quoted 1 line · On 08.10.15 at 21:36, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>
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).

Quoted 4 lines

Quoted 1 line
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.

Quoted 6 lines

Luis
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel

Ian Campbell

2016-02-09 14:57 UTC #5 lore raw

Quoted 17 lines · Wei Liu

Quoted 16 lines · Luis R. Rodriguez
Quoted 14 lines · Luis R. Rodriguez
Quoted 11 lines · Jan Beulich
Quoted 2 lines
Quoted 1 line
Quoted 1 line · On 08.10.15 at 21:36, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>
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).

Quoted 6 lines

Quoted 4 lines
Quoted 1 line
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?

    <    [email protected]    >

Quoted 4 lines

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

    <    [email protected]>

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
[email protected]
http://lists.xen.org/xen-devel

Wei Liu

2016-02-09 16:30 UTC #6 lore raw

Quoted 35 lines · Ian Campbell

Quoted 17 lines · Wei Liu
Quoted 16 lines · Luis R. Rodriguez
Quoted 14 lines · Luis R. Rodriguez
Quoted 11 lines · Jan Beulich
Quoted 2 lines
Quoted 1 line
Quoted 1 line · On 08.10.15 at 21:36, <[email protected]> wrote:
Signed-off-by Mark Pryor <[email protected]>
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).
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
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?
    <    [email protected]    >
Quoted 4 lines
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."

Quoted 9 lines

which is something Jan just gave some feedback on this morning in
    <    [email protected]>
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.

Quoted 1 line

Ian.