Merge remote-tracking branch 'sweil/for-anthony' into staging

* sweil/for-anthony:
  Fix some more license versions (GPL2+ instead of GPL2)
  dump: Fix license version (GPL2+ instead of GPL2)
  configure: Fix build for some versions of glibc (9pfs)
  monitor: Fix memory leak with readline completion

configure

@@ -2812,7 +2812,11 @@ fi
 open_by_hande_at=no
 cat > $TMPC << EOF
 #include <fcntl.h>
+#if !defined(AT_EMPTY_PATH)
+# error missing definition
+#else
 int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); }
+#endif
 EOF
 if compile_prog "" "" ; then
     open_by_handle_at=yes

dump-stub.c

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

dump.c

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

dump.h

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2. See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

memory_mapping-stub.c

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2. See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

memory_mapping.c

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2. See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

memory_mapping.h

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2. See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

readline.c

@@ -337,6 +337,9 @@ static void readline_completion(ReadLineState *rs)
         }
         readline_show_prompt(rs);
     }
+    for (i = 0; i < rs->nb_completions; i++) {
+        g_free(rs->completions[i]);
+    }
 }
 
 /* return true if command handled */

target-i386/arch_dump.c

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */
 

target-i386/arch_memory_mapping.c

@@ -6,8 +6,8 @@
  * Authors:
  *     Wen Congyang <wency@cn.fujitsu.com>
  *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * the COPYING file in the top-level directory.
+ * See the COPYING file in the top-level directory.
  *
  */