From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qji3O-0002FB-8L for qemu-devel@nongnu.org; Wed, 20 Jul 2011 21:28:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qji3B-0003sc-RO for qemu-devel@nongnu.org; Wed, 20 Jul 2011 21:27:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:58020 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qji3A-0003qr-5u for qemu-devel@nongnu.org; Wed, 20 Jul 2011 21:27:40 -0400 From: Alexander Graf Date: Thu, 21 Jul 2011 03:27:24 +0200 Message-Id: <1311211654-14326-14-git-send-email-agraf@suse.de> In-Reply-To: <1311211654-14326-1-git-send-email-agraf@suse.de> References: <1311211654-14326-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 13/23] PPC: bamboo: Move host fdt copy to target List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Developers Cc: Scott Wood 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 --- hw/ppc440_bamboo.c | 37 +++++++++++++++++++++++++++++++++++-- target-ppc/kvm_ppc.c | 30 ------------------------------ target-ppc/kvm_ppc.h | 1 - 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 20b8629..a059f6b 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -31,6 +31,38 @@ #define FDT_ADDR 0x1800000 #define RAMDISK_ADDR 0x1900000 +#ifdef CONFIG_FDT +static int bamboo_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; +} + +static void bamboo_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. */ + bamboo_copy_host_cell(fdt, "/cpus/cpu@0", "clock-frequency"); + bamboo_copy_host_cell(fdt, "/cpus/cpu@0", "timebase-frequency"); +} +#endif + static int bamboo_load_device_tree(target_phys_addr_t addr, uint32_t ramsize, target_phys_addr_t initrd_base, @@ -76,8 +108,9 @@ static int bamboo_load_device_tree(target_phys_addr_t addr, if (ret < 0) fprintf(stderr, "couldn't set /chosen/bootargs\n"); - if (kvm_enabled()) - kvmppc_fdt_update(fdt); + if (kvm_enabled()) { + bamboo_fdt_update(fdt); + } ret = rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr); qemu_free(fdt); diff --git a/target-ppc/kvm_ppc.c b/target-ppc/kvm_ppc.c index 536fcab..7cc522a 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) diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index 45a1373..2f32249 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -10,7 +10,6 @@ #define __KVM_PPC_H__ void kvmppc_init(void); -void kvmppc_fdt_update(void *fdt); #ifndef CONFIG_KVM static inline int kvmppc_read_host_property(const char *node_path, const char *prop, void *val, size_t len) -- 1.6.0.2