openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Philippe Mathieu-Daudé 2021-08-23 12:04:54 +02:00 committed by Gerd Hoffmann
parent cdb1fba084
commit b956577af1
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/console.h
View File

@ -471,7 +471,9 @@ bool vnc_display_reload_certs(const char *id, Error **errp);
/* input.c */ /* input.c */
int index_from_key(const char *key, size_t key_length); int index_from_key(const char *key, size_t key_length);
#ifdef CONFIG_LINUX
/* udmabuf.c */ /* udmabuf.c */
int udmabuf_fd(void); int udmabuf_fd(void);
#endif
#endif #endif

6
ui/meson.build
View File

@ -12,12 +12,14 @@ softmmu_ss.add(files(
'kbd-state.c', 'kbd-state.c',
'keymaps.c', 'keymaps.c',
'qemu-pixman.c', 'qemu-pixman.c',
'udmabuf.c',
)) ))
softmmu_ss.add([spice_headers, files('spice-module.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: 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')) softmmu_ss.add(when: cocoa, if_true: files('cocoa.m'))
vnc_ss = ss.source_set() vnc_ss = ss.source_set()

11
ui/udmabuf.c
View File

@ -8,8 +8,6 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "ui/console.h" #include "ui/console.h"
#ifdef CONFIG_LINUX
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -29,12 +27,3 @@ int udmabuf_fd(void)
} }
return udmabuf; return udmabuf;
} }
#else
int udmabuf_fd(void)
{
return -1;
}
#endif