From patchwork Wed Dec 21 16:59:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13078947 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F679C4332F for ; Wed, 21 Dec 2022 17:12:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p82U0-0003eq-Uw; Wed, 21 Dec 2022 12:02:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p82Su-0002t0-9S; Wed, 21 Dec 2022 12:01:13 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p82Ss-0008Fr-D5; Wed, 21 Dec 2022 12:01:11 -0500 Received: by mail-ed1-x535.google.com with SMTP id d20so22956238edn.0; Wed, 21 Dec 2022 09:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SFFek+s8BIM8wQ0wqjEoppj4tP+tw4eVIkX21neR6gM=; b=mP4rMdJLeqknglYLxewrCw8NUCXebcujg8uCqYsj+3guIxfHLNNhkFlbqxd+zvO5K3 Xz7SawXRUBggh2H0fRPaFdd/L9+oShtAw5qv+m+CEDuyfkQtltVkOBTaDfqyckqd7wKx 63wAungRS1kFbPTgfNAsfvS8UhmOaxe8PZ37DknocTeGqh4U+/LOLw3WLjg0cdojuYfL LqP5vrx6V3zDneITRR4R3vb/G7G+F95iN3i+1H1yZJvcHz+QM5CA9nAtql4CmUerzHvU qgrI+pGgUAMUMVMpcokdCbsA7uxxUQyZGdQL95Q+l0ohhWhWezQW1Ej9/Y8gFpyLVd34 4xEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SFFek+s8BIM8wQ0wqjEoppj4tP+tw4eVIkX21neR6gM=; b=ln8YcaQTdEnaUkhSlQEUIHo8rSuXcvJ7tSsppDijBq/8Vqs/RTN2c5iGGeqJ+sx1Tj rtV2qvZdhMGROUM3M9zCpogiWZZO14YGvOetjq2SM0FilGiiiT9zm3H3SETI4mKqz7Fn +fwbC8G3f0HK6fkCUi/5sKdA1CJ9VkmG5iw2mmNr+SPFFe/GDoFK0kMa0jnGVB6IaG90 +KHCWi0CKum15sUrv3BWt0la8U0mfUPudBZJ/vzAMlUZv6qYTBQfSLH4u5p6LiXeYvHl jjyVWpjeQfitc93ZZ++1JZtmHWvSoIsgeoTZJSOGAa7uJG9OZ1vV2KtAhpEnJTTB1c3B 6HSA== X-Gm-Message-State: AFqh2krmVEzr3m1IXPlQWqK2jFnPnzHngGPgp+WDNarj8ggxMH+YNSXv YVdPepj1HZCmL4Uyp9eJfIHbCcjNwcg= X-Google-Smtp-Source: AMrXdXuvcF7pIyrp8It577lsDnrrzorBqnRlM/mJhK2AEhSwwHqPWygfz2YbnKzpM4FAoEKhECSa5Q== X-Received: by 2002:a05:6402:d4f:b0:475:c621:a0e4 with SMTP id ec15-20020a0564020d4f00b00475c621a0e4mr1766638edb.26.1671642067901; Wed, 21 Dec 2022 09:01:07 -0800 (PST) Received: from localhost.localdomain (dynamic-092-224-051-061.92.224.pool.telefonica.de. [92.224.51.61]) by smtp.gmail.com with ESMTPSA id n14-20020aa7db4e000000b0047466e46662sm7204019edt.39.2022.12.21.09.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 09:01:07 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Richard Henderson , Igor Mammedov , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paolo Bonzini , qemu-block@nongnu.org, =?utf-8?q?Herv?= =?utf-8?q?=C3=A9_Poussineau?= , Jiaxun Yang , Ani Sinha , John Snow , Gerd Hoffmann , "Michael S. Tsirkin" , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Bernhard Beschow Subject: [PATCH v4 18/30] hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4 Date: Wed, 21 Dec 2022 17:59:51 +0100 Message-Id: <20221221170003.2929-19-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221221170003.2929-1-shentey@gmail.com> References: <20221221170003.2929-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=shentey@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael S. Tsirkin Message-Id: <20221022150508.26830-23-shentey@gmail.com> --- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index 63f41741e0..0848ae1c47 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -145,7 +145,7 @@ static void piix3_write_config_xen(PCIDevice *dev, piix3_write_config(dev, address, val, len); } -static void piix3_reset(DeviceState *dev) +static void piix_reset(DeviceState *dev) { PIIX3State *d = PIIX3_PCI_DEVICE(dev); uint8_t *pci_conf = d->dev.config; @@ -395,7 +395,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass); - dc->reset = piix3_reset; + dc->reset = piix_reset; dc->desc = "ISA bridge"; dc->vmsd = &vmstate_piix3; dc->hotpluggable = false;