From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGWLx-0000gN-6A for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGWLq-0004bN-Se for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGWLq-0004aj-Ja for qemu-devel@nongnu.org; Fri, 15 Mar 2013 11:15:22 -0400 From: Stefan Hajnoczi Date: Fri, 15 Mar 2013 16:14:25 +0100 Message-Id: <1363360465-5247-29-git-send-email-stefanha@redhat.com> In-Reply-To: <1363360465-5247-1-git-send-email-stefanha@redhat.com> References: <1363360465-5247-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 28/28] blockdev: Fix up copyright and permission notice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori From: Markus Armbruster Screwed up in commit 666daa68. Thanks to Kevin Wolf for reminding me to fix this. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- blockdev.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/blockdev.c b/blockdev.c index 7ae6198..09f76b7 100644 --- a/blockdev.c +++ b/blockdev.c @@ -5,6 +5,29 @@ * * This work is licensed under the terms of the GNU GPL, version 2 or * later. See the COPYING file in the top-level directory. + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. */ #include "sysemu/blockdev.h" -- 1.8.1.4