diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2019-04-01 16:12:22 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-05-17 15:19:39 +0200 |
| commit | 29de2804014097f8d0e6eaec3318164405afe317 (patch) | |
| tree | 6b186d7ac4d3b5059a28c9c92b37451f1b9173ae /Makefile.objs | |
| parent | 8d5d515a0fbfa7b6370656a9bee2f8eece1a890f (diff) | |
build: don't build hardware objects with linux-user
Some objects are only needed for system emulation and tools.
We can ignore them for the user mode case
Update tests to run accordingly: conditionally build some tests
on CONFIG_BLOCK.
Some tests use components that are only built when softmmu or
block tools are enabled, not for linux-user. So, if these components
are not available, disable the tests.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20190401141222.30034-6-lvivier@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.objs b/Makefile.objs index 43c9e45032..2b0793ecc9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -127,9 +127,17 @@ rdmacm-mux-obj-y = contrib/rdmacm-mux/ trace-events-subdirs = trace-events-subdirs += accel/kvm trace-events-subdirs += accel/tcg +trace-events-subdirs += crypto +ifeq ($(CONFIG_USER_ONLY),y) +trace-events-subdirs += linux-user +endif +ifeq ($(CONFIG_BLOCK),y) trace-events-subdirs += authz trace-events-subdirs += block -trace-events-subdirs += crypto +trace-events-subdirs += io +trace-events-subdirs += nbd +trace-events-subdirs += scsi +endif ifeq ($(CONFIG_SOFTMMU),y) trace-events-subdirs += chardev trace-events-subdirs += audio @@ -178,12 +186,8 @@ trace-events-subdirs += net trace-events-subdirs += ui endif trace-events-subdirs += hw/display -trace-events-subdirs += io -trace-events-subdirs += linux-user -trace-events-subdirs += nbd trace-events-subdirs += qapi trace-events-subdirs += qom -trace-events-subdirs += scsi trace-events-subdirs += target/arm trace-events-subdirs += target/hppa trace-events-subdirs += target/i386 |