[PATCH 3/3] libqos: Give get_machine_allocator() internal linkage

Markus Armbruster posted 3 patches 5 years, 6 months ago
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Alexander Bulekov <alxndr@bu.edu>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Bandan Das <bsd@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>
[PATCH 3/3] libqos: Give get_machine_allocator() internal linkage
Posted by Markus Armbruster 5 years, 6 months ago
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 tests/qtest/libqos/qos_external.h | 2 --
 tests/qtest/libqos/qos_external.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/qtest/libqos/qos_external.h b/tests/qtest/libqos/qos_external.h
index f63388cb30..72d7f91707 100644
--- a/tests/qtest/libqos/qos_external.h
+++ b/tests/qtest/libqos/qos_external.h
@@ -18,7 +18,6 @@
 
 #ifndef QOS_EXTERNAL_H
 #define QOS_EXTERNAL_H
-#include "libqos/qgraph.h"
 
 #include "libqos/malloc.h"
 #include "qapi/qapi-types-machine.h"
@@ -26,7 +25,6 @@
 
 void machines_apply_to_node(MachineInfoList *mach_info);
 void types_apply_to_node(ObjectTypeInfoList *type_info);
-QGuestAllocator *get_machine_allocator(QOSGraphObject *obj);
 void *allocate_objects(QTestState *qts, char **path, QGuestAllocator **p_alloc);
 
 #endif
diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_external.c
index c707dac3b9..9f5180e18d 100644
--- a/tests/qtest/libqos/qos_external.c
+++ b/tests/qtest/libqos/qos_external.c
@@ -66,7 +66,7 @@ void types_apply_to_node(ObjectTypeInfoList *type_info)
     }
 }
 
-QGuestAllocator *get_machine_allocator(QOSGraphObject *obj)
+static QGuestAllocator *get_machine_allocator(QOSGraphObject *obj)
 {
     return obj->get_driver(obj, "memory");
 }
-- 
2.21.1


Re: [PATCH 3/3] libqos: Give get_machine_allocator() internal linkage
Posted by Philippe Mathieu-Daudé 5 years, 6 months ago
On 4/24/20 9:11 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   tests/qtest/libqos/qos_external.h | 2 --
>   tests/qtest/libqos/qos_external.c | 2 +-
>   2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/tests/qtest/libqos/qos_external.h b/tests/qtest/libqos/qos_external.h
> index f63388cb30..72d7f91707 100644
> --- a/tests/qtest/libqos/qos_external.h
> +++ b/tests/qtest/libqos/qos_external.h
> @@ -18,7 +18,6 @@
>   
>   #ifndef QOS_EXTERNAL_H
>   #define QOS_EXTERNAL_H
> -#include "libqos/qgraph.h"
>   
>   #include "libqos/malloc.h"
>   #include "qapi/qapi-types-machine.h"
> @@ -26,7 +25,6 @@
>   
>   void machines_apply_to_node(MachineInfoList *mach_info);
>   void types_apply_to_node(ObjectTypeInfoList *type_info);
> -QGuestAllocator *get_machine_allocator(QOSGraphObject *obj);
>   void *allocate_objects(QTestState *qts, char **path, QGuestAllocator **p_alloc);
>   
>   #endif
> diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_external.c
> index c707dac3b9..9f5180e18d 100644
> --- a/tests/qtest/libqos/qos_external.c
> +++ b/tests/qtest/libqos/qos_external.c
> @@ -66,7 +66,7 @@ void types_apply_to_node(ObjectTypeInfoList *type_info)
>       }
>   }
>   
> -QGuestAllocator *get_machine_allocator(QOSGraphObject *obj)
> +static QGuestAllocator *get_machine_allocator(QOSGraphObject *obj)
>   {
>       return obj->get_driver(obj, "memory");
>   }
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>