From nobody Wed Nov 27 19:36:01 2024 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=1697645673; cv=none; d=zohomail.com; s=zohoarc; b=kBh9mVKPl2eV6G4mORd9ltgQEE0cyCR3rgBWSOXzCBpbMu0Zt04Yz20Peli21rRwuOIKVJqvUoJnwyCWmZz4Xi39gQ75VU75IxHmJkI/8URYgIKZ4G7qQEoDFkviFoFHZJqQv4EuI+aiK9sE0z1LRYn9KjGXsrqdo8n1kmC4pFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697645673; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f/7Z3H+51oJIJWzVgGhiU5HVqcfMDnbILXmSBJdNG3g=; b=Ela6wKUNPAgqpoMkfidNvoG/WOQ02RXzQgu1FsiIlHu+C/Aa2iloaLII6q1vFshqazY8eTFfvC78IldCkpwg7ogZP15aR4bDPsWPj1UMONZupH25glU7ruekQVsZPV8qPf20LXXIIoyKvwIqLM8OO+Iecf2Hiz0iXRjON2RgYPE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697645673104190.8789504306036; Wed, 18 Oct 2023 09:14:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt8wm-0001KS-NC; Wed, 18 Oct 2023 11:59:00 -0400 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 1qt8wI-0000nF-Qm for qemu-devel@nongnu.org; Wed, 18 Oct 2023 11:58:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qt8wG-0007QF-7p for qemu-devel@nongnu.org; Wed, 18 Oct 2023 11:58:29 -0400 Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-67-VLPQ2JWCOgi5NTkUghYXiw-1; Wed, 18 Oct 2023 11:58:20 -0400 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-507a3ae32beso4505380e87.2 for ; Wed, 18 Oct 2023 08:58:20 -0700 (PDT) Received: from redhat.com ([2a02:14f:1f2:2037:f34:d61b:7da0:a7be]) by smtp.gmail.com with ESMTPSA id az15-20020a05600c600f00b00406447b798bsm2019928wmb.37.2023.10.18.08.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 08:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697644707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f/7Z3H+51oJIJWzVgGhiU5HVqcfMDnbILXmSBJdNG3g=; b=DgnXKSq8u6hL+4lUMdy1D3ghAKW96JU//gofuH0d1RlTw9WOdSuPczdavFSNzEIapJVi9h K/eltECVNkm5fpF9ZlLViJykWihnWt1kRrITXA2u7YHBbVB2n/Bfsnp5e4G2g4xAr+SSFX R7UsxTTO+Piw82i9Ulw9O63xKZPR/38= X-MC-Unique: VLPQ2JWCOgi5NTkUghYXiw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697644698; x=1698249498; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f/7Z3H+51oJIJWzVgGhiU5HVqcfMDnbILXmSBJdNG3g=; b=HjGgEiapSm/8hlQC5NdeORiEyJynsy4eOie+o/TKEcOSy8fzknjV8beC+heJG3Y0fx KSiVFPXr/0PzUIdaDM8YuDsoFqQLwkZ7EDCj84fXgxtT1l4GP44VLUNgi9B5trPZV2qh O9OWvjXTxCplJmgShQ811evIoY5y1VOgmqx9xl97Oz6TzxrRKhEk24obJic7Knvdsvw5 kwr8pgF/TwRX4lQeUsbOww3JxXbA8b4MlbLjR4nEIOBHc+Gk/iJut9TP7/5+Kuq392PF VR4WKYlUJVFGxh+aHuJpklWbQB0KlomyYdeV4FaERLqVezYaQOXo4LmLtoi+crJnv0G0 v3YQ== X-Gm-Message-State: AOJu0YxGXF5rL6DON9/2tukW/Zg2/n1MFiH1fydNnJhDjDl1cP1mJHkZ ue08OzFd3XrK/x9hvAl/KNKKlLOgbe7bNbHX8Ad8/4N478Hs9n5HXfeDU0QBJnwQ3gGD92KAGxn h5QdSaWo5UqQwm579txfu//TkTNpRdepS10l0w9faauuCH8ZmKQc1bKSOa/zw5Odoc2F+jiU= X-Received: by 2002:a19:e041:0:b0:503:99d:5a97 with SMTP id g1-20020a19e041000000b00503099d5a97mr4494718lfj.20.1697644698695; Wed, 18 Oct 2023 08:58:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHm2UcGcTSLn4PwHqeyN+e0jMbyLHTT9BSNzW++LdJ+IfPRdrrpog7kAQF8I05DTP2Ly1WGdA== X-Received: by 2002:a19:e041:0:b0:503:99d:5a97 with SMTP id g1-20020a19e041000000b00503099d5a97mr4494701lfj.20.1697644698322; Wed, 18 Oct 2023 08:58:18 -0700 (PDT) Date: Wed, 18 Oct 2023 11:58:13 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Bernhard Beschow , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Aurelien Jarno , =?utf-8?B?SGVydsOp?= Poussineau , Marcel Apfelbaum Subject: [PULL 64/83] hw/isa/piix: Harmonize names of reset control memory regions Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1697645675098100003 From: Bernhard Beschow There is no need for having different names here. Having the same name further allows code to be shared between PIIX3 and PIIX4. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael S. Tsirkin Message-Id: <20231007123843.127151-23-shentey@gmail.com> Signed-off-by: Michael S. Tsirkin --- hw/isa/piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/isa/piix.c b/hw/isa/piix.c index 270b8eb1f7..bd66fb7475 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -339,7 +339,7 @@ static void pci_piix3_realize(PCIDevice *dev, Error **e= rrp) } =20 memory_region_init_io(&d->rcr_mem, OBJECT(dev), &rcr_ops, d, - "piix3-reset-control", 1); + "piix-reset-control", 1); memory_region_add_subregion_overlap(pci_address_space_io(dev), PIIX_RCR_IOPORT, &d->rcr_mem, 1); =20 @@ -532,7 +532,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) "intr", 1); =20 memory_region_init_io(&s->rcr_mem, OBJECT(dev), &rcr_ops, s, - "reset-control", 1); + "piix-reset-control", 1); memory_region_add_subregion_overlap(pci_address_space_io(dev), PIIX_RCR_IOPORT, &s->rcr_mem, 1); =20 --=20 MST