aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-04-11 09:23:09 -0700
committerAndroid Code Review <code-review@android.com>2011-04-11 09:23:09 -0700
commitc8feef0f01aac2c92191bd00980b3adb2a2069a8 (patch)
tree3ce0c62055caf80058f7636f2fdc7d5bb41de55b
parentf884a49c27189c97718d33b38092d4ec0f3c8237 (diff)
parent1ca833c1638c8b48a1f373abbcbb88bc8bf8aed9 (diff)
downloadexternal_qemu-c8feef0f01aac2c92191bd00980b3adb2a2069a8.zip
external_qemu-c8feef0f01aac2c92191bd00980b3adb2a2069a8.tar.gz
external_qemu-c8feef0f01aac2c92191bd00980b3adb2a2069a8.tar.bz2
Merge "hw/android_arm.c: Initialize qemud pipes properly."
-rw-r--r--hw/android_arm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/android_arm.c b/hw/android_arm.c
index 664ae36..806d9bd 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -21,11 +21,13 @@
#include "arm-misc.h"
#include "console.h"
#include "blockdev.h"
+#include "goldfish_pipe.h"
#ifdef CONFIG_MEMCHECK
#include "memcheck/memcheck_api.h"
#endif // CONFIG_MEMCHECK
#include "android/utils/debug.h"
+#include "android/hw-qemud-pipe.h"
#define D(...) VERBOSE_PRINT(init,__VA_ARGS__)
@@ -157,6 +159,8 @@ static void android_arm_init_(ram_addr_t ram_size,
}
#endif
+ init_qemud_pipes();
+
#if TEST_SWITCH
{
void *sw;