1c306606ca
qemu stable release 1.4.1 (bz 952599) CVE-2013-1922: qemu-nbd block format auto-detection vulnerability (bz 952574, bz 923219)
75 lines
2.0 KiB
Diff
75 lines
2.0 KiB
Diff
From 64080f1b8983660b707ed8c0d10ace22e9b46f7a Mon Sep 17 00:00:00 2001
|
|
From: Amit Shah <amit.shah@redhat.com>
|
|
Date: Mon, 21 Mar 2011 20:32:58 +0100
|
|
Subject: [PATCH] iohandlers: Add enable/disable_write_fd_handler() functions
|
|
|
|
These will be used to provide a cleaner API for the nonblocking case.
|
|
|
|
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
---
|
|
include/qemu/main-loop.h | 3 +++
|
|
iohandler.c | 35 +++++++++++++++++++++++++++++++++++
|
|
2 files changed, 38 insertions(+)
|
|
|
|
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
|
|
index e8059c3..faaf47d 100644
|
|
--- a/include/qemu/main-loop.h
|
|
+++ b/include/qemu/main-loop.h
|
|
@@ -166,6 +166,9 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
|
|
typedef void IOReadHandler(void *opaque, const uint8_t *buf, int size);
|
|
typedef int IOCanReadHandler(void *opaque);
|
|
|
|
+void enable_write_fd_handler(int fd, IOHandler *fd_write);
|
|
+void disable_write_fd_handler(int fd);
|
|
+
|
|
/**
|
|
* qemu_set_fd_handler2: Register a file descriptor with the main loop
|
|
*
|
|
diff --git a/iohandler.c b/iohandler.c
|
|
index 2523adc..a49cfd4 100644
|
|
--- a/iohandler.c
|
|
+++ b/iohandler.c
|
|
@@ -45,6 +45,41 @@ typedef struct IOHandlerRecord {
|
|
static QLIST_HEAD(, IOHandlerRecord) io_handlers =
|
|
QLIST_HEAD_INITIALIZER(io_handlers);
|
|
|
|
+static IOHandlerRecord *find_iohandler(int fd)
|
|
+{
|
|
+ IOHandlerRecord *ioh;
|
|
+
|
|
+ QLIST_FOREACH(ioh, &io_handlers, next) {
|
|
+ if (ioh->fd == fd) {
|
|
+ return ioh;
|
|
+ }
|
|
+ }
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
+void enable_write_fd_handler(int fd, IOHandler *fd_write)
|
|
+{
|
|
+ IOHandlerRecord *ioh;
|
|
+
|
|
+ ioh = find_iohandler(fd);
|
|
+ if (!ioh) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ ioh->fd_write = fd_write;
|
|
+}
|
|
+
|
|
+void disable_write_fd_handler(int fd)
|
|
+{
|
|
+ IOHandlerRecord *ioh;
|
|
+
|
|
+ ioh = find_iohandler(fd);
|
|
+ if (!ioh) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ ioh->fd_write = NULL;
|
|
+}
|
|
|
|
/* XXX: fd_read_poll should be suppressed, but an API change is
|
|
necessary in the character devices to suppress fd_can_read(). */
|