 84a5a80148
			
		
	
	
		84a5a80148
		
	
	
	
	
		
			
			* Chardev fix from Marc-André * config.status tweak from David * Header file tweaks from Markus, myself and Veronia (Outreachy candidate) * get_ticks_per_sec() removal from Rutuja (Outreachy candidate) * Coverity fix from myself * PKE implementation from myself, based on rth's XSAVE support -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJW9ErPAAoJEL/70l94x66DJfEH/A/QkMpAhrgNdyVsahzsGrzE wx5gHFIc1nBYxyr62w4apUb5jPB7zaXu0LA7EAWDeAe0pyP8hZzLT9kJyOEDsuJu zwKN2QeLSNMtPbnbKN0I/YQ2za2xX1V5ruhSeOJoVslUI214hgnAURaGshhQNzuZ 2CluDT9KgL5cQifAnKs5kJrwhIYShYNQB+1eDC/7wk28dd/EH+sPALIoF+rqrSmt Zu4Mdqd+9Ns+oKOjA6br9ULq/Hzg0aDfY82J+XLVVqfF3PXQe8rTDmuMf/7jTn+M Un7ZOcei9oZF2/9vfAfKQpDCcgD9HvOUSbgqV/ubmkPPmN/LNJzeKj0fBhrRN+Y= =K12D -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * Log filtering from Alex and Peter * Chardev fix from Marc-André * config.status tweak from David * Header file tweaks from Markus, myself and Veronia (Outreachy candidate) * get_ticks_per_sec() removal from Rutuja (Outreachy candidate) * Coverity fix from myself * PKE implementation from myself, based on rth's XSAVE support # gpg: Signature made Thu 24 Mar 2016 20:15:11 GMT using RSA key ID 78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" * remotes/bonzini/tags/for-upstream: (28 commits) target-i386: implement PKE for TCG config.status: Pass extra parameters char: translate from QIOChannel error to errno exec: fix error handling in file_ram_alloc cputlb: modernise the debug support qemu-log: support simple pid substitution for logs target-arm: dfilter support for in_asm qemu-log: dfilter-ise exec, out_asm, op and opt_op qemu-log: new option -dfilter to limit output qemu-log: Improve the "exec" TB execution logging qemu-log: Avoid function call for disabled qemu_log_mask logging qemu-log: correct help text for -d cpu tcg: pass down TranslationBlock to tcg_code_gen util: move declarations out of qemu-common.h Replaced get_tick_per_sec() by NANOSECONDS_PER_SECOND hw: explicitly include qemu-common.h and cpu.h include/crypto: Include qapi-types.h or qemu/bswap.h instead of qemu-common.h isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h Move ParallelIOArg from qemu-common.h to sysemu/char.h Move QEMU_ALIGN_*() from qemu-common.h to qemu/osdep.h ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Conflicts: scripts/clean-includes
		
			
				
	
	
		
			131 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			131 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * event notifier support
 | |
|  *
 | |
|  * Copyright Red Hat, Inc. 2010
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Michael S. Tsirkin <mst@redhat.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qemu-common.h"
 | |
| #include "qemu/cutils.h"
 | |
| #include "qemu/event_notifier.h"
 | |
| #include "sysemu/char.h"
 | |
| #include "qemu/main-loop.h"
 | |
| 
 | |
| #ifdef CONFIG_EVENTFD
 | |
| #include <sys/eventfd.h>
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_EVENTFD
 | |
| /*
 | |
|  * Initialize @e with existing file descriptor @fd.
 | |
|  * @fd must be a genuine eventfd object, emulation with pipe won't do.
 | |
|  */
 | |
| void event_notifier_init_fd(EventNotifier *e, int fd)
 | |
| {
 | |
|     e->rfd = fd;
 | |
|     e->wfd = fd;
 | |
| }
 | |
| #endif
 | |
| 
 | |
| int event_notifier_init(EventNotifier *e, int active)
 | |
| {
 | |
|     int fds[2];
 | |
|     int ret;
 | |
| 
 | |
| #ifdef CONFIG_EVENTFD
 | |
|     ret = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
 | |
| #else
 | |
|     ret = -1;
 | |
|     errno = ENOSYS;
 | |
| #endif
 | |
|     if (ret >= 0) {
 | |
|         e->rfd = e->wfd = ret;
 | |
|     } else {
 | |
|         if (errno != ENOSYS) {
 | |
|             return -errno;
 | |
|         }
 | |
|         if (qemu_pipe(fds) < 0) {
 | |
|             return -errno;
 | |
|         }
 | |
|         ret = fcntl_setfl(fds[0], O_NONBLOCK);
 | |
|         if (ret < 0) {
 | |
|             ret = -errno;
 | |
|             goto fail;
 | |
|         }
 | |
|         ret = fcntl_setfl(fds[1], O_NONBLOCK);
 | |
|         if (ret < 0) {
 | |
|             ret = -errno;
 | |
|             goto fail;
 | |
|         }
 | |
|         e->rfd = fds[0];
 | |
|         e->wfd = fds[1];
 | |
|     }
 | |
|     if (active) {
 | |
|         event_notifier_set(e);
 | |
|     }
 | |
|     return 0;
 | |
| 
 | |
| fail:
 | |
|     close(fds[0]);
 | |
|     close(fds[1]);
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| void event_notifier_cleanup(EventNotifier *e)
 | |
| {
 | |
|     if (e->rfd != e->wfd) {
 | |
|         close(e->rfd);
 | |
|     }
 | |
|     close(e->wfd);
 | |
| }
 | |
| 
 | |
| int event_notifier_get_fd(const EventNotifier *e)
 | |
| {
 | |
|     return e->rfd;
 | |
| }
 | |
| 
 | |
| int event_notifier_set_handler(EventNotifier *e,
 | |
|                                EventNotifierHandler *handler)
 | |
| {
 | |
|     qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int event_notifier_set(EventNotifier *e)
 | |
| {
 | |
|     static const uint64_t value = 1;
 | |
|     ssize_t ret;
 | |
| 
 | |
|     do {
 | |
|         ret = write(e->wfd, &value, sizeof(value));
 | |
|     } while (ret < 0 && errno == EINTR);
 | |
| 
 | |
|     /* EAGAIN is fine, a read must be pending.  */
 | |
|     if (ret < 0 && errno != EAGAIN) {
 | |
|         return -errno;
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int event_notifier_test_and_clear(EventNotifier *e)
 | |
| {
 | |
|     int value;
 | |
|     ssize_t len;
 | |
|     char buffer[512];
 | |
| 
 | |
|     /* Drain the notify pipe.  For eventfd, only 8 bytes will be read.  */
 | |
|     value = 0;
 | |
|     do {
 | |
|         len = read(e->rfd, buffer, sizeof(buffer));
 | |
|         value |= (len > 0);
 | |
|     } while ((len == -1 && errno == EINTR) || len == sizeof(buffer));
 | |
| 
 | |
|     return value;
 | |
| }
 |