[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [Qemu-devel] [PATCH] ide: piix: convert constant devi
From: |
John Snow |
Subject: |
Re: [Qemu-trivial] [Qemu-devel] [PATCH] ide: piix: convert constant device name to MACRO |
Date: |
Wed, 10 Oct 2018 12:40:35 -0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 |
On 10/10/2018 12:29 AM, Li Qiang wrote:
> Signed-off-by: Li Qiang <address@hidden>
> ---
> hw/ide/piix.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/hw/ide/piix.c b/hw/ide/piix.c
> index a3afe1f..5f29cce 100644
> --- a/hw/ide/piix.c
> +++ b/hw/ide/piix.c
> @@ -35,6 +35,10 @@
> #include "hw/ide/pci.h"
> #include "trace.h"
>
> +#define TYPE_PIIX3_IDE "piix3-ide"
> +#define TYPE_PIIX3_IDE_XEN "piix3-ide-xen"
> +#define TYPE_PIIX4_IDE "piix4-ide"
> +
> static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size)
> {
> BMDMAState *bm = opaque;
> @@ -204,7 +208,7 @@ PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo
> **hd_table, int devfn)
> {
> PCIDevice *dev;
>
> - dev = pci_create_simple(bus, devfn, "piix3-ide-xen");
> + dev = pci_create_simple(bus, devfn, TYPE_PIIX3_IDE_XEN);
> pci_ide_create_devs(dev, hd_table);
> return dev;
> }
> @@ -226,7 +230,7 @@ PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo
> **hd_table, int devfn)
> {
> PCIDevice *dev;
>
> - dev = pci_create_simple(bus, devfn, "piix3-ide");
> + dev = pci_create_simple(bus, devfn, TYPE_PIIX3_IDE);
> pci_ide_create_devs(dev, hd_table);
> return dev;
> }
> @@ -237,7 +241,7 @@ PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo
> **hd_table, int devfn)
> {
> PCIDevice *dev;
>
> - dev = pci_create_simple(bus, devfn, "piix4-ide");
> + dev = pci_create_simple(bus, devfn, TYPE_PIIX4_IDE);
> pci_ide_create_devs(dev, hd_table);
> return dev;
> }
> @@ -257,13 +261,13 @@ static void piix3_ide_class_init(ObjectClass *klass,
> void *data)
> }
>
> static const TypeInfo piix3_ide_info = {
> - .name = "piix3-ide",
> + .name = TYPE_PIIX3_IDE,
> .parent = TYPE_PCI_IDE,
> .class_init = piix3_ide_class_init,
> };
>
> static const TypeInfo piix3_ide_xen_info = {
> - .name = "piix3-ide-xen",
> + .name = TYPE_PIIX3_IDE_XEN,
> .parent = TYPE_PCI_IDE,
> .class_init = piix3_ide_class_init,
> };
> @@ -283,7 +287,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void
> *data)
> }
>
> static const TypeInfo piix4_ide_info = {
> - .name = "piix4-ide",
> + .name = TYPE_PIIX4_IDE,
> .parent = TYPE_PCI_IDE,
> .class_init = piix4_ide_class_init,
> };
>
Reviewed-by: John Snow <address@hidden>
Sure thing. This can actually go through the trivial queue:
Acked-by: John Snow <address@hidden>
CC'd qemu-trivial.
--js
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-trivial] [Qemu-devel] [PATCH] ide: piix: convert constant device name to MACRO,
John Snow <=