From patchwork Mon Oct 31 13:29:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 122868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A4EB0B6F7D for ; Tue, 1 Nov 2011 02:23:36 +1100 (EST) Received: from localhost ([::1]:45974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKruO-0004yL-GY for incoming@patchwork.ozlabs.org; Mon, 31 Oct 2011 09:28:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrtm-0003TH-43 for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKrtl-00047v-88 for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrtk-00047V-SK for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:27:33 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9VDRV6n004238 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 31 Oct 2011 09:27:31 -0400 Received: from dhcp-5-188.str.redhat.com (vpn1-7-216.ams2.redhat.com [10.36.7.216]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9VDRMoB023034; Mon, 31 Oct 2011 09:27:30 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Mon, 31 Oct 2011 14:29:40 +0100 Message-Id: <1320067830-12093-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 05/55] block: Remove dead code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Kevin Wolf --- block.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 70aab63..f86984f 100644 --- a/block.c +++ b/block.c @@ -2028,11 +2028,7 @@ const char *bdrv_get_encrypted_filename(BlockDriverState *bs) void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size) { - if (!bs->backing_file) { - pstrcpy(filename, filename_size, ""); - } else { - pstrcpy(filename, filename_size, bs->backing_file); - } + pstrcpy(filename, filename_size, bs->backing_file); } int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,