From nobody Sun Nov 9 22:58:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552118613664208.76958161294795; Sat, 9 Mar 2019 00:03:33 -0800 (PST) Received: from localhost ([127.0.0.1]:55477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wx7-0007F4-HU for importer@patchew.org; Sat, 09 Mar 2019 03:03:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wim-0003wQ-OV for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Wim-0000dF-0f for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:40 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34143) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2Wil-0000cJ-PA for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:39 -0500 Received: by mail-wr1-x42f.google.com with SMTP id f14so23644687wrg.1 for ; Fri, 08 Mar 2019 23:48:39 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 11sm5252294wmg.27.2019.03.08.23.48.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:48:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vfSlUZJuyhAvM26ok+RXB9eSxcSKcy+3I5M39JJNxEA=; b=Q2hZSkdHAn8fnhr5oWmbEXrvqjM6OHebc2Bb/d+YXplZ2Q3a9TwDINERvvwftSuiNh 4Z0Y4ldIkMZ+8Zr2HnAB1sK2iryblqnfWiP0eaVuIaU8fbLzBJoGwPH9UNaBN9NzwZV7 0zqXcZNZoy2UPpUGnlWDgJ95Xfqr6Atyp5OalP3dNo5JldoSa8iym6g9ea/JKmFTEoeb SEoX1w5tvA8lQjA6+j7XbaejtTOjuHJKiwNRe7G1FBuPwEOtsMjx4WxkzSCyT9IyhqS3 /tEx3znxcExEW0M/2KkkAetsrjrSTBA8f4o5CjMVz6bx37ECSIiV4tW2CbC4re4k9ELX 3Uwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vfSlUZJuyhAvM26ok+RXB9eSxcSKcy+3I5M39JJNxEA=; b=CbxmBxpFXdMPbeUCUS+ruahWi3YA/VXM+L16yDN2NwbdNn/cj6/WpuDmsE3uyEXCmY +lpx4YMmwkqh5fRHdgm5idb5SlYFC4e2FlR18cYyq+tMTLT4rt1WFAofFfX1jMppl0Ka v+Ms/jZgbMQr3y1kj1A2cly+BuIIFMAla2JO13of2+CAN2TAVLC0kB0tnE0WSuLLAlA8 KoGGKrkiogqpQxvZfwLr0KrQoHAelFexeUVajOEHk9A4dIixh+ObkHWsPO64D26f7Uiz YmdCb2/fE2c0gwlDJNWpP1sMCNriw3TgF+Uev178bn/TBQoUp/9O24VzmeQn8raKFBl7 eZsg== X-Gm-Message-State: APjAAAWgpzG1uTtPoQ4r00xzG2tPT3hyS2UnbBCkb2aWA4nvZYS56mzU SJJ0C8zaNzyaf6qNVDtvubJ96RgZ X-Google-Smtp-Source: APXvYqy+UT+lLE6/jBgJbd4HOjdXl+ofO3RZ17dbaKlloMShL8XDMQ5AEUT0VJzkFkb2b7Rr6lm1Bg== X-Received: by 2002:a5d:4608:: with SMTP id t8mr14340838wrq.186.1552117718551; Fri, 08 Mar 2019 23:48:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 9 Mar 2019 08:48:13 +0100 Message-Id: <1552117698-12355-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> References: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [PULL 20/25] lsi: use ldn_le_p()/stn_le_p() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Schnelle Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Sven Schnelle Instead of using the open-coded versions, use the helper already present as this makes the code easier to read and less error-prone. Signed-off-by: Sven Schnelle Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190305195519.24303-2-svens@stackframe.org> --- hw/scsi/lsi53c895a.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index bcff859..402b785 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -289,8 +289,7 @@ typedef struct { uint8_t sbr; uint32_t adder; =20 - /* Script ram is stored as 32-bit words in host byteorder. */ - uint32_t script_ram[2048]; + uint8_t script_ram[2048 * sizeof(uint32_t)]; } LSIState; =20 #define TYPE_LSI53C810 "lsi53c810" @@ -2079,29 +2078,14 @@ static void lsi_ram_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { LSIState *s =3D opaque; - uint32_t newval; - uint32_t mask; - int shift; - - newval =3D s->script_ram[addr >> 2]; - shift =3D (addr & 3) * 8; - mask =3D ((uint64_t)1 << (size * 8)) - 1; - newval &=3D ~(mask << shift); - newval |=3D val << shift; - s->script_ram[addr >> 2] =3D newval; + stn_le_p(s->script_ram + addr, size, val); } =20 static uint64_t lsi_ram_read(void *opaque, hwaddr addr, unsigned size) { LSIState *s =3D opaque; - uint32_t val; - uint32_t mask; - - val =3D s->script_ram[addr >> 2]; - mask =3D ((uint64_t)1 << (size * 8)) - 1; - val >>=3D (addr & 3) * 8; - return val & mask; + return ldn_le_p(s->script_ram + addr, size); } =20 static const MemoryRegionOps lsi_ram_ops =3D { @@ -2244,7 +2228,7 @@ static const VMStateDescription vmstate_lsi_scsi =3D { VMSTATE_BUFFER_UNSAFE(scratch, LSIState, 0, 18 * sizeof(uint32_t)), VMSTATE_UINT8(sbr, LSIState), =20 - VMSTATE_BUFFER_UNSAFE(script_ram, LSIState, 0, 2048 * sizeof(uint3= 2_t)), + VMSTATE_BUFFER_UNSAFE(script_ram, LSIState, 0, 8192), VMSTATE_END_OF_LIST() } }; --=20 1.8.3.1