diff options
| author | malc <av1474@comtv.ru> | 2011-11-02 02:14:19 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-11-02 02:14:19 +0400 |
| commit | dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37 (patch) | |
| tree | d671ce116243083338b0be0849a58ef9a00b17ff /hw/spapr_vio.c | |
| parent | 0756e71c3f4327f4d2ad3c6099cdafc23de14fcf (diff) | |
| parent | 7f7623662781fa152c5aa39fd63a2e8766516a2c (diff) | |
| download | focaccia-qemu-dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37.tar.gz focaccia-qemu-dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/spapr_vio.c')
| -rw-r--r-- | hw/spapr_vio.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c index 977603f81e..25cfc9d912 100644 --- a/hw/spapr_vio.c +++ b/hw/spapr_vio.c @@ -165,7 +165,13 @@ static void rtce_init(VIOsPAPRDevice *dev) * sizeof(VIOsPAPR_RTCE); if (size) { - dev->rtce_table = g_malloc0(size); + dev->rtce_table = kvmppc_create_spapr_tce(dev->reg, + dev->rtce_window_size, + &dev->kvmtce_fd); + + if (!dev->rtce_table) { + dev->rtce_table = g_malloc0(size); + } } } |