From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE545C433F5 for ; Tue, 28 Sep 2021 13:36:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FC8160FC0 for ; Tue, 28 Sep 2021 13:36:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8FC8160FC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:45170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVDHs-0004xT-Nn for qemu-devel@archiver.kernel.org; Tue, 28 Sep 2021 09:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVCxv-00078w-G2 for qemu-devel@nongnu.org; Tue, 28 Sep 2021 09:16:11 -0400 Received: from bhuna.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e3e3]:46706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVCxk-0006sI-1Q for qemu-devel@nongnu.org; Tue, 28 Sep 2021 09:16:11 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: fahien) with ESMTPSA id F088C1F43B6E From: Antonio Caggiano To: qemu-devel@nongnu.org Subject: [RFC 3/3] virtio: Fix shared memory capability Date: Tue, 28 Sep 2021 15:15:48 +0200 Message-Id: <20210928131548.72005-4-antonio.caggiano@collabora.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210928131548.72005-1-antonio.caggiano@collabora.com> References: <20210928131548.72005-1-antonio.caggiano@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1098:0:82:1000:25:2eeb:e3e3; envelope-from=antonio.caggiano@collabora.com; helo=bhuna.collabora.co.uk X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Remove virtio_pci_shm_cap as virtio_pci_cap64 should be used instead. Signed-off-by: Antonio Caggiano --- hw/virtio/virtio-pci.c | 4 ++-- include/standard-headers/linux/virtio_pci.h | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 9c7b8942c8..200f1e38ef 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1166,7 +1166,7 @@ int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy, uint8_t bar, uint64_t offset, uint64_t length, uint8_t id) { - struct virtio_pci_shm_cap cap = { + struct virtio_pci_cap64 cap = { .cap.cap_len = sizeof cap, .cap.cfg_type = VIRTIO_PCI_CAP_SHARED_MEMORY_CFG, }; @@ -1177,7 +1177,7 @@ int virtio_pci_add_shm_cap(VirtIOPCIProxy *proxy, cap.length_hi = cpu_to_le32((length >> 32) & mask32); cap.cap.offset = cpu_to_le32(offset & mask32); cap.offset_hi = cpu_to_le32((offset >> 32) & mask32); - cap.id = id; + cap.cap.id = id; return virtio_pci_add_mem_cap(proxy, &cap.cap); } diff --git a/include/standard-headers/linux/virtio_pci.h b/include/standard-headers/linux/virtio_pci.h index 85d1420d29..db7a8e2fcb 100644 --- a/include/standard-headers/linux/virtio_pci.h +++ b/include/standard-headers/linux/virtio_pci.h @@ -172,13 +172,6 @@ struct virtio_pci_cfg_cap { uint8_t pci_cfg_data[4]; /* Data for BAR access. */ }; -struct virtio_pci_shm_cap { - struct virtio_pci_cap cap; - uint32_t offset_hi; /* Most sig 32 bits of offset */ - uint32_t length_hi; /* Most sig 32 bits of length */ - uint8_t id; /* To distinguish shm chunks */ -}; - /* Macro versions of offsets for the Old Timers! */ #define VIRTIO_PCI_CAP_VNDR 0 #define VIRTIO_PCI_CAP_NEXT 1 -- 2.30.2