diff options
| author | Michael S. Tsirkin | 2011-06-14 16:51:11 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-06-15 17:27:15 +0200 |
| commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /qemu-char.c | |
| parent | print meaningful error message in case of --disable-vhost-net (diff) | |
| parent | configure: Detect and don't try to use older libcurl (diff) | |
| download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c index 5e04a20b8c..fb13b28454 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -35,7 +35,6 @@ #include <unistd.h> #include <fcntl.h> -#include <signal.h> #include <time.h> #include <errno.h> #include <sys/time.h> |