Move QOM, qdev, machine core and dump code

[Qemu-devel] [PATCH 07/17] MAINTAINERS: Merge sections CPU, NUMA into Machine core

Posted by Markus Armbruster 6 years, 4 months ago

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 MAINTAINERS | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1aef0afaf7..f18fddbbbb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1268,8 +1268,12 @@ S: Supported
 F: hw/core/machine.c
 F: hw/core/null-machine.c
 F: hw/cpu/cluster.c
+F: numa.c
+F: qom/cpu.c
 F: include/hw/boards.h
 F: include/hw/cpu/cluster.h
+F: include/qom/cpu.h
+F: include/sysemu/numa.h
 T: git https://github.com/ehabkost/qemu.git machine-next
 
 Xtensa Machines
@@ -1833,11 +1837,6 @@ M: Markus Armbruster <armbru@redhat.com>
 S: Supported
 F: scripts/coverity-model.c
 
-CPU
-S: Supported
-F: qom/cpu.c
-F: include/qom/cpu.h
-
 Device Tree
 M: Alistair Francis <alistair.francis@wdc.com>
 R: David Gibson <david@gibson.dropbear.id.au>
@@ -1945,13 +1944,6 @@ W: http://info.iet.unipi.it/~luigi/netmap/
 S: Maintained
 F: net/netmap.c
 
-NUMA
-M: Eduardo Habkost <ehabkost@redhat.com>
-S: Maintained
-F: numa.c
-F: include/sysemu/numa.h
-T: git https://github.com/ehabkost/qemu.git machine-next
-
 Host Memory Backends
 M: Eduardo Habkost <ehabkost@redhat.com>
 M: Igor Mammedov <imammedo@redhat.com>
-- 
2.21.0

Re: [Qemu-devel] [PATCH 07/17] MAINTAINERS: Merge sections CPU, NUMA into Machine core

Posted by Daniel P. Berrangé 6 years, 4 months ago

On Wed, Jun 19, 2019 at 10:10:40PM +0200, Markus Armbruster wrote:
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  MAINTAINERS | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 1aef0afaf7..f18fddbbbb 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1268,8 +1268,12 @@ S: Supported
>  F: hw/core/machine.c
>  F: hw/core/null-machine.c
>  F: hw/cpu/cluster.c
> +F: numa.c
> +F: qom/cpu.c

Not a blocker for this patch, but as a later patch, I'd encourage you to
move qom/cpu.c somewhere else. Pretty much anywhere else would be better
than under qom/ IMHO :-)

>  F: include/hw/boards.h
>  F: include/hw/cpu/cluster.h
> +F: include/qom/cpu.h

Likewise

> +F: include/sysemu/numa.h
>  T: git https://github.com/ehabkost/qemu.git machine-next
>  
>  Xtensa Machines
> @@ -1833,11 +1837,6 @@ M: Markus Armbruster <armbru@redhat.com>
>  S: Supported
>  F: scripts/coverity-model.c
>  
> -CPU
> -S: Supported
> -F: qom/cpu.c
> -F: include/qom/cpu.h
> -
>  Device Tree
>  M: Alistair Francis <alistair.francis@wdc.com>
>  R: David Gibson <david@gibson.dropbear.id.au>
> @@ -1945,13 +1944,6 @@ W: http://info.iet.unipi.it/~luigi/netmap/
>  S: Maintained
>  F: net/netmap.c
>  
> -NUMA
> -M: Eduardo Habkost <ehabkost@redhat.com>
> -S: Maintained
> -F: numa.c
> -F: include/sysemu/numa.h
> -T: git https://github.com/ehabkost/qemu.git machine-next
> -
>  Host Memory Backends
>  M: Eduardo Habkost <ehabkost@redhat.com>
>  M: Igor Mammedov <imammedo@redhat.com>
> -- 
> 2.21.0
> 
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 07/17] MAINTAINERS: Merge sections CPU, NUMA into Machine core

Posted by Markus Armbruster 6 years, 4 months ago

Daniel P. Berrangé <berrange@redhat.com> writes:

> On Wed, Jun 19, 2019 at 10:10:40PM +0200, Markus Armbruster wrote:
>> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: Eduardo Habkost <ehabkost@redhat.com>
>> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  MAINTAINERS | 16 ++++------------
>>  1 file changed, 4 insertions(+), 12 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>> 
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index 1aef0afaf7..f18fddbbbb 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -1268,8 +1268,12 @@ S: Supported
>>  F: hw/core/machine.c
>>  F: hw/core/null-machine.c
>>  F: hw/cpu/cluster.c
>> +F: numa.c
>> +F: qom/cpu.c
>
> Not a blocker for this patch, but as a later patch, I'd encourage you to
> move qom/cpu.c somewhere else. Pretty much anywhere else would be better
> than under qom/ IMHO :-)

Eduardo, any ideas?

>>  F: include/hw/boards.h
>>  F: include/hw/cpu/cluster.h
>> +F: include/qom/cpu.h
>
> Likewise
>
>> +F: include/sysemu/numa.h
>>  T: git https://github.com/ehabkost/qemu.git machine-next
>>  
>>  Xtensa Machines
[...]

Re: [Qemu-devel] [PATCH 07/17] MAINTAINERS: Merge sections CPU, NUMA into Machine core

Posted by Eduardo Habkost 6 years, 4 months ago

On Mon, Jun 24, 2019 at 01:22:07PM +0200, Markus Armbruster wrote:
> Daniel P. Berrangé <berrange@redhat.com> writes:
> 
> > On Wed, Jun 19, 2019 at 10:10:40PM +0200, Markus Armbruster wrote:
> >> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> >> Cc: Eduardo Habkost <ehabkost@redhat.com>
> >> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> >> ---
> >>  MAINTAINERS | 16 ++++------------
> >>  1 file changed, 4 insertions(+), 12 deletions(-)
> >
> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> >
> >> 
> >> diff --git a/MAINTAINERS b/MAINTAINERS
> >> index 1aef0afaf7..f18fddbbbb 100644
> >> --- a/MAINTAINERS
> >> +++ b/MAINTAINERS
> >> @@ -1268,8 +1268,12 @@ S: Supported
> >>  F: hw/core/machine.c
> >>  F: hw/core/null-machine.c
> >>  F: hw/cpu/cluster.c
> >> +F: numa.c
> >> +F: qom/cpu.c
> >
> > Not a blocker for this patch, but as a later patch, I'd encourage you to
> > move qom/cpu.c somewhere else. Pretty much anywhere else would be better
> > than under qom/ IMHO :-)
> 
> Eduardo, any ideas?

Sorry for the late reply.  I suggest hw/core/cpu.c.

-- 
Eduardo

Re: [Qemu-devel] [PATCH 07/17] MAINTAINERS: Merge sections CPU, NUMA into Machine core

Posted by Markus Armbruster 6 years, 4 months ago

Eduardo Habkost <ehabkost@redhat.com> writes:

> On Mon, Jun 24, 2019 at 01:22:07PM +0200, Markus Armbruster wrote:
>> Daniel P. Berrangé <berrange@redhat.com> writes:
>> 
>> > On Wed, Jun 19, 2019 at 10:10:40PM +0200, Markus Armbruster wrote:
>> >> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
>> >> Cc: Eduardo Habkost <ehabkost@redhat.com>
>> >> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
>> >> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> >> ---
>> >>  MAINTAINERS | 16 ++++------------
>> >>  1 file changed, 4 insertions(+), 12 deletions(-)
>> >
>> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>> >
>> >> 
>> >> diff --git a/MAINTAINERS b/MAINTAINERS
>> >> index 1aef0afaf7..f18fddbbbb 100644
>> >> --- a/MAINTAINERS
>> >> +++ b/MAINTAINERS
>> >> @@ -1268,8 +1268,12 @@ S: Supported
>> >>  F: hw/core/machine.c
>> >>  F: hw/core/null-machine.c
>> >>  F: hw/cpu/cluster.c
>> >> +F: numa.c
>> >> +F: qom/cpu.c
>> >
>> > Not a blocker for this patch, but as a later patch, I'd encourage you to
>> > move qom/cpu.c somewhere else. Pretty much anywhere else would be better
>> > than under qom/ IMHO :-)
>> 
>> Eduardo, any ideas?
>
> Sorry for the late reply.  I suggest hw/core/cpu.c.

Can do.  Also: include/qom/cpu.h -> include/hw/core/cpu.h.

There's also hw/cpu/ and include/hw/cpu/.  I presume they are less
suited than hw/core and include/hw/core/.