diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:47 -0500 |
| commit | fdef621b5810cf8d6715e04d883a0f3523873014 (patch) | |
| tree | e6979f169764792f0ebd75596dd90f454aca4510 /qemu-common.h | |
| parent | cc92186773df8c9aae8f812fff85e7325e1d7583 (diff) | |
| parent | 58c8cce21c13bddd332590fb1fd9a5c369975d3f (diff) | |
| download | focaccia-qemu-fdef621b5810cf8d6715e04d883a0f3523873014.tar.gz focaccia-qemu-fdef621b5810cf8d6715e04d883a0f3523873014.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: qemu-iotests: Fix 030 after switch to GenericError block: Flush parent to OS with cache=unsafe iscsi: Fix NULL dereferences / races between task completion and abort monitor: Clean up fd sets on monitor disconnect block: Enable qemu_open/close to work with fd sets block: Convert close calls to qemu_close block: Convert open calls to qemu_open block: Prevent detection of /dev/fdset/ as floppy qapi: Introduce add-fd, remove-fd, query-fdsets qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg
Diffstat (limited to 'qemu-common.h')
| -rw-r--r-- | qemu-common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qemu-common.h b/qemu-common.h index 095e28d89a..e5c2bcd204 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -167,6 +167,7 @@ int qemu_fls(int i); int qemu_fdatasync(int fd); int fcntl_setfl(int fd, int flag); int qemu_parse_fd(const char *param); +int qemu_parse_fdset(const char *param); /* * strtosz() suffixes used to specify the default treatment of an @@ -208,6 +209,7 @@ const char *path(const char *pathname); void *qemu_oom_check(void *ptr); int qemu_open(const char *name, int flags, ...); +int qemu_close(int fd); ssize_t qemu_write_full(int fd, const void *buf, size_t count) QEMU_WARN_UNUSED_RESULT; ssize_t qemu_send_full(int fd, const void *buf, size_t count, int flags) |