From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F54BCA9EAF for ; Mon, 21 Oct 2019 15:23:22 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3A3212053B for ; Mon, 21 Oct 2019 15:23:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DfhIuGJE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A3212053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMZWj-0003o9-EM for qemu-devel@archiver.kernel.org; Mon, 21 Oct 2019 11:23:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56267) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMZTH-0000cD-Un for qemu-devel@nongnu.org; Mon, 21 Oct 2019 11:19:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMZTG-0004OM-H6 for qemu-devel@nongnu.org; Mon, 21 Oct 2019 11:19:47 -0400 Received: from mail-ot1-x344.google.com ([2607:f8b0:4864:20::344]:43569) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMZTG-0004O7-9r for qemu-devel@nongnu.org; Mon, 21 Oct 2019 11:19:46 -0400 Received: by mail-ot1-x344.google.com with SMTP id o44so11311430ota.10 for ; Mon, 21 Oct 2019 08:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tz6w0C48MWIa2WMtQyrTIW8Jxx5xZ4x8upKdmxdEPCc=; b=DfhIuGJEx+vfA13FAI+Kr0BxOUsjcfZvOgUyPWuZkigj8gPhZEalxZXBA/x+e6emuc rOgs59mC5Ge+/sLvorLtiX0L8qAuVzhoPI9V+20I9MfDKmoPMB1HLBRkOrY5Ewvs0lfF CsMV7W6SfU5her6r6hJc62PsM12uQJvqpJ8SSlwXVBAZ97W2akETwHqxHl2CULSpna5p DWV3IMoG/CNE2QCzY4MlJZ3hoCwCZH5gmcC1BSiCfXKgtJ4JBWZJbJy14mvhXmOQMrJJ v9uY0BB0Lg/xP9qd0HqQ6ppAuveWyTIojQW+YORWGQl29zMQyZrjiyCMocSOaA5nMz/T 0EPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tz6w0C48MWIa2WMtQyrTIW8Jxx5xZ4x8upKdmxdEPCc=; b=RMMDq7P0E1unQ6kFqftdl4ZyRSZ5FefuBg40DG9ZjVbKNm4NMcIiQ0KOHBrE6owK25 QShdjn1gYVZueyfXFPgqWSoeNwbXh9Y7j811evANRhCZdbZVizux884UgPKBBrYyK7UA k5b9+7Ar1AaEewzYkMLHanr06L4+VWGeCij3aqrURM2ThmbUVG27PzFql3s6zK4YFjsG ma+i74APIABlsDnbGPsjOcQ3h7kFsqKo1BVB9P4EhwA0WJx2SYnPs0hZ+MkDBGRu/p4E VJX00IDEdPn8AmH6RzrLGuWsUN68ZxZtpSd5k5CUlvXiXe2lHZ1HMUBbU2cRxL5Ilh6D W+kg== X-Gm-Message-State: APjAAAVI/1bRT6iWk/kNkEN6dTnQPiiZl8Cj/pSkn6W51AzpC1LcWk+/ UjhE2dmB+Ik6gS9i9URQDsPImMBPTB5cmXfcpmycjslkk6I= X-Google-Smtp-Source: APXvYqy5B/+fp2AkMQJfPvSCGas9eFYhRWvfZlNsu8RTN1A3+HXPZLn2tBpGzNIYeEMNTibUlnYoA0vhzkxd2+pIJ3k= X-Received: by 2002:a9d:3ec:: with SMTP id f99mr17836427otf.353.1571671185421; Mon, 21 Oct 2019 08:19:45 -0700 (PDT) MIME-Version: 1.0 References: <20191018134754.16362-1-philmd@redhat.com> <20191018134754.16362-6-philmd@redhat.com> In-Reply-To: <20191018134754.16362-6-philmd@redhat.com> From: Li Qiang Date: Mon, 21 Oct 2019 23:19:08 +0800 Message-ID: Subject: Re: [PATCH v2 05/20] piix4: Rename PIIX4 object to piix4-isa To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Content-Type: multipart/alternative; boundary="000000000000b61af105956d3602" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::344 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: Stefano Stabellini , xen-devel@lists.xenproject.org, Paul Durrant , "Michael S. Tsirkin" , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Eduardo Habkost , Qemu Developers , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000b61af105956d3602 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Philippe Mathieu-Daud=C3=A9 =E4=BA=8E2019=E5=B9=B410=E6= =9C=8818=E6=97=A5=E5=91=A8=E4=BA=94 =E4=B8=8B=E5=8D=889:53=E5=86=99=E9=81= =93=EF=BC=9A > From: Herv=C3=A9 Poussineau > > Other piix4 parts are already named piix4-ide and piix4-usb-uhci. > > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > Acked-by: Michael S. Tsirkin > Acked-by: Paolo Bonzini > Signed-off-by: Herv=C3=A9 Poussineau > Message-Id: <20171216090228.28505-15-hpoussin@reactos.org> > Reviewed-by: Aleksandar Markovic > [PMD: rebased] > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > Reviewed-by: Li Qiang > --- > hw/isa/piix4.c | 1 - > hw/mips/mips_malta.c | 2 +- > include/hw/isa/isa.h | 2 ++ > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 9c37c85ae2..ac9383a658 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -45,7 +45,6 @@ typedef struct PIIX4State { > uint8_t rcr; > } PIIX4State; > > -#define TYPE_PIIX4_PCI_DEVICE "PIIX4" > #define PIIX4_PCI_DEVICE(obj) \ > OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 7d25ab6c23..e499b7a6bb 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine) > ide_drive_get(hd, ARRAY_SIZE(hd)); > > pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), > - true, "PIIX4"); > + true, TYPE_PIIX4_PCI_DEVICE); > dev =3D DEVICE(pci); > isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); > piix4_devfn =3D pci->devfn; > diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h > index 018ada4f6f..79f703fd6c 100644 > --- a/include/hw/isa/isa.h > +++ b/include/hw/isa/isa.h > @@ -147,4 +147,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *= d) > return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); > } > > +#define TYPE_PIIX4_PCI_DEVICE "piix4-isa" > + > #endif > -- > 2.21.0 > > > --000000000000b61af105956d3602 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com> =E4=BA=8E2019=E5= =B9=B410=E6=9C=8818=E6=97=A5=E5=91=A8=E4=BA=94 =E4=B8=8B=E5=8D=889:53=E5=86= =99=E9=81=93=EF=BC=9A
From: Herv=C3=A9 Poussineau <hpoussin@reactos.org>

Other piix4 parts are already named piix4-ide and piix4-usb-uhci.

Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Herv=C3=A9 Poussineau <hpoussin@reactos.org>
Message-Id: <20171216090228.28505-15-hpoussin@reactos.org>=
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
[PMD: rebased]
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
<= br>

Reviewed-by: Li Qiang <liq3ea@gmail.com>
=C2=A0
---
=C2=A0hw/isa/piix4.c=C2=A0 =C2=A0 =C2=A0 =C2=A0| 1 -
=C2=A0hw/mips/mips_malta.c | 2 +-
=C2=A0include/hw/isa/isa.h | 2 ++
=C2=A03 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 9c37c85ae2..ac9383a658 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -45,7 +45,6 @@ typedef struct PIIX4State {
=C2=A0 =C2=A0 =C2=A0uint8_t rcr;
=C2=A0} PIIX4State;

-#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
=C2=A0#define PIIX4_PCI_DEVICE(obj) \
=C2=A0 =C2=A0 =C2=A0OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE)<= br>
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 7d25ab6c23..e499b7a6bb 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0ide_drive_get(hd, ARRAY_SIZE(hd));

=C2=A0 =C2=A0 =C2=A0pci =3D pci_create_simple_multifunction(pci_bus, PCI_DE= VFN(10, 0),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 t= rue, "PIIX4");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 t= rue, TYPE_PIIX4_PCI_DEVICE);
=C2=A0 =C2=A0 =C2=A0dev =3D DEVICE(pci);
=C2=A0 =C2=A0 =C2=A0isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0= "));
=C2=A0 =C2=A0 =C2=A0piix4_devfn =3D pci->devfn;
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 018ada4f6f..79f703fd6c 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -147,4 +147,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)=
=C2=A0 =C2=A0 =C2=A0return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
=C2=A0}

+#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
+
=C2=A0#endif
--
2.21.0


--000000000000b61af105956d3602-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00A6DCA9EB0 for ; Mon, 21 Oct 2019 15:20:02 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C4C112084B for ; Mon, 21 Oct 2019 15:20:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DfhIuGJE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4C112084B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMZTI-0004QY-41; Mon, 21 Oct 2019 15:19:48 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iMZTG-0004QP-Ok for xen-devel@lists.xenproject.org; Mon, 21 Oct 2019 15:19:46 +0000 X-Inumbo-ID: 36cf22fa-f416-11e9-8aca-bc764e2007e4 Received: from mail-ot1-x343.google.com (unknown [2607:f8b0:4864:20::343]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 36cf22fa-f416-11e9-8aca-bc764e2007e4; Mon, 21 Oct 2019 15:19:45 +0000 (UTC) Received: by mail-ot1-x343.google.com with SMTP id 41so11297296oti.12 for ; Mon, 21 Oct 2019 08:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=tz6w0C48MWIa2WMtQyrTIW8Jxx5xZ4x8upKdmxdEPCc=; b=DfhIuGJEx+vfA13FAI+Kr0BxOUsjcfZvOgUyPWuZkigj8gPhZEalxZXBA/x+e6emuc rOgs59mC5Ge+/sLvorLtiX0L8qAuVzhoPI9V+20I9MfDKmoPMB1HLBRkOrY5Ewvs0lfF CsMV7W6SfU5her6r6hJc62PsM12uQJvqpJ8SSlwXVBAZ97W2akETwHqxHl2CULSpna5p DWV3IMoG/CNE2QCzY4MlJZ3hoCwCZH5gmcC1BSiCfXKgtJ4JBWZJbJy14mvhXmOQMrJJ v9uY0BB0Lg/xP9qd0HqQ6ppAuveWyTIojQW+YORWGQl29zMQyZrjiyCMocSOaA5nMz/T 0EPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=tz6w0C48MWIa2WMtQyrTIW8Jxx5xZ4x8upKdmxdEPCc=; b=rRacyMXzhBIVleEGtBjD6dMVJlo2QMgRn0/IEw11L0+76SVRDl6/8+v0cHsQJF5oEx Vu+7q6ihCUciLiLy9Ik5PVN3yWlcYVQ+JOtbrclpQx9bkO5xajvRHdxrAgQBbsKd3/AR t/dXnxVy0zs/d9/roSuGpBRfaNC25iV9bJfXmIVnBVeP2zQe93hm6a8wHX+PbvPF146D p01YvEV91bHjhYYKXdnbSMMBnNunU77ASxhZMzjZu6o0n43S4AxHcdlypmG0t/T0bobX JTaCvXhvuJ7PJ9BSUsR86UslVHm5zMQUd/4F2klt6vMu4KIT8HiPjmfftbGCNuNxeXNC 6YKg== X-Gm-Message-State: APjAAAUNGQhEcILieYRYOLXFYwfAWUkzgTxFsAwIaGILTZCrnq9IzAJp 9kH9bUwUtqNFdZB9zK0D2NWM1ARHlylvKpJpOgY= X-Google-Smtp-Source: APXvYqy5B/+fp2AkMQJfPvSCGas9eFYhRWvfZlNsu8RTN1A3+HXPZLn2tBpGzNIYeEMNTibUlnYoA0vhzkxd2+pIJ3k= X-Received: by 2002:a9d:3ec:: with SMTP id f99mr17836427otf.353.1571671185421; Mon, 21 Oct 2019 08:19:45 -0700 (PDT) MIME-Version: 1.0 References: <20191018134754.16362-1-philmd@redhat.com> <20191018134754.16362-6-philmd@redhat.com> In-Reply-To: <20191018134754.16362-6-philmd@redhat.com> From: Li Qiang Date: Mon, 21 Oct 2019 23:19:08 +0800 Message-ID: To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Subject: Re: [Xen-devel] [PATCH v2 05/20] piix4: Rename PIIX4 object to piix4-isa X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , xen-devel@lists.xenproject.org, Paul Durrant , "Michael S. Tsirkin" , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Eduardo Habkost , Qemu Developers , =?UTF-8?Q?Herv=C3=A9_Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno , Richard Henderson Content-Type: multipart/mixed; boundary="===============4819263534900481554==" Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" --===============4819263534900481554== Content-Type: multipart/alternative; boundary="000000000000b61af105956d3602" --000000000000b61af105956d3602 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Philippe Mathieu-Daud=C3=A9 =E4=BA=8E2019=E5=B9=B410=E6= =9C=8818=E6=97=A5=E5=91=A8=E4=BA=94 =E4=B8=8B=E5=8D=889:53=E5=86=99=E9=81= =93=EF=BC=9A > From: Herv=C3=A9 Poussineau > > Other piix4 parts are already named piix4-ide and piix4-usb-uhci. > > Reviewed-by: Philippe Mathieu-Daud=C3=A9 > Acked-by: Michael S. Tsirkin > Acked-by: Paolo Bonzini > Signed-off-by: Herv=C3=A9 Poussineau > Message-Id: <20171216090228.28505-15-hpoussin@reactos.org> > Reviewed-by: Aleksandar Markovic > [PMD: rebased] > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > Reviewed-by: Li Qiang > --- > hw/isa/piix4.c | 1 - > hw/mips/mips_malta.c | 2 +- > include/hw/isa/isa.h | 2 ++ > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c > index 9c37c85ae2..ac9383a658 100644 > --- a/hw/isa/piix4.c > +++ b/hw/isa/piix4.c > @@ -45,7 +45,6 @@ typedef struct PIIX4State { > uint8_t rcr; > } PIIX4State; > > -#define TYPE_PIIX4_PCI_DEVICE "PIIX4" > #define PIIX4_PCI_DEVICE(obj) \ > OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 7d25ab6c23..e499b7a6bb 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine) > ide_drive_get(hd, ARRAY_SIZE(hd)); > > pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), > - true, "PIIX4"); > + true, TYPE_PIIX4_PCI_DEVICE); > dev =3D DEVICE(pci); > isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); > piix4_devfn =3D pci->devfn; > diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h > index 018ada4f6f..79f703fd6c 100644 > --- a/include/hw/isa/isa.h > +++ b/include/hw/isa/isa.h > @@ -147,4 +147,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *= d) > return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); > } > > +#define TYPE_PIIX4_PCI_DEVICE "piix4-isa" > + > #endif > -- > 2.21.0 > > > --000000000000b61af105956d3602 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com> =E4=BA=8E2019=E5= =B9=B410=E6=9C=8818=E6=97=A5=E5=91=A8=E4=BA=94 =E4=B8=8B=E5=8D=889:53=E5=86= =99=E9=81=93=EF=BC=9A
From: Herv=C3=A9 Poussineau <hpoussin@reactos.org>

Other piix4 parts are already named piix4-ide and piix4-usb-uhci.

Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Herv=C3=A9 Poussineau <hpoussin@reactos.org>
Message-Id: <20171216090228.28505-15-hpoussin@reactos.org>=
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
[PMD: rebased]
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
<= br>

Reviewed-by: Li Qiang <liq3ea@gmail.com>
=C2=A0
---
=C2=A0hw/isa/piix4.c=C2=A0 =C2=A0 =C2=A0 =C2=A0| 1 -
=C2=A0hw/mips/mips_malta.c | 2 +-
=C2=A0include/hw/isa/isa.h | 2 ++
=C2=A03 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 9c37c85ae2..ac9383a658 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -45,7 +45,6 @@ typedef struct PIIX4State {
=C2=A0 =C2=A0 =C2=A0uint8_t rcr;
=C2=A0} PIIX4State;

-#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
=C2=A0#define PIIX4_PCI_DEVICE(obj) \
=C2=A0 =C2=A0 =C2=A0OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE)<= br>
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 7d25ab6c23..e499b7a6bb 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine)
=C2=A0 =C2=A0 =C2=A0ide_drive_get(hd, ARRAY_SIZE(hd));

=C2=A0 =C2=A0 =C2=A0pci =3D pci_create_simple_multifunction(pci_bus, PCI_DE= VFN(10, 0),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 t= rue, "PIIX4");
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 t= rue, TYPE_PIIX4_PCI_DEVICE);
=C2=A0 =C2=A0 =C2=A0dev =3D DEVICE(pci);
=C2=A0 =C2=A0 =C2=A0isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0= "));
=C2=A0 =C2=A0 =C2=A0piix4_devfn =3D pci->devfn;
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 018ada4f6f..79f703fd6c 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -147,4 +147,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)=
=C2=A0 =C2=A0 =C2=A0return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
=C2=A0}

+#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
+
=C2=A0#endif
--
2.21.0


--000000000000b61af105956d3602-- --===============4819263534900481554== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0 cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA== --===============4819263534900481554==--