From e7c1f35024c392f5c812d23c36a46469a2d26861 Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Mon, 5 May 2025 17:42:56 +0300 Subject: [PATCH] virtio/vpipe: Correct vdrm_vpipe_connect() definition The vdrm_vpipe_connect() prototype defined in vdrm.c doesn't match vdrm_vpipe_connect() defined in vdrm_vpipe.c. This leads to a compilation warning about the wrong proto when Mesa linked with enabled LTO. Fix the vdrm_vpipe_connect() definition. Fixes: bf0e3d6274ba ("virtio/vdrm: Add vtest backend") Signed-off-by: Dmitry Osipenko Part-of: (cherry picked from commit daad392d5c3c4f8887b6792c45ad183164e501b5) --- .pick_status.json | 2 +- src/virtio/vdrm/vdrm_vpipe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 54fae9fd1ec..32236951c37 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -94,7 +94,7 @@ "description": "virtio/vpipe: Correct vdrm_vpipe_connect() definition", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "bf0e3d6274bac0190a6d4d90afbd2a9a6bec249d", "notes": null diff --git a/src/virtio/vdrm/vdrm_vpipe.c b/src/virtio/vdrm/vdrm_vpipe.c index cd5e872c585..b9bacb45b30 100644 --- a/src/virtio/vdrm/vdrm_vpipe.c +++ b/src/virtio/vdrm/vdrm_vpipe.c @@ -774,10 +774,10 @@ init_shmem(struct vpipe_device *vtdev) return 0; } -struct vdrm_device * vdrm_vpipe_connect(int fd, uint32_t context_type); +struct vdrm_device * vdrm_vpipe_connect(uint32_t context_type); struct vdrm_device * -vdrm_vpipe_connect(int fd, uint32_t context_type) +vdrm_vpipe_connect(uint32_t context_type) { struct vpipe_device *vtdev; struct vdrm_device *vdev = NULL;