From patchwork Wed Jun 19 20:40:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 252661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1DF7C2C009F for ; Thu, 20 Jun 2013 06:47:13 +1000 (EST) Received: from localhost ([::1]:57717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpPHb-0007Zr-8V for incoming@patchwork.ozlabs.org; Wed, 19 Jun 2013 16:47:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpPCW-00019G-31 for qemu-devel@nongnu.org; Wed, 19 Jun 2013 16:41:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpPCT-0005Cx-3X for qemu-devel@nongnu.org; Wed, 19 Jun 2013 16:41:55 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:42955) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpPCS-0005Ce-QQ for qemu-devel@nongnu.org; Wed, 19 Jun 2013 16:41:52 -0400 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Jun 2013 14:41:52 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 19 Jun 2013 14:41:48 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id A35A93E40040; Wed, 19 Jun 2013 14:41:25 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5JKfF7g045748; Wed, 19 Jun 2013 14:41:23 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5JKfFuF024567; Wed, 19 Jun 2013 14:41:15 -0600 Received: from titi.austin.rr.com ([9.49.221.0]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r5JKeaBi020317; Wed, 19 Jun 2013 14:41:10 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 19 Jun 2013 15:40:33 -0500 Message-Id: <1371674435-14973-11-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1371674435-14973-1-git-send-email-aliguori@us.ibm.com> References: <1371674435-14973-1-git-send-email-aliguori@us.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13061920-7606-0000-0000-00000CA17485 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.154 Cc: Anthony Liguori , Alexey Kardashevskiy , Alex Graf , qemu-ppc@nongnu.org, Paul Mackerras , Andreas Faerber Subject: [Qemu-devel] [PATCH 10/12] spapr-vty: refactor the code to improve consistency X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org A few small changes folded into one cleanup: - Fail gracefully when passed a reg of the wrong device type - Don't cast uint8_t buf to uint64_t for argument marshalling - Use spapr_vty prefix consistently. Signed-off-by: Anthony Liguori Reviewed-by: Alexander Graf --- hw/char/spapr_vty.c | 57 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c index 45fc3ce..bbd5ecb 100644 --- a/hw/char/spapr_vty.c +++ b/hw/char/spapr_vty.c @@ -29,14 +29,14 @@ typedef struct VIOsPAPRVTYDevice { #define VIO_SPAPR_VTY_DEVICE(obj) \ OBJECT_CHECK(VIOsPAPRVTYDevice, (obj), TYPE_VIO_SPAPR_VTY_DEVICE) -static int vty_can_receive(void *opaque) +static int spapr_vty_can_receive(void *opaque) { VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque); return (dev->in - dev->out) < VTERM_BUFSIZE; } -static void vty_receive(void *opaque, const uint8_t *buf, int size) +static void spapr_vty_receive(void *opaque, const uint8_t *buf, int size) { VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(opaque); int i; @@ -51,9 +51,8 @@ static void vty_receive(void *opaque, const uint8_t *buf, int size) } } -static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) +static int spapr_vty_getchars(VIOsPAPRVTYDevice *dev, uint8_t *buf, int max) { - VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev); int n = 0; while ((n < max) && (dev->out != dev->in)) { @@ -63,10 +62,9 @@ static int vty_getchars(VIOsPAPRDevice *sdev, uint8_t *buf, int max) return n; } -static void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, int len) +static void spapr_vty_putchars(VIOsPAPRVTYDevice *dev, + const uint8_t *buf, int len) { - VIOsPAPRVTYDevice *dev = VIO_SPAPR_VTY_DEVICE(sdev); - /* FIXME: should check the qemu_chr_fe_write() return value */ qemu_chr_fe_write(dev->chardev, buf, len); } @@ -80,8 +78,8 @@ static int spapr_vty_init(VIOsPAPRDevice *sdev) exit(1); } - qemu_chr_add_handlers(dev->chardev, vty_can_receive, - vty_receive, NULL, dev); + qemu_chr_add_handlers(dev->chardev, spapr_vty_can_receive, + spapr_vty_receive, NULL, dev); return 0; } @@ -92,24 +90,31 @@ static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPREnvironment *spapr, { target_ulong reg = args[0]; target_ulong len = args[1]; - target_ulong char0_7 = args[2]; - target_ulong char8_15 = args[3]; VIOsPAPRDevice *sdev; uint8_t buf[16]; + int i; sdev = spapr_vio_find_by_reg(spapr->vio_bus, reg); if (!sdev) { return H_PARAMETER; } + if (!object_dynamic_cast(OBJECT(sdev), TYPE_VIO_SPAPR_VTY_DEVICE)) { + return H_PARAMETER; + } + if (len > 16) { return H_PARAMETER; } - *((uint64_t *)buf) = cpu_to_be64(char0_7); - *((uint64_t *)buf + 1) = cpu_to_be64(char8_15); + for (i = 0; i < 16; i++) { + uint64_t shift = (7 - (i % 8)) * 8; + int index = 2 + (i / 8); + + buf[i] = args[index] >> shift; + } - vty_putchars(sdev, buf, len); + spapr_vty_putchars(VIO_SPAPR_VTY_DEVICE(sdev), buf, len); return H_SUCCESS; } @@ -117,25 +122,31 @@ static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPREnvironment *spapr, static target_ulong h_get_term_char(PowerPCCPU *cpu, sPAPREnvironment *spapr, target_ulong opcode, target_ulong *args) { - target_ulong reg = args[0]; - target_ulong *len = args + 0; - target_ulong *char0_7 = args + 1; - target_ulong *char8_15 = args + 2; VIOsPAPRDevice *sdev; + target_ulong reg = args[0]; + target_ulong len; uint8_t buf[16]; + int i; sdev = spapr_vio_find_by_reg(spapr->vio_bus, reg); if (!sdev) { return H_PARAMETER; } - *len = vty_getchars(sdev, buf, sizeof(buf)); - if (*len < 16) { - memset(buf + *len, 0, 16 - *len); + if (!object_dynamic_cast(OBJECT(sdev), TYPE_VIO_SPAPR_VTY_DEVICE)) { + return H_PARAMETER; } - *char0_7 = be64_to_cpu(*((uint64_t *)buf)); - *char8_15 = be64_to_cpu(*((uint64_t *)buf + 1)); + len = spapr_vty_getchars(VIO_SPAPR_VTY_DEVICE(sdev), buf, sizeof(buf)); + + args[0] = len; + args[1] = args[2] = 0; + for (i = 0; i < len; i++) { + uint64_t shift = (7 - (i % 8)) * 8; + int index = 1 + (i / 8); + + args[index] |= (uint64_t)buf[i] << shift; + } return H_SUCCESS; }