From nobody Sat May 18 15:49:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1522079307330316.20361911841485; Mon, 26 Mar 2018 08:48:27 -0700 (PDT) Received: from localhost ([::1]:57502 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0UME-0006ZU-8r for importer@patchew.org; Mon, 26 Mar 2018 11:48:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0U9O-0003KW-2K for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0U9N-0000M0-85 for qemu-devel@nongnu.org; Mon, 26 Mar 2018 11:35:10 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:45528) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0U9N-0000Lj-3O; Mon, 26 Mar 2018 11:35:09 -0400 Received: by mail-qt0-x241.google.com with SMTP id f8so19980338qtg.12; Mon, 26 Mar 2018 08:35:08 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id i188sm2017502qkc.16.2018.03.26.08.35.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 08:35:08 -0700 (PDT) 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=QSA4+kYd0lapdxGj8ETOaAgE5e5p+IyRWF+oYRUWlQE=; b=pejH/+ReMBYb9ZoCZHxWrK/gGpq+IltnVYy8sedACaa4kldiZyiLFaRndkhQfoPZic 510fsJJMhm/kQBq8u/LW+R1G2PI0vyxTNpYavUE9ZCp6hpVPKvzY0Zw2w/DPjaHO2Nxl RIZHPSGgdfzkwn0EFHxCq+D8oXF9/013VgMR+CWTWnHJHsftuL+l1OV7Vbw0JMdvxn9o R5Px/sqqpHgBiIfHF1DoDBMcoDmdjsemnr/705WuwCaUuk5SNi50orbyT+MfGRk5l255 tPyo/KIe/J6+DBj6wJ7S6hLsjjO+5EAv70C/QMI1x29Bw8p/etQmlDMz91zksrKa5Hgw oi2Q== 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=QSA4+kYd0lapdxGj8ETOaAgE5e5p+IyRWF+oYRUWlQE=; b=l+crPBILPk19S2I/P6dqnKnjLK31a8/Z7zyiNw42MlAsGFxXwM5hzD/Q3FGR6VLCSd xlMq4vhsY/wPuoD9JKAHiR93ZwfSMBocRQpCmRXLHaL8nidUFMdHLmYH12H1ySRt4ImP b4jd/3uAPPi+OnYYC1HGf5GpeJ3ismj3kzaujEVvqQSiD6b/jFMsX2luxS9Gc7GjjY1v FIWFexa9PsUIBZOarmQ3I5+4lMGMpMt1PG2aKuB+Os3Mh6UzwsIN17awZRA1RZanAyXE d7QtDsXMH1QvMIVn1j6kf0cNVzdwydQXej6fRPctMtlwiRQ5YlMtjINV2cRmyNs5NuWW Ppiw== X-Gm-Message-State: AElRT7E9jXfjswhyAqSQnmv+xOe0+8Nt7iNIRlYtQioXvVLR3pf9F/xG u5Xp0kBBBOjzCuCHJjvX3VrVKqld X-Google-Smtp-Source: AIpwx4/BMD9XGudd2TI9hxbOK29HCaTwimvbmMyFiMGlCWB6IvNt7fz5oITa61eeZX4NWWnaJLcpgg== X-Received: by 10.200.68.7 with SMTP id j7mr14704372qtn.132.1522078508597; Mon, 26 Mar 2018 08:35:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Otubo , Thomas Huth , Paolo Bonzini Date: Mon, 26 Mar 2018 12:34:40 -0300 Message-Id: <20180326153441.32641-5-f4bug@amsat.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180326153441.32641-1-f4bug@amsat.org> References: <20180326153441.32641-1-f4bug@amsat.org> 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: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH for-2.13 /5] hw/dma/i8257: Rename i8257_dma_init() -> i8257_dma_init_cascaded() 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: "open list:PReP" , Eduardo Habkost , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Michael Tokarev , Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Nageswara Sastry , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 To keep the patch diff simple, an inline function is used (then removed in the next commit). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/dma/i8257.h | 6 +++++- hw/dma/i82374.c | 2 +- hw/dma/i8257.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 3053f18797..986319e4e3 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -46,6 +46,10 @@ typedef struct I8257State { PortioList portio_pageh; } I8257State; =20 -void i8257_dma_init(ISABus *bus, bool high_page_enable); +void i8257_dma_init_cascaded(ISABus *bus, bool high_page_enable); +static inline void i8257_dma_init(ISABus *bus, bool high_page_enable) +{ + i8257_dma_init_cascaded(bus, high_page_enable); +} =20 #endif diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 892f655a7e..b95edd7b98 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -125,7 +125,7 @@ static void i82374_realize(DeviceState *dev, Error **er= rp) error_setg(errp, "DMA already initialized on ISA bus"); return; } - i8257_dma_init(isa_bus, true); + i8257_dma_init_cascaded(isa_bus, true); =20 portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s, "i82374"); diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index 72f8893b9e..c930c4c531 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -654,7 +654,7 @@ static ISADevice *i8257_dma_init_slave(ISABus *bus, boo= l high_page_enable) return isa; } =20 -void i8257_dma_init(ISABus *bus, bool high_page_enable) +void i8257_dma_init_cascaded(ISABus *bus, bool high_page_enable) { ISADevice *master, *slave; =20 --=20 2.16.3