diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-08-23 12:04:54 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2021-08-31 14:31:43 +0200 |
| commit | b956577af1b88e950bf2aa5f77be6c8aee04e879 (patch) | |
| tree | 15442c98c1e10ffedf5e409586aa8990d75d8b63 | |
| parent | cdb1fba0844bb1db71f67d35700a80838d185bbd (diff) | |
| download | focaccia-qemu-b956577af1b88e950bf2aa5f77be6c8aee04e879.tar.gz focaccia-qemu-b956577af1b88e950bf2aa5f77be6c8aee04e879.zip | |
ui/console: Restrict udmabuf_fd() to Linux
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>
Diffstat (limited to '')
| -rw-r--r-- | include/ui/console.h | 2 | ||||
| -rw-r--r-- | ui/meson.build | 6 | ||||
| -rw-r--r-- | ui/udmabuf.c | 11 |
3 files changed, 6 insertions, 13 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index b30b63976a..3be21497a2 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/meson.build b/ui/meson.build index a3a187d633..7d25c1b95b 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() diff --git a/ui/udmabuf.c b/ui/udmabuf.c index 23abe1e7eb..cebceb2610 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 |