mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-10-29 15:19:18 +01:00
parent d249e1fc4f
commit 0100fbbe73
5 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cutils.c
View File

@ -280,11 +280,6 @@ int qemu_parse_fd(const char *param)
return fd; return fd;
} }
int qemu_parse_fdset(const char *param)
{
return qemu_parse_fd(param);
}
/* round down to the nearest power of 2*/ /* round down to the nearest power of 2*/
int64_t pow2floor(int64_t value) int64_t pow2floor(int64_t value)
{ {

30
osdep.c
View File

@ -144,6 +144,11 @@ fail:
errno = serrno; errno = serrno;
return -1; return -1;
} }
static int qemu_parse_fdset(const char *param)
{
return qemu_parse_fd(param);
}
#endif #endif
/* /*
@ -404,3 +409,28 @@ bool fips_get_state(void)
{ {
return fips_enabled; return fips_enabled;
} }
static int default_fdset_get_fd(int64_t fdset_id, int flags)
{
return -1;
}
QEMU_WEAK_ALIAS(monitor_fdset_get_fd, default_fdset_get_fd);
static int default_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
{
return -1;
}
QEMU_WEAK_ALIAS(monitor_fdset_dup_fd_add, default_fdset_dup_fd_add);
static int default_fdset_dup_fd_remove(int dup_fd)
{
return -1;
}
QEMU_WEAK_ALIAS(monitor_fdset_dup_fd_remove, default_fdset_dup_fd_remove);
static int default_fdset_dup_fd_find(int dup_fd)
{
return -1;
}
QEMU_WEAK_ALIAS(monitor_fdset_dup_fd_find, default_fdset_dup_fd_find);

1
qemu-common.h
View File

@ -167,7 +167,6 @@ int qemu_fls(int i);
int qemu_fdatasync(int fd); int qemu_fdatasync(int fd);
int fcntl_setfl(int fd, int flag); int fcntl_setfl(int fd, int flag);
int qemu_parse_fd(const char *param); int qemu_parse_fd(const char *param);
int qemu_parse_fdset(const char *param);
/* /*
* strtosz() suffixes used to specify the default treatment of an * strtosz() suffixes used to specify the default treatment of an

20
qemu-tool.c
View File

@ -68,26 +68,6 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
{ {
} }
int monitor_fdset_get_fd(int64_t fdset_id, int flags)
{
return -1;
}
int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
{
return -1;
}
int monitor_fdset_dup_fd_remove(int dup_fd)
{
return -1;
}
int monitor_fdset_dup_fd_find(int dup_fd)
{
return -1;
}
int64_t cpu_get_clock(void) int64_t cpu_get_clock(void)
{ {
return qemu_get_clock_ns(rt_clock); return qemu_get_clock_ns(rt_clock);

20
qemu-user.c
View File

@ -35,23 +35,3 @@ void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
void monitor_set_error(Monitor *mon, QError *qerror) void monitor_set_error(Monitor *mon, QError *qerror)
{ {
} }
int monitor_fdset_get_fd(int64_t fdset_id, int flags)
{
return -1;
}
int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
{
return -1;
}
int monitor_fdset_dup_fd_remove(int dup_fd)
{
return -1;
}
int monitor_fdset_dup_fd_find(int dup_fd)
{
return -1;
}