External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Make daemons depend on generated *_protocol.[ch]

Browse Source 
This should fix build failures when a daemon code is compiled before the
included *_protocol.h headers are ready, such as:

    FAILED: src/virtqemud.p/remote_remote_daemon_config.c.o
    ../src/remote/remote_daemon_config.c: In function ‘daemonConfigNew’:
    ../src/remote/remote_daemon_config.c:111:30: error:
        ‘REMOTE_AUTH_POLKIT’ undeclared (first use in this function)
      111 |         data->auth_unix_rw = REMOTE_AUTH_POLKIT;
          |                              ^~~~~~~~~~~~~~~~~~
    ../src/remote/remote_daemon_config.c:111:30: note: each undeclared
        identifier is reported only once for each function it appears in
    ../src/remote/remote_daemon_config.c:115:30: error:
        ‘REMOTE_AUTH_NONE’ undeclared (first use in this function)
      115 |         data->auth_unix_rw = REMOTE_AUTH_NONE;
          |                              ^~~~~~~~~~~~~~~~
    ../src/remote/remote_daemon_config.c: In function
        ‘daemonConfigLoadOptions’:
    ../src/remote/remote_daemon_config.c:252:31: error:
        ‘REMOTE_AUTH_POLKIT’ undeclared (first use in this function)
      252 |     if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) {
          |                               ^~~~~~~~~~~~~~~~~~

or

    FAILED: src/virtqemud.p/remote_remote_daemon_dispatch.c.o
    In file included from ../src/remote/remote_daemon.h:28,
                     from ../src/remote/remote_daemon_dispatch.c:26:
    src/remote/lxc_protocol.h:13:5: error:
        unknown type name ‘remote_nonnull_domain’
       13 |     remote_nonnull_domain dom;
          |     ^~~~~~~~~~~~~~~~~~~~~
    In file included from ../src/remote/remote_daemon.h:29,
                     from ../src/remote/remote_daemon_dispatch.c:26:
    src/remote/qemu_protocol.h:13:5: error:
        unknown type name ‘remote_nonnull_domain’
       13 |     remote_nonnull_domain dom;
          |     ^~~~~~~~~~~~~~~~~~~~~
    src/remote/qemu_protocol.h:14:5: error:
        unknown type name ‘remote_nonnull_string’
       14 |     remote_nonnull_string cmd;
          |     ^~~~~~~~~~~~~~~~~~~~~
    ...

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Jiri Denemark 2024-01-24 19:23:54 +01:00
parent a27982ed54
commit dcfe548cb0
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/meson.build
View File

@ -20,6 +20,7 @@ potfiles_dep = [
access_gen_sources, access_gen_sources,
admin_client_generated, admin_client_generated,
admin_driver_generated, admin_driver_generated,
remote_protocol_generated,
remote_driver_generated, remote_driver_generated,
remote_daemon_generated, remote_daemon_generated,
] ]

6
src/meson.build
View File

@ -616,7 +616,11 @@ foreach daemon : virt_daemons
bin = executable( bin = executable(
daemon['name'], daemon['name'],
[ [
daemon.get('sources', [ remote_daemon_sources, remote_daemon_generated ]), daemon.get('sources', [
remote_protocol_generated,
remote_daemon_sources,
remote_daemon_generated
]),
dtrace_gen_objects, dtrace_gen_objects,
], ],
c_args: [ c_args: [

15
src/remote/meson.build
View File

@ -7,8 +7,6 @@ remote_driver_generated = []
foreach name : [ 'remote', 'qemu', 'lxc' ] foreach name : [ 'remote', 'qemu', 'lxc' ]
client_bodies_h = '@0@_client_bodies.h'.format(name) client_bodies_h = '@0@_client_bodies.h'.format(name)
protocol_c = '@0@_protocol.c'.format(name)
protocol_h = '@0@_protocol.h'.format(name)
protocol_x = '@0@_protocol.x'.format(name) protocol_x = '@0@_protocol.x'.format(name)
remote_driver_generated += custom_target( remote_driver_generated += custom_target(
@ -20,8 +18,16 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
], ],
capture: true, capture: true,
) )
endforeach
remote_driver_generated += custom_target( remote_protocol_generated = []
foreach name : [ 'remote', 'qemu', 'lxc' ]
protocol_c = '@0@_protocol.c'.format(name)
protocol_h = '@0@_protocol.h'.format(name)
protocol_x = '@0@_protocol.x'.format(name)
remote_protocol_generated += custom_target(
protocol_h, protocol_h,
input: protocol_x, input: protocol_x,
output: protocol_h, output: protocol_h,
@ -32,7 +38,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
], ],
) )
remote_driver_generated += custom_target( remote_protocol_generated += custom_target(
protocol_c, protocol_c,
input: protocol_x, input: protocol_x,
output: protocol_c, output: protocol_c,
@ -143,6 +149,7 @@ if conf.has('WITH_REMOTE')
remote_driver_lib = static_library( remote_driver_lib = static_library(
'virt_remote_driver', 'virt_remote_driver',
[ [
remote_protocol_generated,
remote_driver_sources, remote_driver_sources,
remote_driver_generated, remote_driver_generated,
], ],