[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC 13/13] make CPU a child of DeviceState
From: |
Peter Crosthwaite |
Subject: |
Re: [Qemu-devel] [RFC 13/13] make CPU a child of DeviceState |
Date: |
Wed, 10 Oct 2012 00:43:00 +1000 |
Ping for Peter,
This is a prerequisite for you ARM CPU reset as a GPIO idea. I'm on
board with it, if we can get this through which will make it
relatively painless to refactor my series.
Regards,
Peter
On Fri, Oct 5, 2012 at 5:15 AM, Eduardo Habkost <address@hidden> wrote:
> From: Igor Mammedov <address@hidden>
>
> [ehabkost: change CPU type declaration to hae TYPE_DEVICE as parent]
>
> Signed-off-by: Igor Mammedov <address@hidden>
> Signed-off-by: Eduardo Habkost <address@hidden>
Acked-by: Peter Crosthwaite <address@hidden>
> ---
> include/qemu/cpu.h | 6 +++---
> qom/cpu.c | 3 ++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h
> index ad706a6..ac44057 100644
> --- a/include/qemu/cpu.h
> +++ b/include/qemu/cpu.h
> @@ -20,7 +20,7 @@
> #ifndef QEMU_CPU_H
> #define QEMU_CPU_H
>
> -#include "qemu/object.h"
> +#include "hw/qdev-core.h"
> #include "qemu-thread.h"
>
> /**
> @@ -46,7 +46,7 @@ typedef struct CPUState CPUState;
> */
> typedef struct CPUClass {
> /*< private >*/
> - ObjectClass parent_class;
> + DeviceClass parent_class;
> /*< public >*/
>
> void (*reset)(CPUState *cpu);
> @@ -59,7 +59,7 @@ typedef struct CPUClass {
> */
> struct CPUState {
> /*< private >*/
> - Object parent_obj;
> + DeviceState parent_obj;
> /*< public >*/
>
> struct QemuThread *thread;
> diff --git a/qom/cpu.c b/qom/cpu.c
> index 5b36046..f59db7d 100644
> --- a/qom/cpu.c
> +++ b/qom/cpu.c
> @@ -20,6 +20,7 @@
>
> #include "qemu/cpu.h"
> #include "qemu-common.h"
> +#include "hw/qdev-core.h"
>
> void cpu_reset(CPUState *cpu)
> {
> @@ -43,7 +44,7 @@ static void cpu_class_init(ObjectClass *klass, void *data)
>
> static TypeInfo cpu_type_info = {
> .name = TYPE_CPU,
> - .parent = TYPE_OBJECT,
> + .parent = TYPE_DEVICE,
> .instance_size = sizeof(CPUState),
> .abstract = true,
> .class_size = sizeof(CPUClass),
> --
> 1.7.11.4
>
>
- [Qemu-devel] [RFC 11/13] qdev: use full qdev.h include path on qdev*.c, (continued)
- [Qemu-devel] [RFC 11/13] qdev: use full qdev.h include path on qdev*.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 03/13] qapi-types.h doesn't really need to include qemu-common.h, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 05/13] qdev: rename qdev.c to qdev-core.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 09/13] qdev: move reset register/unregister code to qdev-system.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 07/13] qdev: move vmstate handling to qdev-system.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 01/13] qdev: kill bogus comment, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 02/13] qdev: split up header so it can be used in cpu.h, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 06/13] qdev-core: isolate vmstate handling into separate functions, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 13/13] make CPU a child of DeviceState, Eduardo Habkost, 2012/10/04
- Re: [Qemu-devel] [RFC 13/13] make CPU a child of DeviceState,
Peter Crosthwaite <=
- [Qemu-devel] [RFC 12/13] include core qdev code into *-user, too, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 04/13] qdev: separate core from the code used only by qemu-system-*, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 10/13] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [RFC 08/13] qdev-core: isolate reset register/unregister code, Eduardo Habkost, 2012/10/04