Add target_ops argument to to_disable_btrace

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target.h (struct target_ops) <to_disable_btrace>: Add argument.
	* target.c (target_disable_btrace): Add argument.
	* remote.c (remote_disable_btrace): Add 'self' argument.
	* i386-linux-nat.c (i386_linux_disable_btrace): Add 'self'
	argument.
	* amd64-linux-nat.c (amd64_linux_disable_btrace): Add 'self'
	argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d36e75a0d669a9ea11e57f41f999f66133efe5e9..f645612ac712956bae8530b9bf6e5e404d5f8db6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_disable_btrace>: Add argument.
+       * target.c (target_disable_btrace): Add argument.
+       * remote.c (remote_disable_btrace): Add 'self' argument.
+       * i386-linux-nat.c (i386_linux_disable_btrace): Add 'self'
+       argument.
+       * amd64-linux-nat.c (amd64_linux_disable_btrace): Add 'self'
+       argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_enable_btrace>: Add argument.

diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index 51f04769e4914e0ac00699ba078ead4ceb9128e8..b72bb8467bcc6a97d3293257b83b0e631ac1b447 100644 (file)
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -1172,7 +1172,8 @@ amd64_linux_enable_btrace (struct target_ops *self, ptid_t ptid)
 /* Disable branch tracing.  */
 
 static void
-amd64_linux_disable_btrace (struct btrace_target_info *tinfo)
+amd64_linux_disable_btrace (struct target_ops *self,
+                           struct btrace_target_info *tinfo)
 {
   enum btrace_error errcode = linux_disable_btrace (tinfo);
 

diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index 8d6d92941a79e0121dbd6472919deb5aa380827d..9c990361135aba3d5c2b06d1a3a18764acf0dbf7 100644 (file)
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -1083,7 +1083,8 @@ i386_linux_enable_btrace (struct target_ops *self, ptid_t ptid)
 /* Disable branch tracing.  */
 
 static void
-i386_linux_disable_btrace (struct btrace_target_info *tinfo)
+i386_linux_disable_btrace (struct target_ops *self,
+                          struct btrace_target_info *tinfo)
 {
   enum btrace_error errcode = linux_disable_btrace (tinfo);
 

diff --git a/gdb/remote.c b/gdb/remote.c
index b2a7992cc52695d492a281cf8dc85e473d52fed9..939d2667f10d9d10b5f796de2aac243b4ba58594 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11279,7 +11279,8 @@ remote_enable_btrace (struct target_ops *self, ptid_t ptid)
 /* Disable branch tracing.  */
 
 static void
-remote_disable_btrace (struct btrace_target_info *tinfo)
+remote_disable_btrace (struct target_ops *self,
+                      struct btrace_target_info *tinfo)
 {
   struct packet_config *packet = &remote_protocol_packets[PACKET_Qbtrace_off];
   struct remote_state *rs = get_remote_state ();

diff --git a/gdb/target.c b/gdb/target.c
index be42e0cbbb1d2d06b594824eecc5e0b31e6269a0..06ada9c21430eb940bfffe0ef6005d97858b9c49 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -4215,7 +4215,7 @@ target_disable_btrace (struct btrace_target_info *btinfo)
   for (t = current_target.beneath; t != NULL; t = t->beneath)
     if (t->to_disable_btrace != NULL)
       {
-       t->to_disable_btrace (btinfo);
+       t->to_disable_btrace (t, btinfo);
        return;
       }
 

diff --git a/gdb/target.h b/gdb/target.h
index 83563949da517107e2a6a4ad0b3e94254a37c21b..123282ae753190afacff252eb9ac45b59b49f160 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -907,7 +907,8 @@ struct target_ops
                                                    ptid_t ptid);
 
     /* Disable branch tracing and deallocate TINFO.  */
-    void (*to_disable_btrace) (struct btrace_target_info *tinfo);
+    void (*to_disable_btrace) (struct target_ops *,
+                              struct btrace_target_info *tinfo);
 
     /* Disable branch tracing and deallocate TINFO.  This function is similar
        to to_disable_btrace, except that it is called during teardown and is