From: "Michael S. Tsirkin" <mst@redhat.com>
To: Bernhard Beschow <shentey@gmail.com>
Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
John Snow <jsnow@redhat.com>,
"open list:IDE" <qemu-block@nongnu.org>
Subject: Re: [PATCH 1/3] hw/ide/piix: Remove redundant "piix3-ide-xen" device class
Date: Fri, 13 May 2022 07:26:12 -0400 [thread overview]
Message-ID: <20220513072532-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20220508103432.14874-2-shentey@gmail.com>
On Sun, May 08, 2022 at 12:34:30PM +0200, Bernhard Beschow wrote:
> Commit 0f8445820f11a69154309863960328dda3dc1ad4 'xen: piix reuse pci
> generic class init function' already resolved redundant code which in
> turn rendered piix3-ide-xen redundant.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Cc xen maintainers for review please.
> ---
> hw/i386/pc_piix.c | 3 +--
> hw/ide/piix.c | 7 -------
> 2 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 4c185c72d0..27dfde4917 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -244,8 +244,7 @@ static void pc_init1(MachineState *machine,
> if (pcmc->pci_enabled) {
> PCIDevice *dev;
>
> - dev = pci_create_simple(pci_bus, piix3_devfn + 1,
> - xen_enabled() ? "piix3-ide-xen" : "piix3-ide");
> + dev = pci_create_simple(pci_bus, piix3_devfn + 1, "piix3-ide");
> pci_ide_create_devs(dev);
> idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
> idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
> diff --git a/hw/ide/piix.c b/hw/ide/piix.c
> index ce89fd0aa3..2345fe9e1d 100644
> --- a/hw/ide/piix.c
> +++ b/hw/ide/piix.c
> @@ -241,12 +241,6 @@ static const TypeInfo piix3_ide_info = {
> .class_init = piix3_ide_class_init,
> };
>
> -static const TypeInfo piix3_ide_xen_info = {
> - .name = "piix3-ide-xen",
> - .parent = TYPE_PCI_IDE,
> - .class_init = piix3_ide_class_init,
> -};
> -
> /* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */
> static void piix4_ide_class_init(ObjectClass *klass, void *data)
> {
> @@ -272,7 +266,6 @@ static const TypeInfo piix4_ide_info = {
> static void piix_ide_register_types(void)
> {
> type_register_static(&piix3_ide_info);
> - type_register_static(&piix3_ide_xen_info);
> type_register_static(&piix4_ide_info);
> }
>
> --
> 2.36.1
next prev parent reply other threads:[~2022-05-13 11:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-08 10:34 [PATCH 0/3] PIIX3-IDE XEN cleanup Bernhard Beschow
2022-05-08 10:34 ` [PATCH 1/3] hw/ide/piix: Remove redundant "piix3-ide-xen" device class Bernhard Beschow
2022-05-13 11:26 ` Michael S. Tsirkin [this message]
2022-05-08 10:34 ` [PATCH 2/3] hw/ide/piix: Add some documentation to pci_piix3_xen_ide_unplug() Bernhard Beschow
2022-05-08 10:34 ` [PATCH 3/3] include/hw/ide: Unexport pci_piix3_xen_ide_unplug() Bernhard Beschow
2022-05-09 8:02 ` Durrant, Paul
2022-05-09 10:01 ` Bernhard Beschow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220513072532-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=eduardo@habkost.net \
--cc=jsnow@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shentey@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.