diff mbox series

virtio: Make virtio_set_qaddr static

Message ID 20191108083550.103476-1-aik@ozlabs.ru
State Accepted
Headers show
Series virtio: Make virtio_set_qaddr static | expand

Commit Message

Alexey Kardashevskiy Nov. 8, 2019, 8:35 a.m. UTC
It is never called outside of virtio, make it static.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
 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(-)

Comments

Alexey Kardashevskiy Nov. 13, 2019, 6:25 a.m. UTC | #1
On 08/11/2019 19:35, Alexey Kardashevskiy wrote:
> It is never called outside of virtio, make it static.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Pushed to master.


> ---
>  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)
>
diff mbox series

Patch

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)