diff options
| author | Evgeny Voevodin <e.voevodin@samsung.com> | 2012-06-25 09:46:03 +0400 |
|---|---|---|
| committer | Evgeny Voevodin <e.voevodin@samsung.com> | 2012-06-27 14:44:32 +0400 |
| commit | ca2ea4ae5701205908bb8d659b9fe6a7665fc561 (patch) | |
| tree | 20fc42141e6fa3f705e753691c87f1d82c8285fb /tizen/src/guest_server.c | |
| parent | 0e6e3e4d48c948603c1a1a34de860847879cddf9 (diff) | |
| download | qemu-ca2ea4ae5701205908bb8d659b9fe6a7665fc561.tar.gz qemu-ca2ea4ae5701205908bb8d659b9fe6a7665fc561.tar.bz2 qemu-ca2ea4ae5701205908bb8d659b9fe6a7665fc561.zip | |
Merge remote-tracking branch 'score/develop' into tizen-arm-v1.1.0
Conflicts:
hw/pc.c
Restored bios failure message.
It's generated in hw/pc_sysfw.c.
Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Diffstat (limited to 'tizen/src/guest_server.c')
| -rw-r--r-- | tizen/src/guest_server.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tizen/src/guest_server.c b/tizen/src/guest_server.c index 79b7958ea2..6340706537 100644 --- a/tizen/src/guest_server.c +++ b/tizen/src/guest_server.c @@ -29,6 +29,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <unistd.h> #include <stdint.h> |