[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/6] ui/console: Restrict udmabuf_fd() to Linux
From: |
Gerd Hoffmann |
Subject: |
[PULL 3/6] ui/console: Restrict udmabuf_fd() to Linux |
Date: |
Wed, 1 Sep 2021 06:19:00 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210823100454.615816-3-philmd@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/console.h | 2 ++
ui/udmabuf.c | 11 -----------
ui/meson.build | 6 ++++--
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index b30b63976a5a..3be21497a2e8 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -471,7 +471,9 @@ bool vnc_display_reload_certs(const char *id, Error
**errp);
/* input.c */
int index_from_key(const char *key, size_t key_length);
+#ifdef CONFIG_LINUX
/* udmabuf.c */
int udmabuf_fd(void);
+#endif
#endif
diff --git a/ui/udmabuf.c b/ui/udmabuf.c
index 23abe1e7eb91..cebceb261001 100644
--- a/ui/udmabuf.c
+++ b/ui/udmabuf.c
@@ -8,8 +8,6 @@
#include "qapi/error.h"
#include "ui/console.h"
-#ifdef CONFIG_LINUX
-
#include <fcntl.h>
#include <sys/ioctl.h>
@@ -29,12 +27,3 @@ int udmabuf_fd(void)
}
return udmabuf;
}
-
-#else
-
-int udmabuf_fd(void)
-{
- return -1;
-}
-
-#endif
diff --git a/ui/meson.build b/ui/meson.build
index a3a187d633ab..7d25c1b95b5f 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -12,12 +12,14 @@ softmmu_ss.add(files(
'kbd-state.c',
'keymaps.c',
'qemu-pixman.c',
- 'udmabuf.c',
))
softmmu_ss.add([spice_headers, files('spice-module.c')])
softmmu_ss.add(when: spice_protocol, if_true: files('vdagent.c'))
-softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c'))
+softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files(
+ 'input-linux.c',
+ 'udmabuf.c',
+))
softmmu_ss.add(when: cocoa, if_true: files('cocoa.m'))
vnc_ss = ss.source_set()
--
2.31.1
- [PULL 0/6] Vga 20210901 patches, Gerd Hoffmann, 2021/09/01
- [PULL 1/6] virtio-gpu: no point of checking res->iov, Gerd Hoffmann, 2021/09/01
- [PULL 2/6] hw/display: Restrict virtio-gpu-udmabuf stubs to !Linux, Gerd Hoffmann, 2021/09/01
- [PULL 3/6] ui/console: Restrict udmabuf_fd() to Linux,
Gerd Hoffmann <=
- [PULL 5/6] hw/display/xlnx_dp: fix an out-of-bounds read in xlnx_dp_read, Gerd Hoffmann, 2021/09/01
- [PULL 4/6] vga: don't abort when adding a duplicate isa-vga device, Gerd Hoffmann, 2021/09/01
- [PULL 6/6] hw/display/artist: Fix bug in coordinate extraction in artist_vram_read() and artist_vram_write(), Gerd Hoffmann, 2021/09/01
- Re: [PULL 0/6] Vga 20210901 patches, Peter Maydell, 2021/09/01