From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49065) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxQNh-0001z7-OD for qemu-devel@nongnu.org; Fri, 13 Nov 2015 21:15:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxQNd-0008Dt-KM for qemu-devel@nongnu.org; Fri, 13 Nov 2015 21:15:57 -0500 Received: from e19.ny.us.ibm.com ([129.33.205.209]:34215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxQNd-0008DY-GY for qemu-devel@nongnu.org; Fri, 13 Nov 2015 21:15:53 -0500 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Nov 2015 21:15:52 -0500 From: Sukadev Bhattiprolu Date: Fri, 13 Nov 2015 18:13:07 -0800 Message-Id: <1447467188-4458-1-git-send-email-sukadev@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 1/2] target-ppc: Define kvmppc_read_int_dt() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aik@ozlabs.ru, agraf@suse.de, benh@au1.ibm.com, david@gibson.dropbear.id.au, paulus@au1.ibm.com, stewart@linux.vnet.ibm.com Cc: nacc@linux.vnet.ibm.com, qemu-ppc@nongnu.org, thuth@redhat.com, qemu-devel@nongnu.org Extract code from the function kvmppc_read_int_cpu_dt() that actually reads the file into a separate function, so it can be called from other places. Signed-off-by: Sukadev Bhattiprolu --- target-ppc/kvm.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index ac70f08..9940a90 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1838,13 +1838,8 @@ static int kvmppc_find_cpu_dt(char *buf, int buf_len) return 0; } -/* Read a CPU node property from the host device tree that's a single - * integer (32-bit or 64-bit). Returns 0 if anything goes wrong - * (can't find or open the property, or doesn't understand the - * format) */ -static uint64_t kvmppc_read_int_cpu_dt(const char *propname) +static uint64_t kvmppc_read_int_dt(const char *filename) { - char buf[PATH_MAX], *tmp; union { uint32_t v32; uint64_t v64; @@ -1852,14 +1847,7 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname) FILE *f; int len; - if (kvmppc_find_cpu_dt(buf, sizeof(buf))) { - return -1; - } - - tmp = g_strdup_printf("%s/%s", buf, propname); - - f = fopen(tmp, "rb"); - g_free(tmp); + f = fopen(filename, "rb"); if (!f) { return -1; } @@ -1877,6 +1865,26 @@ static uint64_t kvmppc_read_int_cpu_dt(const char *propname) return 0; } +/* Read a CPU node property from the host device tree that's a single + * integer (32-bit or 64-bit). Returns 0 if anything goes wrong + * (can't find or open the property, or doesn't understand the + * format) */ +static uint64_t kvmppc_read_int_cpu_dt(const char *propname) +{ + char buf[PATH_MAX], *tmp; + uint64_t val; + + if (kvmppc_find_cpu_dt(buf, sizeof(buf))) { + return -1; + } + + tmp = g_strdup_printf("%s/%s", buf, propname); + val = kvmppc_read_int_dt(tmp); + g_free(tmp); + + return val; +} + uint64_t kvmppc_get_clockfreq(void) { return kvmppc_read_int_cpu_dt("clock-frequency"); -- 2.1.0