26 files changed, 26 insertions, 74 deletions
diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index fd7020b23e..bb96dca880 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 14025e2ee8..a634e1e290 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index 3eccd1ed35..23a406e758 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 9769e1b33e..0c45845f34 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 148f936bf3..1debdc4606 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -18,9 +18,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/006 b/tests/qemu-iotests/006
index 34435702e9..58b821359d 100755
--- a/tests/qemu-iotests/006
+++ b/tests/qemu-iotests/006
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 152d55d221..b2b6df3f65 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 3d81a57d3a..26d11021ce 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index 00c16330fd..ebcc8de4b4 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index a5bee937f9..2cb5eebd45 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index d16a14fada..9106e74cc4 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 79f1dea5e5..a1b45fc2b9 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012
@@ -17,9 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index fda6ce1ffc..565071fd91 100755
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index ae932c7216..d7f50afcd5 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -16,9 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index b5f04e1a13..34b475f44e 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/016 b/tests/qemu-iotests/016
index 6ded6deaad..1dbdcb54bc 100644..100755
--- a/tests/qemu-iotests/016
+++ b/tests/qemu-iotests/016
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 49f22f2ff4..1580ef7e30 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index 01de701450..c6233f148d 100755
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index 3f858dc1ef..0c84d2fd08 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -17,9 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 04dbb8c3ea..4c9778d1bd 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -15,9 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # creator
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 79d8cc076a..8652e8cbaf 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # Control script for QA
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index 360b058e35..c246766410 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # common procedures for QA scripts
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index a5946324ff..cbbf39d678 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # setup and check for config parameters, and in particular
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index b12f50bdf5..ba464a5990 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #
 # standard filters
diff --git a/tests/qemu-iotests/common.pattern b/tests/qemu-iotests/common.pattern
index 12f813d817..63df923412 100644
--- a/tests/qemu-iotests/common.pattern
+++ b/tests/qemu-iotests/common.pattern
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 function do_is_allocated() {
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index cc3ca1114f..16cf77dc8c 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -14,9 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 dd()