From patchwork Sat Nov 3 15:41:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10666681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62C4A14E2 for ; Sat, 3 Nov 2018 15:42:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F2A72A285 for ; Sat, 3 Nov 2018 15:42:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EDF32A28C; Sat, 3 Nov 2018 15:42:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8B7072A285 for ; Sat, 3 Nov 2018 15:42:14 +0000 (UTC) Received: from localhost ([::1]:55985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIy3x-00087h-22 for patchwork-qemu-devel@patchwork.kernel.org; Sat, 03 Nov 2018 11:42:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIy3F-0007p9-51 for qemu-devel@nongnu.org; Sat, 03 Nov 2018 11:41:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIy39-0001iK-CU for qemu-devel@nongnu.org; Sat, 03 Nov 2018 11:41:27 -0400 Received: from m12-11.163.com ([220.181.12.11]:47946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIy35-0001Fv-UL for qemu-devel@nongnu.org; Sat, 03 Nov 2018 11:41:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=cnYyzdYm3evFMLNXdU EZHH2yZAJ/b00nITug59ek2SI=; b=SAUmDfjQpZI1F8MyFmW5e8Jh5+B/CNtIqD B4B02ne1pomqtiHEs/+5zhxIfGcxQbMypJup3hjHeN8qynpp+kYnWrN++iEsVyb2 Z6nP2EQtjZx2NgEJqjIBT8QqpyYKOn88/dNu3y3l3tq0ad25AmL1+1PbVEQBRl6W jy1fXgCnw= Received: from ubuntu.localdomain (unknown [115.204.245.177]) by smtp7 (Coremail) with SMTP id C8CowAD3CGqSwd1bFv+6Gg--.34259S2; Sat, 03 Nov 2018 23:41:07 +0800 (CST) From: Li Qiang To: mst@redhat.com Date: Sat, 3 Nov 2018 08:41:04 -0700 Message-Id: <20181103154104.69228-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: C8CowAD3CGqSwd1bFv+6Gg--.34259S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wry8urWkWF4rCrWkuFyDWrg_yoWkAFc_ZF yUA3y3KryDZF4j93y3Aw4fJr18C3ZxuF4kGr13trZYk343J3yDJw1xZF9rWr97Wa18AFyj krZYgrn8u3WSkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRKHUDJUUUUU== X-Originating-IP: [115.204.245.177] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBoRPzbVQHCSpk+gAAsC X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.11 Subject: [Qemu-devel] [PATCH] hw: virtio-pci: drop DO_UPCAST 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use VIRTIO_PCI MACRO instead. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daudé --- hw/virtio/virtio-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index a954799267..277dc20c81 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -597,7 +597,7 @@ virtio_address_space_read(VirtIOPCIProxy *proxy, hwaddr addr, static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); struct virtio_pci_cfg_cap *cfg; @@ -630,7 +630,7 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, static uint32_t virtio_read_config(PCIDevice *pci_dev, uint32_t address, int len) { - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev); struct virtio_pci_cfg_cap *cfg; if (proxy->config_cap &&