summary refs log tree commit diff stats
path: root/hw/sparc
diff options
context:
space:
mode:
authorGabriel L. Somlo <somlo@cmu.edu>2015-06-08 14:10:45 -0400
committerGerd Hoffmann <kraxel@redhat.com>2015-06-10 08:00:37 +0200
commit48779e501810c5046ff8af7b9cf9c99bec2928a1 (patch)
tree001c2ea1184e13405c830511092399bdfbd92162 /hw/sparc
parent1edd34b638f73d39a175fbc4f9ad5c97800d7470 (diff)
downloadfocaccia-qemu-48779e501810c5046ff8af7b9cf9c99bec2928a1.tar.gz
focaccia-qemu-48779e501810c5046ff8af7b9cf9c99bec2928a1.zip
fw_cfg: fix FW_CFG_BOOT_DEVICE update on ppc and sparc
On ppc, sparc, and sparc64, the value of the FW_CFG_BOOT_DEVICE 16bit
fw_cfg entry is repeatedly modified from a series of callbacks, which
currently results in the previous value's dynamically allocated memory
being leaked.

This patch switches updating to the new fw_cfg_modify_i16() call, which
does not cause memory leaks.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/sparc')
-rw-r--r--hw/sparc/sun4m.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 8a3599c403..68ac4d8bba 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -124,7 +124,7 @@ void DMA_register_channel (int nchan,
 static void fw_cfg_boot_set(void *opaque, const char *boot_device,
                             Error **errp)
 {
-    fw_cfg_add_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
+    fw_cfg_modify_i16(opaque, FW_CFG_BOOT_DEVICE, boot_device[0]);
 }
 
 static void nvram_init(Nvram *nvram, uint8_t *macaddr,