[PATCH 2/4] Makefile: Clarify all the codebase requires qom/ objects

Philippe Mathieu-Daudé posted 4 patches 6 years, 1 month ago
There is a newer version of this series
[PATCH 2/4] Makefile: Clarify all the codebase requires qom/ objects
Posted by Philippe Mathieu-Daudé 6 years, 1 month ago
QEMU user-mode also requires the qom/ objects, it is not only
used by "system emulation and qemu-img". As we will use a big
if() block, move it upper in the "Common libraries for tools
and emulators" section.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 Makefile.objs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 7c1e50f9d6..5aae561984 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -2,6 +2,7 @@
 # Common libraries for tools and emulators
 stub-obj-y = stubs/
 util-obj-y = crypto/ util/ qobject/ qapi/
+qom-obj-y = qom/
 
 chardev-obj-y = chardev/
 
@@ -26,11 +27,6 @@ block-obj-m = block/
 
 crypto-obj-y = crypto/
 
-#######################################################################
-# qom-obj-y is code used by both qemu system emulation and qemu-img
-
-qom-obj-y = qom/
-
 #######################################################################
 # io-obj-y is code used by both qemu system emulation and qemu-img
 
-- 
2.21.1


Re: [PATCH 2/4] Makefile: Clarify all the codebase requires qom/ objects
Posted by Thomas Huth 6 years, 1 month ago
On 09/01/2020 16.39, Philippe Mathieu-Daudé wrote:
> QEMU user-mode also requires the qom/ objects, it is not only
> used by "system emulation and qemu-img". As we will use a big
> if() block, move it upper in the "Common libraries for tools
> and emulators" section.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  Makefile.objs | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index 7c1e50f9d6..5aae561984 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -2,6 +2,7 @@
>  # Common libraries for tools and emulators
>  stub-obj-y = stubs/
>  util-obj-y = crypto/ util/ qobject/ qapi/
> +qom-obj-y = qom/
>  
>  chardev-obj-y = chardev/
>  
> @@ -26,11 +27,6 @@ block-obj-m = block/
>  
>  crypto-obj-y = crypto/
>  
> -#######################################################################
> -# qom-obj-y is code used by both qemu system emulation and qemu-img
> -
> -qom-obj-y = qom/
> -
>  #######################################################################
>  # io-obj-y is code used by both qemu system emulation and qemu-img
>  
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>