diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-04 16:41:35 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-04 16:41:35 -0300 |
| commit | e19ec919797ecf047ec805662850311b6a5298ee (patch) | |
| tree | e4fb3679ef2fd8f6e85141d60c050e4f960881f0 /qemu-char.c | |
| parent | ca8773d10fa15cd00a754faa7f26091b81587df3 (diff) | |
| parent | 6049f4f831c6f409031dfa09282b38d0cbaecad8 (diff) | |
Merge commit '6049f4f831c6f409031dfa09282b38d0cbaecad8' into upstream-merge
* commit '6049f4f831c6f409031dfa09282b38d0cbaecad8': (32 commits)
alpha-linux-user: Implement signals.
target-alpha: Implement IEEE FP qualifiers.
target-ppc: don't print invalid opcode messages on the console
Revert "target-ppc: stop translation after a trap instruction"
audio/alsa: Handle SND_PCM_STATE_SETUP in alsa_poll_handler
audio/alsa: Spelling typo (paramters)
target-ppc: stop translation after a trap instruction
qemu-char.c: drop debug printfs from qemu_chr_parse_compat
powerpc/e500: adjust fdt and ramdisk loading addr
powerpc: fix compilation with CONFIG_FDT undefined
powerpc/booke: move fdt loading to rom infrastructure
target-ppc: add synchronize register for booke init
target-sh4: Fix gdb read/write register
target-ppc: fix SPE evsplat* instructions
target-ppc: fix SPE evcmp* instructions
arm host: Fix linker warning (m68k targets)
Fix 'make install' from non-srcdir build
Fix to 'gdb detach' stub
Fix qemu -net user,hostfwd= example
tcg/ppc: Fix right rotation
...
Conflicts:
Makefile.target
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/qemu-char.c b/qemu-char.c index 416949221..86c7c5a3f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2334,7 +2334,6 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) if (sscanf(p, "%64[^:]:%32[^@,]%n", host, port, &pos) < 2) { host[0] = 0; if (sscanf(p, ":%32[^,]%n", port, &pos) < 1) { - fprintf(stderr, "udp #1\n"); goto fail; } } @@ -2345,7 +2344,6 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) if (sscanf(p, "%64[^:]:%32[^,]%n", host, port, &pos) < 2) { host[0] = 0; if (sscanf(p, ":%32[^,]%n", port, &pos) < 1) { - fprintf(stderr, "udp #2\n"); goto fail; } } @@ -2373,7 +2371,6 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) } fail: - fprintf(stderr, "%s: fail on \"%s\"\n", __FUNCTION__, filename); qemu_opts_del(opts); return NULL; } |