From nobody Mon Feb 9 22:37:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606899643; cv=none; d=zohomail.com; s=zohoarc; b=YseYEXn+2U89HX/uafz092l+zWQAg0bxkDaxcPxy0FlVBT0TxtfDuoL5ssY7WXisf9+IOXGMCdvd3vER1lFSP/VIyvTJcOtdw+Xyid3a/kdaKkx1Yl3/gvAxwESVfeK5DSur1wsca5HicMuKSsjeFvlrvXqn0VXeM/7hH+aKzu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606899643; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ty3iAIwSeDAfny4IAymcTJQMuo7vVeAhfYZHYYjvnRI=; b=aOG51LGKPgBW2t+8JNz/ngH2UQUP2+z+V4LY0r+sdwEMSifOk7MNwZWuA0cdRAhTFYTdgqWH1vOiNJ098D2M2jYIMrByhjwOyDvqGL/e+3qVaSeEaesO2NBtUxQN0wslzq8SAxi6XY5aRcIakUNDoAosd0GRW90kI9NQv9/hj6U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606899643381191.8809589656248; Wed, 2 Dec 2020 01:00:43 -0800 (PST) Received: from localhost ([::1]:44314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkO05-0006Mo-IL for importer@patchew.org; Wed, 02 Dec 2020 04:00:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkNCl-0003Ok-QK for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:09:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kkNCN-0003jq-4S for qemu-devel@nongnu.org; Wed, 02 Dec 2020 03:09:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-rW2fRqOvMiWGTFFGsAMOsA-1; Wed, 02 Dec 2020 03:09:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A19F75708B for ; Wed, 2 Dec 2020 08:09:08 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BADC5D705 for ; Wed, 2 Dec 2020 08:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606896553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ty3iAIwSeDAfny4IAymcTJQMuo7vVeAhfYZHYYjvnRI=; b=UvQdNtxMWGq5IYOQ45LXn0NlLDqeJMKsctV5LN6nLGtfeDsxjL12EL49X2jYwoYKpOMn3c 5GSz2VlQ+vmTwAJUc8NBJr4GDjJDHqgtP+9x39sEPlZbQ3mRPwD/jrSsxS7RAmX9xSdxNz Omfr8TbxqGaUOdGLNimIDYmdpd0mbLs= X-MC-Unique: rW2fRqOvMiWGTFFGsAMOsA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 050/113] hw/char/serial: Clean up unnecessary code Date: Wed, 2 Dec 2020 03:07:46 -0500 Message-Id: <20201202080849.4125477-51-pbonzini@redhat.com> In-Reply-To: <20201202080849.4125477-1-pbonzini@redhat.com> References: <20201202080849.4125477-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Philippe Mathieu-Daud=C3=A9 Since commit 5ec3a23e6c8 ("serial: convert PIO to new memory api read/write") we don't need to worry about accesses bigger than 8-bit. Use the extract()/deposit() functions to access the correct part of the 16-bit 'divider' register. Reported-by: Jonathan D. Belanger Buglink: https://bugs.launchpad.net/qemu/+bug/1904331 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20201120161933.2514089-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/char/serial.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 97f71879ff..62c627f486 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -24,6 +24,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/bitops.h" #include "hw/char/serial.h" #include "hw/irq.h" #include "migration/vmstate.h" @@ -338,11 +339,7 @@ static void serial_ioport_write(void *opaque, hwaddr a= ddr, uint64_t val, default: case 0: if (s->lcr & UART_LCR_DLAB) { - if (size =3D=3D 1) { - s->divider =3D (s->divider & 0xff00) | val; - } else { - s->divider =3D val; - } + s->divider =3D deposit32(s->divider, 8 * addr, 8, val); serial_update_parameters(s); } else { s->thr =3D (uint8_t) val; @@ -364,7 +361,7 @@ static void serial_ioport_write(void *opaque, hwaddr ad= dr, uint64_t val, break; case 1: if (s->lcr & UART_LCR_DLAB) { - s->divider =3D (s->divider & 0x00ff) | (val << 8); + s->divider =3D deposit32(s->divider, 8 * addr, 8, val); serial_update_parameters(s); } else { uint8_t changed =3D (s->ier ^ val) & 0x0f; @@ -478,7 +475,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) default: case 0: if (s->lcr & UART_LCR_DLAB) { - ret =3D s->divider & 0xff; + ret =3D extract16(s->divider, 8 * addr, 8); } else { if(s->fcr & UART_FCR_FE) { ret =3D fifo8_is_empty(&s->recv_fifo) ? @@ -502,7 +499,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) break; case 1: if (s->lcr & UART_LCR_DLAB) { - ret =3D (s->divider >> 8) & 0xff; + ret =3D extract16(s->divider, 8 * addr, 8); } else { ret =3D s->ier; } --=20 2.26.2