From patchwork Fri May 30 11:17:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 354072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 22F411400D6 for ; Fri, 30 May 2014 21:20:38 +1000 (EST) Received: from localhost ([::1]:53238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqKrT-00053x-VQ for incoming@patchwork.ozlabs.org; Fri, 30 May 2014 07:20:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqKpE-0000Ae-Mp for qemu-devel@nongnu.org; Fri, 30 May 2014 07:18:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WqKp9-00034W-HM for qemu-devel@nongnu.org; Fri, 30 May 2014 07:18:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WqKp9-00034G-8s for qemu-devel@nongnu.org; Fri, 30 May 2014 07:18:11 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4UBI9oX013255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 May 2014 07:18:09 -0400 Received: from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4UBI8st021487; Fri, 30 May 2014 07:18:08 -0400 From: Stefan Hajnoczi To: Date: Fri, 30 May 2014 13:17:47 +0200 Message-Id: <1401448669-4655-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1401448669-4655-1-git-send-email-stefanha@redhat.com> References: <1401448669-4655-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, afaerber@suse.de, Stefan Hajnoczi , fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v3 6/8] virtio-blk: drop virtio_blk_set_conf() 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 This function is no longer used since parent objects now use child aliases to set the VirtIOBlkConf directly. Signed-off-by: Stefan Hajnoczi Reviewed-by: Peter Crosthwaite --- hw/block/virtio-blk.c | 6 ------ include/hw/virtio/virtio-blk.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 8a568e5..4781351 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -642,12 +642,6 @@ static const BlockDevOps virtio_block_ops = { .resize_cb = virtio_blk_resize, }; -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk) -{ - VirtIOBlock *s = VIRTIO_BLK(dev); - memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf)); -} - #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE /* Disable dataplane thread during live migration since it does not * update the dirty memory bitmap yet. diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h index 78e7f81..f8d4ac1 100644 --- a/include/hw/virtio/virtio-blk.h +++ b/include/hw/virtio/virtio-blk.h @@ -159,6 +159,4 @@ typedef struct VirtIOBlock { DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true), \ DEFINE_PROP_IOTHREAD("x-iothread", _state, _field.iothread) -void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk); - #endif