[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH v2 04/22] hw/isa/pc87312: Rename the device
From: |
David Gibson |
Subject: |
Re: [Qemu-devel] [RFC PATCH v2 04/22] hw/isa/pc87312: Rename the device type as TYPE_PC87312_SUPERIO |
Date: |
Tue, 6 Mar 2018 11:05:48 +1100 |
User-agent: |
Mutt/1.9.2 (2017-12-15) |
On Mon, Mar 05, 2018 at 06:19:10PM -0300, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
hw/ppc part
Acked-by: David Gibson <address@hidden>
> ---
> include/hw/isa/pc87312.h | 4 ++--
> hw/isa/pc87312.c | 2 +-
> hw/ppc/prep.c | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/hw/isa/pc87312.h b/include/hw/isa/pc87312.h
> index bf74470d40..710eb1c807 100644
> --- a/include/hw/isa/pc87312.h
> +++ b/include/hw/isa/pc87312.h
> @@ -28,8 +28,8 @@
> #include "hw/isa/isa.h"
>
>
> -#define TYPE_PC87312 "pc87312"
> -#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312)
> +#define TYPE_PC87312_SUPERIO "pc87312"
> +#define PC87312(obj) OBJECT_CHECK(PC87312State, (obj), TYPE_PC87312_SUPERIO)
>
> typedef struct PC87312State {
> ISADevice dev;
> diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
> index 48b29e3c3c..e9edbc6c50 100644
> --- a/hw/isa/pc87312.c
> +++ b/hw/isa/pc87312.c
> @@ -391,7 +391,7 @@ static void pc87312_class_init(ObjectClass *klass, void
> *data)
> }
>
> static const TypeInfo pc87312_type_info = {
> - .name = TYPE_PC87312,
> + .name = TYPE_PC87312_SUPERIO,
> .parent = TYPE_ISA_DEVICE,
> .instance_size = sizeof(PC87312State),
> .instance_init = pc87312_initfn,
> diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
> index ae724b0613..610ec7ec32 100644
> --- a/hw/ppc/prep.c
> +++ b/hw/ppc/prep.c
> @@ -613,7 +613,7 @@ static void ppc_prep_init(MachineState *machine)
> isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(pci), "isa.0"));
>
> /* Super I/O (parallel + serial ports) */
> - isa = isa_create(isa_bus, TYPE_PC87312);
> + isa = isa_create(isa_bus, TYPE_PC87312_SUPERIO);
> dev = DEVICE(isa);
> qdev_prop_set_uint8(dev, "config", 13); /* fdc, ser0, ser1, par0 */
> qdev_init_nofail(dev);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- [Qemu-devel] [RFC PATCH v2 00/22] remove i386/pc dependency: generic SuperIO, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 01/22] hw/isa: Move parallel_hds_isa_init() to hw/char/parallel-isa.c, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 02/22] hw/dma/i8257: Rename DMA_init() to i8257_dma_init(), Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 03/22] hw/input/i8042: Extract declarations from i386/pc.h into input/i8042.h, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 06/22] hw/isa/pc87312: Use 'unsigned int' for the irq value, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 05/22] hw/isa/pc87312: Use uint16_t for the ISA I/O base address, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 04/22] hw/isa/pc87312: Rename the device type as TYPE_PC87312_SUPERIO, Philippe Mathieu-Daudé, 2018/03/05
- Re: [Qemu-devel] [RFC PATCH v2 04/22] hw/isa/pc87312: Rename the device type as TYPE_PC87312_SUPERIO,
David Gibson <=
- [Qemu-devel] [RFC PATCH v2 07/22] hw/isa/superio: Add a Super I/O template based on the PC87312 device, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 08/22] hw/isa/pc87312: Inherit from the abstract TYPE_ISA_SUPERIO, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 09/22] hw/isa/superio: Factor out the parallel code from pc87312.c, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 12/22] hw/isa/superio: Add a keyboard/mouse controller (8042), Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 10/22] hw/isa/superio: Factor out the serial code from pc87312.c, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 11/22] hw/isa/superio: Factor out the floppy disc controller code from pc87312.c, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 13/22] hw/isa/superio: Factor out the IDE code from pc87312.c, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-devel] [RFC PATCH v2 14/22] hw/mips/malta: Code movement, Philippe Mathieu-Daudé, 2018/03/05