From patchwork Wed Jan 30 13:22:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1033530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qPS16kgXz9s9G for ; Thu, 31 Jan 2019 00:32:33 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gopyh-0000Kp-Qt for incoming@patchwork.ozlabs.org; Wed, 30 Jan 2019 08:32:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goppq-0001V0-OF for qemu-devel@nongnu.org; Wed, 30 Jan 2019 08:23:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goppp-0006Xd-J4 for qemu-devel@nongnu.org; Wed, 30 Jan 2019 08:23:22 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:36391) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goppp-0006SR-7u; Wed, 30 Jan 2019 08:23:21 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MSbov-1gi0DK1Fc1-00SvxU; Wed, 30 Jan 2019 14:22:59 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 30 Jan 2019 14:22:14 +0100 Message-Id: <20190130132214.25493-14-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190130132214.25493-1-laurent@vivier.eu> References: <20190130132214.25493-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:WTvKS9r9s4rNnHcLG2PfUfC87jDKh5rHSnvZGg93icvsUH6XO0t Ln9+xvxNCb3a/8PzAbhnWcW76kVnCJqqmzNACosKc2E6VcuDw3BwL0Z1Sh0sVerataQmsNG Bv1JgfFnuyVve5oTwTli0UtEqqVr2oLZdCVEtPpdOMYJMDTnACA0RRX4cWjaKk8L+VVoIud Mz6ASLqZfSm9uUK72cnqA== X-UI-Out-Filterresults: notjunk:1; V03:K0:u6cW1nZkfQw=:Yb/gVrd9u1NQKhK5Xi+XvO P2CKYlVdOCC4+ekCmpXKq5aYIFXPoYKFeGeWZItIXpvsVUb60eXnYW2CXo3i+QKF1oVhR4FIi lTEIV8DEVxhI41oi7ZSy8ubzqQY8NUNp4IF30lBnvtMR4x80Li/0ugOgYAiQNGQmF1kOEsjhK nTD3IMePbUqXSBdT5tVSGF5ZCx2oGhl2N05dIfAFyXSXEu1Q8w4S2l6OstkethYwuwWjBQ0CO M6vnz0vnPaigmb9lsUxTah85Rsu4ixEBOglLC9kbO2ZICjW5BjhulEfOm/OgtQqJ4rJOfuvIQ 7z2h0D17xdHx9zX0eDt2vlalIia6cR3KmIZwmKfbXN7foFoRrn6E/m4T7d6GLFvIuYYfok5k3 VFaNUsldssUsFUGZMOezTGkkaVmoRhQBVMqCVrluE7KjZqOmSwjCOfanS7hcnU6cD7zZTXnb4 VhdyJFah4Y41jmW68w8RF5C+WdNc4gu9JvqXaQMvi1gx09xjt1xaZxMs7oL8DOzzNkEJ5K8q6 kscP8ab7/4tyhxmnEyx+tASzb4+BhWh4POoClEvToa94IWzLJXgn2U8r1tpdcUn6lVdd9nRWs 5PMjAA3FquHXJ7rfDwaX7So2n8xQJwX8xfFq0vQoJOa56ynmLRvM4anA9yWvo/DtrrH6U5QeB uPIYKw+bYXOFae777D5TPPb6zFdamZ9mYun2PT6Pt1++rE505DLql0G9Bthf3dBjXD3IFzw2+ g6n18vO04/yg4CBgwhXsKM4TnQFNPWGpdwvTKw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PULL 13/13] virtio-blk: remove duplicate definition of VirtIOBlock *s pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand , Michael Tokarev , Laurent Vivier , Jiri Slaby , qemu-block@nongnu.org, qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Stefano Garzarella , Thomas Huth , Eduardo Habkost , Riku Voipio , qemu-s390x@nongnu.org, Stefan Hajnoczi , Paolo Bonzini , Stafford Horne , Richard Henderson , Kevin Wolf , Peter Crosthwaite , Bastian Koppelmann , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Stefano Garzarella VirtIOBlock *s is already defined and initialized with req->dev on top of virtio_blk_handle_request(), so we can remove it from the code block of VIRTIO_BLK_T_GET_ID case. Signed-off-by: Stefano Garzarella Reviewed-by: Thomas Huth Message-Id: <20190130095231.42081-1-sgarzare@redhat.com> Signed-off-by: Laurent Vivier --- hw/block/virtio-blk.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f208c6ddb9..9a87b3bfac 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -569,8 +569,6 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) break; case VIRTIO_BLK_T_GET_ID: { - VirtIOBlock *s = req->dev; - /* * NB: per existing s/n string convention the string is * terminated by '\0' only when shorter than buffer.