diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-11 08:43:18 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-11 08:43:18 -0600 |
| commit | fedf2de31023b4ee71a4e578db013976243a8143 (patch) | |
| tree | 045c7ea2a636428ee70545ef3f76a804989be050 /qga | |
| parent | e2848a78b0a6715f94623bdf43ef74d3d08cfe4d (diff) | |
| parent | c02e1eac887b1b0aee7361b1fcf889e7d47fed9d (diff) | |
| download | qemu-fedf2de31023b4ee71a4e578db013976243a8143.tar.gz qemu-fedf2de31023b4ee71a4e578db013976243a8143.tar.bz2 qemu-fedf2de31023b4ee71a4e578db013976243a8143.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
hw/pc.c: Fix converting of ioport_register* to MemoryRegion
Replace remaining gmtime, localtime by gmtime_r, localtime_r
savevm: Remove MinGW specific code which is no longer needed
qga/channel-posix.c: Explicitly include string.h
configure: Fix comment (copy+paste bug)
readline: avoid memcpy() of overlapping regions
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/channel-posix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qga/channel-posix.c b/qga/channel-posix.c index d4fd628907..ca9e4aaaf9 100644 --- a/qga/channel-posix.c +++ b/qga/channel-posix.c @@ -4,6 +4,7 @@ #include <unistd.h> #include <fcntl.h> #include <stdlib.h> +#include <string.h> #include "qemu/osdep.h" #include "qemu/sockets.h" #include "qga/channel.h" |