diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-10-26 19:41:01 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-10-26 19:41:01 -0700 |
| commit | a52dba6f99397568ca844b5cc18e1cf14d787e1b (patch) | |
| tree | ad7b088dbbf2fd894e11177ee9ad2a044d069164 | |
| parent | 223f0142c5be9d9c9006d9ba8af9b3a54aa73fb6 (diff) | |
| parent | dc46820125f5eaa0191193f5b71afba5f4915607 (diff) | |
| download | external_qemu-a52dba6f99397568ca844b5cc18e1cf14d787e1b.zip external_qemu-a52dba6f99397568ca844b5cc18e1cf14d787e1b.tar.gz external_qemu-a52dba6f99397568ca844b5cc18e1cf14d787e1b.tar.bz2 | |
Merge "Allow OS X emulator to open host /dev/ devices."
| -rw-r--r-- | qemu-char-android.c | 11 | ||||
| -rw-r--r-- | vl-android.c | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/qemu-char-android.c b/qemu-char-android.c index 4074ea6..f97f9e8 100644 --- a/qemu-char-android.c +++ b/qemu-char-android.c @@ -891,9 +891,7 @@ static void cfmakeraw (struct termios *termios_p) } #endif -#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \ - || defined(__GLIBC__) +#ifndef _WIN32 typedef struct { int fd; @@ -1262,12 +1260,12 @@ static CharDriverState *qemu_chr_open_tty(const char *filename) qemu_chr_reset(chr); return chr; } -#else /* ! __linux__ && ! __sun__ */ +#else /* _WIN32 */ static CharDriverState *qemu_chr_open_pty(void) { return NULL; } -#endif /* __linux__ || __sun__ */ +#endif /* _WIN32 */ #if defined(__linux__) typedef struct { @@ -2367,12 +2365,9 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i chr = qemu_chr_open_pp(filename); } else #endif -#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) if (strstart(filename, "/dev/", NULL)) { chr = qemu_chr_open_tty(filename); } else -#endif #else /* !_WIN32 */ if (strstart(filename, "COM", NULL)) { chr = qemu_chr_open_win(filename); diff --git a/vl-android.c b/vl-android.c index d353c31..1f65c3b 100644 --- a/vl-android.c +++ b/vl-android.c @@ -4435,7 +4435,7 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_startdate: { struct tm tm; - time_t rtc_start_date; + time_t rtc_start_date = 0; if (!strcmp(optarg, "now")) { rtc_date_offset = -1; } else { |