From patchwork Mon Apr 12 12:56:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Rogers X-Patchwork-Id: 49967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 607D8B7D0E for ; Mon, 12 Apr 2010 22:56:47 +1000 (EST) Received: from localhost ([127.0.0.1]:57722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1JC0-0007U8-1N for incoming@patchwork.ozlabs.org; Mon, 12 Apr 2010 08:56:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1JBR-0007Tm-KH for qemu-devel@nongnu.org; Mon, 12 Apr 2010 08:56:09 -0400 Received: from [140.186.70.92] (port=44666 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1JBQ-0007TJ-BG for qemu-devel@nongnu.org; Mon, 12 Apr 2010 08:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1JBO-0004Dw-HS for qemu-devel@nongnu.org; Mon, 12 Apr 2010 08:56:08 -0400 Received: from sinclair.provo.novell.com ([137.65.248.137]:31612) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1JBO-0004DM-7m for qemu-devel@nongnu.org; Mon, 12 Apr 2010 08:56:06 -0400 Received: from INET-PRV-MTA by sinclair.provo.novell.com with Novell_GroupWise; Mon, 12 Apr 2010 06:56:04 -0600 Message-Id: <4BC2C4000200004800092C4D@sinclair.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Mon, 12 Apr 2010 06:56:00 -0600 From: "Bruce Rogers" To: Mime-Version: 1.0 Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: Novell Netware 6 SP3 Subject: [Qemu-devel] [PATCH] Remove un-needed code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The bdrv_set_geometry_hint call below is not needed - it's just setting what was just read. Signed-off-by: Bruce Rogers diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 9915840..bc4fa77 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -494,7 +494,6 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) s->rq = NULL; s->sector_mask = (s->conf->logical_block_size / 512) - 1; bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); - bdrv_set_geometry_hint(s->bs, cylinders, heads, secs); s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);