diff options
| author | malc | 2011-08-05 08:07:10 +0200 |
|---|---|---|
| committer | malc | 2011-08-05 08:07:10 +0200 |
| commit | a67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (patch) | |
| tree | 146a7b6eebbee1367453fde501d4462ac6d9f8b4 /hw/baum.c | |
| parent | Merge branch 'master' of git://git.qemu.org/qemu (diff) | |
| parent | Merge remote-tracking branch 'mst/for_anthony' into staging (diff) | |
| download | qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.gz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.xz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/baum.c')
| -rw-r--r-- | hw/baum.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -576,7 +576,7 @@ static void baum_close(struct CharDriverState *chr) qemu_free(baum); } -CharDriverState *chr_baum_init(QemuOpts *opts) +int chr_baum_init(QemuOpts *opts, CharDriverState **_chr) { BaumDriverState *baum; CharDriverState *chr; @@ -629,7 +629,8 @@ CharDriverState *chr_baum_init(QemuOpts *opts) qemu_chr_generic_open(chr); - return chr; + *_chr = chr; + return 0; fail: qemu_free_timer(baum->cellCount_timer); @@ -638,5 +639,5 @@ fail_handle: qemu_free(handle); qemu_free(chr); qemu_free(baum); - return NULL; + return -EIO; } |