From patchwork Fri Nov 8 08:35:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 1191715 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 478YWl0SkNz9sP3 for ; Fri, 8 Nov 2019 19:36:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.ru Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 478YWk5lVFzF6pT for ; Fri, 8 Nov 2019 19:36:02 +1100 (AEDT) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.ru (client-ip=107.174.27.60; helo=ozlabs.ru; envelope-from=aik@ozlabs.ru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.ru X-Greylist: delayed 66 seconds by postgrey-1.36 at bilbo; Fri, 08 Nov 2019 19:35:54 AEDT Received: from ozlabs.ru (unknown [107.174.27.60]) by lists.ozlabs.org (Postfix) with ESMTP id 478YWZ1xZfzF6pK for ; Fri, 8 Nov 2019 19:35:54 +1100 (AEDT) Received: from fstn1-p1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 9A518AE80809; Fri, 8 Nov 2019 03:35:00 -0500 (EST) From: Alexey Kardashevskiy To: slof@lists.ozlabs.org Date: Fri, 8 Nov 2019 19:35:50 +1100 Message-Id: <20191108083550.103476-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.17.1 Subject: [SLOF] [PATCH slof] virtio: Make virtio_set_qaddr static X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" It is never called outside of virtio, make it static. Signed-off-by: Alexey Kardashevskiy --- lib/libvirtio/virtio.h | 1 - lib/libvirtio/virtio.c | 2 +- lib/libvirtio/virtio.code | 8 -------- lib/libvirtio/virtio.in | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/libvirtio/virtio.h b/lib/libvirtio/virtio.h index 389355c0c30a..b65c716e88c9 100644 --- a/lib/libvirtio/virtio.h +++ b/lib/libvirtio/virtio.h @@ -117,7 +117,6 @@ extern void virtio_reset_device(struct virtio_device *dev); extern void virtio_queue_notify(struct virtio_device *dev, int queue); extern void virtio_set_status(struct virtio_device *dev, int status); extern void virtio_get_status(struct virtio_device *dev, int *status); -extern void virtio_set_qaddr(struct virtio_device *dev, int queue, unsigned long qaddr); extern void virtio_set_guest_features(struct virtio_device *dev, uint64_t features); extern uint64_t virtio_get_host_features(struct virtio_device *dev); extern int virtio_negotiate_guest_features(struct virtio_device *dev, uint64_t features); diff --git a/lib/libvirtio/virtio.c b/lib/libvirtio/virtio.c index 02cfed95dcbc..4b9457cc7093 100644 --- a/lib/libvirtio/virtio.c +++ b/lib/libvirtio/virtio.c @@ -360,7 +360,7 @@ void virtio_queue_notify(struct virtio_device *dev, int queue) /** * Set queue address */ -void virtio_set_qaddr(struct virtio_device *dev, int queue, unsigned long qaddr) +static void virtio_set_qaddr(struct virtio_device *dev, int queue, unsigned long qaddr) { if (dev->is_modern) { uint64_t q_desc = qaddr; diff --git a/lib/libvirtio/virtio.code b/lib/libvirtio/virtio.code index d52a47d50f06..db3ed600f405 100644 --- a/lib/libvirtio/virtio.code +++ b/lib/libvirtio/virtio.code @@ -42,14 +42,6 @@ PRIM(virtio_X2d_get_X2d_config) TOS.u = virtio_get_config(TOS.a, offset, size); MIRP -// : virtio-set-qaddr ( dev queue qaddr -- ) -PRIM(virtio_X2d_set_X2d_qaddr) - unsigned int qaddr = TOS.u; POP; - int queue = TOS.u; POP; - void *dev = TOS.a; POP; - virtio_set_qaddr(dev, queue, qaddr); -MIRP - /******** virtio-blk ********/ // : virtio-blk-init ( dev -- blk-size) diff --git a/lib/libvirtio/virtio.in b/lib/libvirtio/virtio.in index 41a9cd0e2fdb..5c96c7d0d16e 100644 --- a/lib/libvirtio/virtio.in +++ b/lib/libvirtio/virtio.in @@ -15,7 +15,6 @@ cod(virtio-setup-vd) cod(virtio-vring-size) cod(virtio-get-qsize) cod(virtio-get-config) -cod(virtio-set-qaddr) cod(virtio-blk-init) cod(virtio-blk-shutdown)