diff options
author | Erel Geron <erelx.geron@intel.com> | 2019-09-11 08:51:20 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2019-09-15 15:37:15 -0400 |
commit | 5d38f324993f49d1226ec81efe045834b46cd85a (patch) | |
tree | c5f412c7bbffa5d9778b13f37563805e69d5bfe6 /arch/um/include | |
parent | 851b6cb17c9912bc0cb452e477c04542b01db51b (diff) |
um: drivers: Add virtio vhost-user driver
This module allows virtio devices to be used over a vhost-user socket.
Signed-off-by: Erel Geron <erelx.geron@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/asm/irq.h | 5 | ||||
-rw-r--r-- | arch/um/include/shared/os.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/um/include/asm/irq.h b/arch/um/include/asm/irq.h index ce7a78c3bcf2..42c6205e2dc4 100644 --- a/arch/um/include/asm/irq.h +++ b/arch/um/include/asm/irq.h | |||
@@ -17,17 +17,18 @@ | |||
17 | #define TELNETD_IRQ 12 | 17 | #define TELNETD_IRQ 12 |
18 | #define XTERM_IRQ 13 | 18 | #define XTERM_IRQ 13 |
19 | #define RANDOM_IRQ 14 | 19 | #define RANDOM_IRQ 14 |
20 | #define VIRTIO_IRQ 15 | ||
20 | 21 | ||
21 | #ifdef CONFIG_UML_NET_VECTOR | 22 | #ifdef CONFIG_UML_NET_VECTOR |
22 | 23 | ||
23 | #define VECTOR_BASE_IRQ 15 | 24 | #define VECTOR_BASE_IRQ (VIRTIO_IRQ + 1) |
24 | #define VECTOR_IRQ_SPACE 8 | 25 | #define VECTOR_IRQ_SPACE 8 |
25 | 26 | ||
26 | #define LAST_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ - 1) | 27 | #define LAST_IRQ (VECTOR_IRQ_SPACE + VECTOR_BASE_IRQ - 1) |
27 | 28 | ||
28 | #else | 29 | #else |
29 | 30 | ||
30 | #define LAST_IRQ RANDOM_IRQ | 31 | #define LAST_IRQ VIRTIO_IRQ |
31 | 32 | ||
32 | #endif | 33 | #endif |
33 | 34 | ||
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index fa1909365666..d542dadcf22e 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h | |||
@@ -36,6 +36,8 @@ | |||
36 | #define OS_LIB_PATH "/usr/lib/" | 36 | #define OS_LIB_PATH "/usr/lib/" |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #define OS_SENDMSG_MAX_FDS 8 | ||
40 | |||
39 | /* | 41 | /* |
40 | * types taken from stat_file() in hostfs_user.c | 42 | * types taken from stat_file() in hostfs_user.c |
41 | * (if they are wrong here, they are wrong there...). | 43 | * (if they are wrong here, they are wrong there...). |
@@ -176,6 +178,9 @@ extern unsigned os_major(unsigned long long dev); | |||
176 | extern unsigned os_minor(unsigned long long dev); | 178 | extern unsigned os_minor(unsigned long long dev); |
177 | extern unsigned long long os_makedev(unsigned major, unsigned minor); | 179 | extern unsigned long long os_makedev(unsigned major, unsigned minor); |
178 | extern int os_falloc_punch(int fd, unsigned long long offset, int count); | 180 | extern int os_falloc_punch(int fd, unsigned long long offset, int count); |
181 | extern int os_eventfd(unsigned int initval, int flags); | ||
182 | extern int os_sendmsg_fds(int fd, const void *buf, unsigned int len, | ||
183 | const int *fds, unsigned int fds_num); | ||
179 | 184 | ||
180 | /* start_up.c */ | 185 | /* start_up.c */ |
181 | extern void os_early_checks(void); | 186 | extern void os_early_checks(void); |