[patch] ext/debugger.hgs: add missing includes

[patch] ext/debugger.hgs: add missing includes

[Goncalo Gomes]

[-- Attachment #1: Type: text/plain, Size: 1394 bytes --]

The changes below are required to build Xen 4.0rc6 from the debuggers.hg with enabled gdbsx support.

Cheers,
 -Goncalo.

Signed-off-by: Goncalo Gomes <Goncalo.Gomes@Eu.Citrix.COM>

diff -r 809b20f066fb xen/arch/x86/gdbstub.c
--- a/xen/arch/x86/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
+++ b/xen/arch/x86/gdbstub.c	Sat May 08 20:43:37 2010 +0100
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 #include <asm/debugger.h>
+#include <xen/gdbstub.h>
 
 u16
 gdb_arch_signal_num(struct cpu_user_regs *regs, unsigned long cookie)
diff -r 809b20f066fb xen/arch/x86/x86_64/gdbstub.c
--- a/xen/arch/x86/x86_64/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
+++ b/xen/arch/x86/x86_64/gdbstub.c	Sat May 08 20:43:37 2010 +0100
@@ -19,6 +19,7 @@
  */
 
 #include <asm/debugger.h>
+#include <xen/gdbstub.h>
 
 #define GDB_REG64(r) gdb_write_to_packet_hex(r, sizeof(u64), ctx)
 #define GDB_REG32(r)  gdb_write_to_packet_hex(r, sizeof(u32), ctx)
diff -r 809b20f066fb xen/common/gdbstub.c
--- a/xen/common/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
+++ b/xen/common/gdbstub.c	Sat May 08 20:43:37 2010 +0100
@@ -45,6 +45,7 @@
 #include <xen/errno.h>
 #include <xen/delay.h>
 #include <asm/byteorder.h>
+#include <xen/gdbstub.h>
 
 /* Printk isn't particularly safe just after we've trapped to the
    debugger. so avoid it. */

[-- Attachment #2: debuggers_build_fix.diff --]
[-- Type: application/octet-stream, Size: 1172 bytes --]

diff -r 809b20f066fb xen/arch/x86/gdbstub.c
--- a/xen/arch/x86/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
+++ b/xen/arch/x86/gdbstub.c	Sat May 08 21:12:12 2010 +0100
@@ -20,6 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 #include <asm/debugger.h>
+#include <xen/gdbstub.h>
 
 u16
 gdb_arch_signal_num(struct cpu_user_regs *regs, unsigned long cookie)
diff -r 809b20f066fb xen/arch/x86/x86_64/gdbstub.c
--- a/xen/arch/x86/x86_64/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
+++ b/xen/arch/x86/x86_64/gdbstub.c	Sat May 08 21:12:12 2010 +0100
@@ -19,6 +19,7 @@
  */
 
 #include <asm/debugger.h>
+#include <xen/gdbstub.h>
 
 #define GDB_REG64(r) gdb_write_to_packet_hex(r, sizeof(u64), ctx)
 #define GDB_REG32(r)  gdb_write_to_packet_hex(r, sizeof(u32), ctx)
diff -r 809b20f066fb xen/common/gdbstub.c
--- a/xen/common/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
+++ b/xen/common/gdbstub.c	Sat May 08 21:12:12 2010 +0100
@@ -45,6 +45,7 @@
 #include <xen/errno.h>
 #include <xen/delay.h>
 #include <asm/byteorder.h>
+#include <xen/gdbstub.h>
 
 /* Printk isn't particularly safe just after we've trapped to the
    debugger. so avoid it. */

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [patch] ext/debugger.hgs: add missing includes

[Mukesh Rathor]

On Sat, 8 May 2010 21:12:25 +0100
Goncalo Gomes <Goncalo.Gomes@eu.citrix.com> wrote:

> The changes below are required to build Xen 4.0rc6 from the
> debuggers.hg with enabled gdbsx support.
> 
> Cheers,
>  -Goncalo.
> 
> Signed-off-by: Goncalo Gomes <Goncalo.Gomes@Eu.Citrix.COM>
> 
> diff -r 809b20f066fb xen/arch/x86/gdbstub.c
> --- a/xen/arch/x86/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
> +++ b/xen/arch/x86/gdbstub.c	Sat May 08 20:43:37 2010 +0100
> @@ -20,6 +20,7 @@
>   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> 02111-1307 USA */
>  #include <asm/debugger.h>
> +#include <xen/gdbstub.h>
>  
>  u16
>  gdb_arch_signal_num(struct cpu_user_regs *regs, unsigned long cookie)
> diff -r 809b20f066fb xen/arch/x86/x86_64/gdbstub.c
> --- a/xen/arch/x86/x86_64/gdbstub.c	Fri Mar 19 18:36:57 2010
> -0700 +++ b/xen/arch/x86/x86_64/gdbstub.c	Sat May 08 20:43:37
> 2010 +0100 @@ -19,6 +19,7 @@
>   */
>  
>  #include <asm/debugger.h>
> +#include <xen/gdbstub.h>
>  
>  #define GDB_REG64(r) gdb_write_to_packet_hex(r, sizeof(u64), ctx)
>  #define GDB_REG32(r)  gdb_write_to_packet_hex(r, sizeof(u32), ctx)
> diff -r 809b20f066fb xen/common/gdbstub.c
> --- a/xen/common/gdbstub.c	Fri Mar 19 18:36:57 2010 -0700
> +++ b/xen/common/gdbstub.c	Sat May 08 20:43:37 2010 +0100
> @@ -45,6 +45,7 @@
>  #include <xen/errno.h>
>  #include <xen/delay.h>
>  #include <asm/byteorder.h>
> +#include <xen/gdbstub.h>
>  
>  /* Printk isn't particularly safe just after we've trapped to the
>     debugger. so avoid it. */

Hi Goncalo,

Can you please elaborate a bit. I was able to build using make gdbsx=y
crash_debug=y, is that what you are doing? I don't mind making the
change in the ext/debuggers.hg tree, but if the parallel change is not
in unstable tree, next time i refresh it may get overwritten to your
annoyance. i don't see gdbstub files with the above include in unstable
or xen 4.0 tree. Moroever, the gdbstub files have nothing to do with
either kdb or gdbsx. 

thanks,
mukesh

Re: [patch] ext/debugger.hgs: add missing includes

[Goncalo Gomes]

On Tue, 2010-05-11 at 02:25 +0100, Mukesh Rathor wrote:
> 
> Hi Goncalo,

Hi Mukesh, 

> Can you please elaborate a bit. I was able to build using make gdbsx=y
> crash_debug=y, is that what you are doing? I don't mind making the
> change in the ext/debuggers.hg tree, but if the parallel change is not
> in unstable tree, next time i refresh it may get overwritten to your
> annoyance. i don't see gdbstub files with the above include in unstable
> or xen 4.0 tree. Moroever, the gdbstub files have nothing to do with
> either kdb or gdbsx. 

In my system, Debian Lenny, I had compiler errors stating the struct
gdb_context was defined within the function scope which appeared as if
during the 3.5 -> 4.0rc6 merge some header might have been omited. Using
ctags, I found the definition of this struct was inside gdbstub.h and
the patch I've submited allowed the compilation to finish successfully. 

However, I've just tried to reproduce it again and I can't seem to get
the same behavior to reproduce. The only thing that changed since the
time I built Xen from the debuggers.hg and generated the patch (the
system was pretty much clean at the time) was the
compilation/installation of gdb 7.1 from source. 

Not quite sure that'd be relevant, however it's still semi-related in
context.

Feel free to discard the patch, in the meantime I'll do some more tests
and if I find any hints of the problem, I'll update this thread.

Cheers,
 -Goncalo.