From patchwork Mon Jun 24 07:04:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 253678 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 171C72C0508 for ; Mon, 24 Jun 2013 17:11:21 +1000 (EST) Received: from localhost ([::1]:59927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0vl-0007eE-PY for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2013 03:11:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0vI-0007bR-LB for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur0vH-0000MV-F6 for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:10:48 -0400 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]:60948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur0vH-0000MM-3T for qemu-devel@nongnu.org; Mon, 24 Jun 2013 03:10:47 -0400 Received: by mail-pa0-f41.google.com with SMTP id bj3so10619530pad.14 for ; Mon, 24 Jun 2013 00:10:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=vTAt7h1ELx7drJbsKxsrsiXXZZxahlZHYlVRDE2DLyQ=; b=K7fL8A/hoNl1VkBK+LFBPV+CR6E1T4z1qKUkonprGWeh2Gnu5fBi86RQfIfWG3vPsp S3uHmT1gofj0Uw1iivcOCSKfGn2prQRv3XutTvc5+rMPl3UfaR2EoH59sHMr8krpeLNG 3PFyM8q6A1SKxM1w08ifVtODan1/u6LbI980BEUobmYQNCBmk9S4V8iDV7mMgi64Fh5s oILighyvpMnpKjgDt+bYcbthjGd6sZgoK+lVDjnaHBOVy/9uKOXXoWl+8/bB0pvpkpx6 unQ9h+VZZfM6mR3jjdaB+0GH3o7eogJamnLwKEL63YAzgonmJeXdjE2n7UOwvgHOPQwW A2EQ== X-Received: by 10.68.241.228 with SMTP id wl4mr21961525pbc.145.1372057846413; Mon, 24 Jun 2013 00:10:46 -0700 (PDT) Received: from localhost ([203.126.243.116]) by mx.google.com with ESMTPSA id qi1sm18431947pac.21.2013.06.24.00.10.41 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 24 Jun 2013 00:10:45 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Mon, 24 Jun 2013 17:04:43 +1000 Message-Id: <4d86530cfeda55d4429187380df2863be55938d8.1372055322.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.8.3.rc1.44.gb387c77.dirty In-Reply-To: References: X-Gm-Message-State: ALoCoQnV8ks+0XZ6REgxbTfhSNLvuNxh5yGLkHLZtGeb/utV6Ul8MilJrZPEV3vTSR9FB8edoDr6 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::229 Cc: pbonzini@redhat.com, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 20/30] misc/vfio: substitute ->qdev casts with DEVICE() 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 From: Peter Crosthwaite Signed-off-by: Peter Crosthwaite --- hw/misc/vfio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 52fb036..8e3524f 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -3074,7 +3074,7 @@ static int vfio_initfn(PCIDevice *pdev) } } - add_boot_device_path(vdev->bootindex, &pdev->qdev, NULL); + add_boot_device_path(vdev->bootindex, DEVICE(pdev), NULL); return 0; @@ -3108,7 +3108,7 @@ static void vfio_exitfn(PCIDevice *pdev) static void vfio_pci_reset(DeviceState *dev) { - PCIDevice *pdev = DO_UPCAST(PCIDevice, qdev, dev); + PCIDevice *pdev = PCI_DEVICE(dev); VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev); uint16_t cmd;