[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 3/6] hw/arm/boot: do not free VirtBoardInfo fdt i
From: |
Eric Auger |
Subject: |
[Qemu-devel] [PATCH v5 3/6] hw/arm/boot: do not free VirtBoardInfo fdt in arm_load_dtb |
Date: |
Sun, 30 Nov 2014 18:19:27 +0000 |
Currently arm_load_dtb frees the fdt handle whatever it is allocated
from load_device_tree or allocated externally.
When adding dynamic sysbus nodes after the first dtb load, we would like
to reuse the fdt used during the first load instead of re-creating the
whole device tree. If the fdt is destroyed, this is not possible.
Signed-off-by: Eric Auger <address@hidden>
---
hw/arm/boot.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 0398cd4..0f9cd2c 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -427,12 +427,16 @@ int arm_load_dtb(const struct arm_boot_info *binfo)
*/
rom_add_blob_fixed("dtb", fdt, size, binfo->dtb_start);
- g_free(fdt);
+ if (binfo->dtb_filename) {
+ g_free(fdt);
+ }
return size;
fail:
- g_free(fdt);
+ if (binfo->dtb_filename) {
+ g_free(fdt);
+ }
return -1;
}
--
1.8.3.2
- [Qemu-devel] [PATCH v5 0/6] machvirt dynamic sysbus device instantiation, Eric Auger, 2014/11/30
- [Qemu-devel] [PATCH v5 1/6] hw/arm/boot: load_dtb becomes non static arm_load_dtb, Eric Auger, 2014/11/30
- [Qemu-devel] [PATCH v5 2/6] hw/arm/boot: dtb start and limit moved in arm_boot_info, Eric Auger, 2014/11/30
- [Qemu-devel] [PATCH v5 5/6] hw/arm/sysbus-fdt: helpers for platform bus nodes addition, Eric Auger, 2014/11/30
- [Qemu-devel] [PATCH v5 6/6] hw/arm/virt: add dynamic sysbus device support, Eric Auger, 2014/11/30
- [Qemu-devel] [PATCH v5 3/6] hw/arm/boot: do not free VirtBoardInfo fdt in arm_load_dtb,
Eric Auger <=
- [Qemu-devel] [PATCH v5 4/6] hw/arm: add a new modify_dtb_opaque field in arm_boot_info, Eric Auger, 2014/11/30