From nobody Thu Dec 18 08:09:18 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576672897; cv=none; d=zohomail.com; s=zohoarc; b=HImyjauWYaDULps4K5U52HPerp+1lHbByt//d92vUVAkpzl8MrBWJ7LNvnJZlUgArJmovwHYAbQBOffzVkcbYylz+uFtA985xZUS/23kl5vrOHPigp4T4+0UUt9HmqoUhz2phnymwOdLqzefS+zNtoGY/JCoJVYnb25jjX9KAMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576672897; h=Content-Type:Content-Transfer-Encoding:Cc: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=uKWbw2FnihoJIGt9f/+APcjo5dktAD56+VxJMIHASKI=; b=IQlGFtwGc1JWDajWFWWAkaFqm7OR2yOaD6ZU1/kZBuiWojkwUi0Dm8rdCT+OzIoWDlg86Pe0ZRe4DY8vdwRTdqwOdayCe9ox/Az+SJiUypY5yEbP31kCJkWqedB9cPLKb+JRlUrNmO3KrTPHHlHf3+vZtsyGjg9oNoL+t8/TROA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1576672897962326.8652648083902; Wed, 18 Dec 2019 04:41:37 -0800 (PST) Received: from localhost ([::1]:53634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihYe0-00013x-Id for importer@patchew.org; Wed, 18 Dec 2019 07:41:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53906) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihY3f-00073f-MH for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:04:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihY3e-0002Ww-8j for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:04:03 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihY3d-0002Vf-Un for qemu-devel@nongnu.org; Wed, 18 Dec 2019 07:04:02 -0500 Received: by mail-wr1-x434.google.com with SMTP id t2so2030973wrr.1 for ; Wed, 18 Dec 2019 04:04:01 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n67sm2236838wmf.46.2019.12.18.04.03.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Dec 2019 04:04:00 -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=uKWbw2FnihoJIGt9f/+APcjo5dktAD56+VxJMIHASKI=; b=L7CL1f+RwifD7VM9rNQavIU+2YSt1KDNNBSMahvUg/w0442Sjkse93vcBDTeBoL6K6 KrIn9cRpaq5dGOtMMvsgUpiB5DdxtqFQDHfwRj9Dgz0bRdQ8jdlxbFbXikgKzxHI3ySg 1mGgZVLLcahK702AVVH6QSIcWlT7bMVORs5+ej1dBa33F7/n0EqBfobkPIS4f9SGeHwf 76IH/yQKCWXDboLIqmGCgjivMEHkt9U+sidWpY7JdzJcHdFP+Tm+UxX7YvVtY2EcgS9P diwnfdzOeu3dgM2MbAZGD/QXea0fknV4aS5cXN4EH1x8kxOmiNPbjP5qAeNtn8UnSTeR U9cw== 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=uKWbw2FnihoJIGt9f/+APcjo5dktAD56+VxJMIHASKI=; b=kbFx92D1dy9AnPzZxJTclqUAH8+YY8RHmkd9fdCh18z4LvjAquG+l+u4o1p+LFHi1I RLrXWS9ddeVyEf+6qCe3NQX6SRUO/v8GKoqnRN2PdV97HIT2vCh4q2W3FOoDLEirglAf TmLjn0ZGrAcVlMcjDmW075UdWBrWY830r6jZCq8sRX8onkP0zMi0GvLe+BJljDS+gdNk p+EisyJ34SBeUbEgy7kpwcWuVX2Y6lu+0IxLK2Is64JWGPFqUl60P/oTaN0+HmzFGWY9 7mgERQ7s5UlsMhA//Mzoiyjekcjkz4/MISMFzM7GlbVzhNrQT2sW3YBdqwisqJEaLKNO XayA== X-Gm-Message-State: APjAAAWz1JZ5X8V5NXqzh5ZoBQFIl0HgmhsjkplOpL1jAFM4VHKmqMRp xHz42R2m4I9tfi5wQcOrJ720ymot X-Google-Smtp-Source: APXvYqwfXpIiaMA2H+cxRwaRvO3UA+MwL8OxczZ1xq/a9TWj7FgPVxG7wXYFhD6QK+FhM3sBuCKF8Q== X-Received: by 2002:adf:e5cb:: with SMTP id a11mr2411040wrn.28.1576670640735; Wed, 18 Dec 2019 04:04:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 57/87] hw/i386/pc: Inline port92_init() Date: Wed, 18 Dec 2019 13:02:23 +0100 Message-Id: <1576670573-48048-58-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576670573-48048-1-git-send-email-pbonzini@redhat.com> References: <1576670573-48048-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::434 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: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 This one-line function is not very helpful, so remove it by inlining the call to qdev_connect_gpio_out_named(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 67fddcc..e36053f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -710,11 +710,6 @@ static uint64_t port92_read(void *opaque, hwaddr addr, return ret; } =20 -static void port92_init(ISADevice *dev, qemu_irq a20_out) -{ - qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out); -} - static const VMStateDescription vmstate_port92_isa =3D { .name =3D "port92", .version_id =3D 1, @@ -770,8 +765,8 @@ static void port92_class_initfn(ObjectClass *klass, voi= d *data) dc->vmsd =3D &vmstate_port92_isa; /* * Reason: unlike ordinary ISA devices, this one needs additional - * wiring: its A20 output line needs to be wired up by - * port92_init(). + * wiring: its A20 output line needs to be wired up with + * qdev_connect_gpio_out_named(). */ dc->user_creatable =3D false; } @@ -1282,7 +1277,8 @@ static void pc_superio_init(ISABus *isa_bus, bool cre= ate_fdctrl, bool no_vmport) =20 a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); i8042_setup_a20_line(i8042, a20_line[0]); - port92_init(port92, a20_line[1]); + qdev_connect_gpio_out_named(DEVICE(port92), + PORT92_A20_LINE, 0, a20_line[1]); g_free(a20_line); } =20 --=20 1.8.3.1