From a489f7f7111fb2e8aaf6a152731a5f1fe7e0c4b3 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 21 Jul 2011 02:08:10 +0200 Subject: PPC: bamboo: Move host fdt copy to target We have some code in generic kvm_ppc.c that is only used by 440. Move to the 440 specific device code. Signed-off-by: Alexander Graf --- target-ppc/kvm_ppc.c | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'target-ppc/kvm_ppc.c') diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c index c031fcb75..26ecc9d25 100644 --- a/target-ppc/kvm_ppc.c +++ b/target-ppc/kvm_ppc.c @@ -54,36 +54,6 @@ free: free(path); return ret; } - -static int kvmppc_copy_host_cell(void *fdt, const char *node, const char *prop) -{ - uint32_t cell; - int ret; - - ret = kvmppc_read_host_property(node, prop, &cell, sizeof(cell)); - if (ret < 0) { - fprintf(stderr, "couldn't read host %s/%s\n", node, prop); - goto out; - } - - ret = qemu_devtree_setprop_cell(fdt, node, prop, cell); - if (ret < 0) { - fprintf(stderr, "couldn't set guest %s/%s\n", node, prop); - goto out; - } - -out: - return ret; -} - -void kvmppc_fdt_update(void *fdt) -{ - /* Copy data from the host device tree into the guest. Since the guest can - * directly access the timebase without host involvement, we must expose - * the correct frequencies. */ - kvmppc_copy_host_cell(fdt, "/cpus/cpu@0", "clock-frequency"); - kvmppc_copy_host_cell(fdt, "/cpus/cpu@0", "timebase-frequency"); -} #endif static void kvmppc_timer_hack(void *opaque) -- cgit v1.2.3 From e95a69cb6dce91c971bdf34a84a4026ff6b7821f Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 21 Jul 2011 02:46:11 +0200 Subject: PPC: KVM: Remove kvmppc_read_host_property We just got rid of the last user of kvmppc_read_host_property, so we can now safely remove it. Signed-off-by: Alexander Graf --- target-ppc/kvm_ppc.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'target-ppc/kvm_ppc.c') diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c index 26ecc9d25..24fc6bce3 100644 --- a/target-ppc/kvm_ppc.c +++ b/target-ppc/kvm_ppc.c @@ -21,41 +21,6 @@ static QEMUTimer *kvmppc_timer; static unsigned int kvmppc_timer_rate; -#ifdef CONFIG_FDT -int kvmppc_read_host_property(const char *node_path, const char *prop, - void *val, size_t len) -{ - char *path; - FILE *f; - int ret = 0; - int pathlen; - - pathlen = snprintf(NULL, 0, "%s/%s/%s", PROC_DEVTREE_PATH, node_path, prop) - + 1; - path = g_malloc(pathlen); - - snprintf(path, pathlen, "%s/%s/%s", PROC_DEVTREE_PATH, node_path, prop); - - f = fopen(path, "rb"); - if (f == NULL) { - ret = errno; - goto free; - } - - len = fread(val, len, 1, f); - if (len != 1) { - ret = ferror(f); - goto close; - } - -close: - fclose(f); -free: - free(path); - return ret; -} -#endif - static void kvmppc_timer_hack(void *opaque) { qemu_notify_event(); -- cgit v1.2.3