diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1111eec69b..b639af851f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* target.h (struct target_ops) <to_save_trace_data>: Add argument.
+	(target_save_trace_data): Add argument.
+	* target.c (update_current_target): Update.
+	* remote.c (remote_save_trace_data): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* tracepoint.c (tfile_get_trace_state_variable_value): Add 'self'
diff --git a/gdb/remote.c b/gdb/remote.c
index 8d4e29e35e..b518174d7d 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10939,7 +10939,7 @@ remote_get_trace_state_variable_value (struct target_ops *self,
 }
 
 static int
-remote_save_trace_data (const char *filename)
+remote_save_trace_data (struct target_ops *self, const char *filename)
 {
   struct remote_state *rs = get_remote_state ();
   char *p, *reply;
diff --git a/gdb/target.c b/gdb/target.c
index 0860a56b99..75e3a8aa4a 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -890,7 +890,7 @@ update_current_target (void)
 	    (int (*) (struct target_ops *, int, LONGEST *))
 	    return_zero);
   de_fault (to_save_trace_data,
-	    (int (*) (const char *))
+	    (int (*) (struct target_ops *, const char *))
 	    tcomplain);
   de_fault (to_upload_tracepoints,
 	    (int (*) (struct uploaded_tp **))
diff --git a/gdb/target.h b/gdb/target.h
index 16caa29f5a..638931d6f6 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -811,7 +811,7 @@ struct target_ops
     int (*to_get_trace_state_variable_value) (struct target_ops *,
 					      int tsv, LONGEST *val);
 
-    int (*to_save_trace_data) (const char *filename);
+    int (*to_save_trace_data) (struct target_ops *, const char *filename);
 
     int (*to_upload_tracepoints) (struct uploaded_tp **utpp);
 
@@ -1829,7 +1829,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
 						       (tsv), (val))
 
 #define target_save_trace_data(filename) \
-  (*current_target.to_save_trace_data) (filename)
+  (*current_target.to_save_trace_data) (&current_target, filename)
 
 #define target_upload_tracepoints(utpp) \
   (*current_target.to_upload_tracepoints) (utpp)