diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-08 09:36:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-08 09:36:18 -0500 |
| commit | 4b5463bfdfc3b0f335af18e0c5b64e5f52e86551 (patch) | |
| tree | 0bd5c04d572fe84449157cabd09ca251a97f77f4 /hw | |
| parent | 847c25d01cbe8e4fe457a7426f82daaaf3287aae (diff) | |
| parent | 40f08e87f613273f9dcc8df7d6a0f574b7d28d05 (diff) | |
Merge remote-tracking branch 'sweil/fixes' into staging
* sweil/fixes:
qemu-timer: Fix limits for w32 mmtimer
qom: Fix memory leak in function container_get
hw/pc_sysfw: Fix memory leak
qdev: Fix memory leak in function set_pci_devfn
arm-semi: Rename SYS_XXX macros to TARGET_SYS_XXX (fixes compiler warning)
target-mips: Remove unused inline function
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pc_sysfw.c | 3 | ||||
| -rw-r--r-- | hw/qdev-properties.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/hw/pc_sysfw.c b/hw/pc_sysfw.c index fafdf9b1c1..f0d7c21b5c 100644 --- a/hw/pc_sysfw.c +++ b/hw/pc_sysfw.c @@ -85,6 +85,9 @@ static void pc_fw_add_pflash_drv(void) filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); opts = drive_add(IF_PFLASH, -1, filename, "readonly=on"); + + g_free(filename); + if (opts == NULL) { return; } diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 98dd06aeba..c5545dcd37 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -834,6 +834,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque, visit_type_str(v, &str, name, &local_err); if (local_err) { + error_free(local_err); return set_int32(obj, v, opaque, name, errp); } |