[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/2] ui/console: Restrict udmabuf_fd() to Linux
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
[PATCH v2 2/2] ui/console: Restrict udmabuf_fd() to Linux |
|
Date: |
Mon, 23 Aug 2021 12:04:54 +0200 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@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 b30b63976a5..3be21497a2e 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 23abe1e7eb9..cebceb26100 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 a3a187d633a..7d25c1b95b5 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -12,12 +12,14 @@
'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