From 348fbd5816cab30d38d7a3727a4b83404797128a Mon Sep 17 00:00:00 2001 From: "tony.nguyen@bt.com" Date: Sat, 8 Jun 2019 05:25:52 +0000 Subject: [PATCH 01/14] test: Use g_strndup instead of plain strndup Due to memory management rules. See HACKING. Signed-off-by: Tony Nguyen Reviewed-by: Markus Armbruster Message-Id: Signed-off-by: Laurent Vivier --- tests/check-qjson.c | 2 +- tests/migration/stress.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index fa2afccb0a..07a773e653 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -767,7 +767,7 @@ static void utf8_string(void) if (*end == ' ') { end++; } - in = strndup(tail, end - tail); + in = g_strndup(tail, end - tail); str = from_json_str(in, j, NULL); g_assert(!str); g_free(in); diff --git a/tests/migration/stress.c b/tests/migration/stress.c index 49a03aab7b..d9aa4afe92 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -104,9 +104,9 @@ static int get_command_arg_str(const char *name, } if (end) - *val = strndup(start, end - start); + *val = g_strndup(start, end - start); else - *val = strdup(start); + *val = g_strdup(start); return 1; } @@ -126,10 +126,10 @@ static int get_command_arg_ull(const char *name, if (errno || *end) { fprintf(stderr, "%s (%05d): ERROR: cannot parse %s value %s\n", argv0, gettid(), name, valstr); - free(valstr); + g_free(valstr); return -1; } - free(valstr); + g_free(valstr); return 0; } From ac78f737222ca5273cda26deeb850aa8546d108d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 9 Jul 2019 00:49:09 +0400 Subject: [PATCH 02/14] misc: fix naming scheme of compatiblity arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since merge 31ed41889e6e13699871040fe089a2884dca46cb ("Merge remote-tracking branch 'remotes/elmarco/tags/machine-props-pull-request' into staging"), the compat arrays are in lowercase. Signed-off-by: Marc-André Lureau Reviewed-by: Stefano Garzarella Message-Id: <20190708204909.10891-1-marcandre.lureau@redhat.com> Signed-off-by: Laurent Vivier --- docs/devel/migration.rst | 2 +- hw/i386/pc_piix.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index 220059679a..f7668ae389 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -314,7 +314,7 @@ For example: a) Add a new property using ``DEFINE_PROP_BOOL`` - e.g. support-foo and default it to true. - b) Add an entry to the ``HW_COMPAT_`` for the previous version that sets + b) Add an entry to the ``hw_compat_`` for the previous version that sets the property to false. c) Add a static bool support_foo function that tests the property. d) Add a subsection with a .needed set to the support_foo function diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 9e187f856a..187d846af4 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -312,7 +312,7 @@ else { * pc_compat_*() functions that run on machine-init time and * change global QEMU state are deprecated. Please don't create * one, and implement any pc-*-2.4 (and newer) compat code in - * HW_COMPAT_*, PC_COMPAT_*, or * pc_*_machine_options(). + * hw_compat_*, pc_compat_*, or * pc_*_machine_options(). */ static void pc_compat_2_3_fn(MachineState *machine) From edd318b7a3c54321ead363ffc1e22ebac5785f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Tue, 9 Jul 2019 16:43:30 -0700 Subject: [PATCH 03/14] configure: remove obsoleted $sparc_cpu variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 9b9c37c364 ("tcg-sparc: Assume v9 cpu always, i.e. force v8plus in 32-bit mode.", 2012-09-21) removed the need for this variable and most of the references to it, but this one. Remove defunct code, no effect or functionality change expected. Signed-off-by: Carlo Marcelo Arenas Belón Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190709234330.89699-1-carenas@gmail.com> Signed-off-by: Laurent Vivier --- configure | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure b/configure index 714e7fb6a1..4e7b79c826 100755 --- a/configure +++ b/configure @@ -6384,9 +6384,6 @@ if test "$vnc" = "yes" ; then echo "VNC JPEG support $vnc_jpeg" echo "VNC PNG support $vnc_png" fi -if test -n "$sparc_cpu"; then - echo "Target Sparc Arch $sparc_cpu" -fi echo "xen support $xen" if test "$xen" = "yes" ; then echo "xen ctrl version $xen_ctrl_version" From aee8a61946750b627f3b58438314a62be60dad34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Wed, 10 Jul 2019 15:55:28 -0700 Subject: [PATCH 04/14] configure: fix sdl detection using sdl2-config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If SDL2 is requested but pkg-config doesn't have a module for it configure should fallback to use sdl*-config, but wasn't able to because and old variable (from SDL) was being used by mistake. Correct the variable name and complete other related changes so there are no more references to the old SDL. Fixes: 0015ca5cbabe ("ui: remove support for SDL1.2 in favour of SDL2") Signed-off-by: Carlo Marcelo Arenas Belón Reviewed-by: Thomas Huth Message-Id: <20190710225528.409-1-carenas@gmail.com> Signed-off-by: Laurent Vivier --- configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 4e7b79c826..cc5ce79405 100755 --- a/configure +++ b/configure @@ -3022,15 +3022,15 @@ fi ########################################## # SDL probe -# Look for sdl configuration program (pkg-config or sdl-config). Try -# sdl-config even without cross prefix, and favour pkg-config over sdl-config. +# Look for sdl configuration program (pkg-config or sdl2-config). Try +# sdl2-config even without cross prefix, and favour pkg-config over sdl2-config. sdl_probe () { if $pkg_config sdl2 --exists; then sdlconfig="$pkg_config sdl2" sdlversion=$($sdlconfig --modversion 2>/dev/null) - elif has ${sdl_config}; then + elif has "$sdl2_config"; then sdlconfig="$sdl2_config" sdlversion=$($sdlconfig --version) else @@ -3041,7 +3041,7 @@ sdl_probe () # no need to do the rest return fi - if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl-config; then + if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl2-config; then echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2 fi @@ -8023,7 +8023,6 @@ preserve_env PKG_CONFIG preserve_env PKG_CONFIG_LIBDIR preserve_env PKG_CONFIG_PATH preserve_env PYTHON -preserve_env SDL_CONFIG preserve_env SDL2_CONFIG preserve_env SMBD preserve_env STRIP From 6fd9d9b7b58a82b0da3d0c9d7f0bdaba99ff64da Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 12 Jul 2019 16:41:47 +0200 Subject: [PATCH 05/14] .gitignore: ignore some vhost-user* related files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d52c454aadc creates '/contrib/vhost-user-gpu/50-qemu-gpu.json' and '/vhost-user-gpu' and commit 06914c97d3a creates '/vhost-user-input' neither of which is ignored by git. Signed-off-by: Michal Privoznik Reviewed-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Message-Id: Signed-off-by: Laurent Vivier --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index fd6e6c38c7..e9bbc006d3 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,8 @@ /scsi/qemu-pr-helper /vhost-user-scsi /vhost-user-blk +/vhost-user-gpu +/vhost-user-input /fsdev/virtfs-proxy-helper *.tmp *.[1-9] @@ -131,6 +133,7 @@ /docs/interop/qemu-qmp-ref.info* /docs/interop/qemu-qmp-ref.txt /docs/version.texi +/contrib/vhost-user-gpu/50-qemu-gpu.json *.tps .stgit-* .git-submodule-status From 80867bdbfc400b79686126c179b8ea70d79239b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 15 Jul 2019 12:22:10 +0200 Subject: [PATCH 06/14] hw/net/e1000: Fix erroneous comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Missed during the QOM convertion in 9af21dbee14. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Reviewed-by: Stefano Garzarella Message-Id: <20190715102210.31365-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/net/e1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 8ae4e08f1e..a73f8d404e 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1608,7 +1608,7 @@ static const VMStateDescription vmstate_e1000 = { /* * EEPROM contents documented in Tables 5-2 and 5-3, pp. 98-102. - * Note: A valid DevId will be inserted during pci_e1000_init(). + * Note: A valid DevId will be inserted during pci_e1000_realize(). */ static const uint16_t e1000_eeprom_template[64] = { 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, From 6f0dd6c5d25a0355b1dfc36dd8ed40dc053b3d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 19 Jul 2019 15:14:19 +0200 Subject: [PATCH 07/14] json: Move switch 'fall through' comment to correct place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2: qobject/json-parser.c: In function ‘parse_literal’: qobject/json-parser.c:492:24: error: this statement may fall through [-Werror=implicit-fallthrough=] 492 | case JSON_INTEGER: { | ^ qobject/json-parser.c:524:5: note: here 524 | case JSON_FLOAT: | ^~~~ Correctly place the 'fall through' comment. Reported-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Eric Blake Message-Id: <20190719131425.10835-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- qobject/json-parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 7d23e12e33..d083810d37 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -519,8 +519,8 @@ static QObject *parse_literal(JSONParserContext *ctxt) } assert(ret == -ERANGE); } - /* fall through to JSON_FLOAT */ } + /* fall through to JSON_FLOAT */ case JSON_FLOAT: /* FIXME dependent on locale; a pervasive issue in QEMU */ /* FIXME our lexer matches RFC 8259 in forbidding Inf or NaN, From 45a9eacead727164b3b76087ed93046a4b974a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 19 Jul 2019 15:14:20 +0200 Subject: [PATCH 08/14] hw/dma/omap_dma: Move switch 'fall through' comment to correct place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by GCC9 when building with CFLAG -Wimplicit-fallthrough=2: CC hw/dma/omap_dma.o hw/dma/omap_dma.c: In function ‘omap_dma_write’: hw/dma/omap_dma.c:1532:12: error: this statement may fall through [-Werror=implicit-fallthrough=] 1532 | if (s->model <= omap_dma_3_1) | ^ hw/dma/omap_dma.c:1534:5: note: here 1534 | case 0x400: | ^~~~ cc1: all warnings being treated as errors Correctly place the 'fall through' comment. Reported-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Message-Id: <20190719131425.10835-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/dma/omap_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/dma/omap_dma.c b/hw/dma/omap_dma.c index eab83c5c3a..6677237d42 100644 --- a/hw/dma/omap_dma.c +++ b/hw/dma/omap_dma.c @@ -1531,8 +1531,8 @@ static void omap_dma_write(void *opaque, hwaddr addr, case 0x404 ... 0x4fe: if (s->model <= omap_dma_3_1) break; + /* fall through */ case 0x400: - /* Fall through. */ if (omap_dma_sys_write(s, addr, value)) break; return; From 5a70b8b550a8e236fd7f696c803fc05c4cae2a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 19 Jul 2019 15:14:22 +0200 Subject: [PATCH 09/14] hw/ipmi: Rewrite a fall through comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC9 is confused by this comment when building with CFLAG -Wimplicit-fallthrough=2: hw/ipmi/ipmi_bmc_extern.c: In function ‘addchar’: hw/ipmi/ipmi_bmc_extern.c:178:12: error: this statement may fall through [-Werror=implicit-fallthrough=] 178 | ch |= 0x10; | ~~~^~~~~~~ hw/ipmi/ipmi_bmc_extern.c:181:5: note: here 181 | default: | ^~~~~~~ cc1: all warnings being treated as errors make: *** [rules.mak:69: hw/ipmi/ipmi_bmc_extern.o] Error 1 Rewrite the comment using 'fall through' which is recognized by GCC and static analyzers. Reported-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Acked-by: Corey Minyard Message-Id: <20190719131425.10835-5-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/ipmi/ipmi_bmc_extern.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c index 573428eca1..87da9ff99c 100644 --- a/hw/ipmi/ipmi_bmc_extern.c +++ b/hw/ipmi/ipmi_bmc_extern.c @@ -177,8 +177,7 @@ static void addchar(IPMIBmcExtern *ibe, unsigned char ch) ibe->outbuf[ibe->outlen] = VM_ESCAPE_CHAR; ibe->outlen++; ch |= 0x10; - /* No break */ - + /* fall through */ default: ibe->outbuf[ibe->outlen] = ch; ibe->outlen++; From b1d5b6e507c168a939b753be52f518d2981a2b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 19 Jul 2019 15:14:23 +0200 Subject: [PATCH 10/14] target/ppc: Rewrite a fall through comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC9 is confused by this comment when building with CFLAG -Wimplicit-fallthrough=2: target/ppc/mmu_helper.c: In function ‘dump_mmu’: target/ppc/mmu_helper.c:1349:12: error: this statement may fall through [-Werror=implicit-fallthrough=] 1349 | if (ppc64_v3_radix(env_archcpu(env))) { | ^ target/ppc/mmu_helper.c:1356:5: note: here 1356 | default: | ^~~~~~~ cc1: all warnings being treated as errors Rewrite the comment using 'fall through' which is recognized by GCC and static analyzers. Reported-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson Message-Id: <20190719131425.10835-6-philmd@redhat.com> Signed-off-by: Laurent Vivier --- target/ppc/mmu_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 55f7a7f16a..86c667b094 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -100,7 +100,7 @@ static int pp_check(int key, int pp, int nx) case 0x1: case 0x2: access |= PAGE_WRITE; - /* No break here */ + /* fall through */ case 0x3: access |= PAGE_READ; break; @@ -708,7 +708,7 @@ static int mmu40x_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, if (pr != 0) { goto check_perms; } - /* No break here */ + /* fall through */ case 0x3: /* All accesses granted */ ctx->prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -722,7 +722,7 @@ static int mmu40x_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, ret = -2; break; } - /* No break here */ + /* fall through */ case 0x1: check_perms: /* Check from TLB entry */ From 4e8de60623f49def9016b8174261e9ab84f79bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 19 Jul 2019 15:14:24 +0200 Subject: [PATCH 11/14] vl: Rewrite a fall through comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC9 is confused by this comment when building with CFLAG -Wimplicit-fallthrough=2: vl.c: In function ‘qemu_ref_timedate’: vl.c:773:15: error: this statement may fall through [-Werror=implicit-fallthrough=] 773 | value -= rtc_realtime_clock_offset; | ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~ vl.c:775:5: note: here 775 | case QEMU_CLOCK_VIRTUAL: | ^~~~ cc1: all warnings being treated as errors Rewrite the comment using 'fall through' which is recognized by GCC and static analyzers. Reported-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: John Snow Message-Id: <20190719131425.10835-7-philmd@redhat.com> Signed-off-by: Laurent Vivier --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index edd5390110..1588dd8fc3 100644 --- a/vl.c +++ b/vl.c @@ -772,7 +772,7 @@ static time_t qemu_ref_timedate(QEMUClockType clock) switch (clock) { case QEMU_CLOCK_REALTIME: value -= rtc_realtime_clock_offset; - /* no break */ + /* fall through */ case QEMU_CLOCK_VIRTUAL: value += rtc_ref_start_datetime; break; From 54db89f5bbe5c12f238835aa94aa4b13ac22834d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 19 Jul 2019 15:14:25 +0200 Subject: [PATCH 12/14] spapr_events: Rewrite a fall through comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC9 is confused by this comment when building with CFLAG -Wimplicit-fallthrough=2: CC ppc64-softmmu/hw/ppc/spapr_rtc.o hw/ppc/spapr_events.c: In function ‘rtas_event_log_to_source’: hw/ppc/spapr_events.c:312:12: error: this statement may fall through [-Werror=implicit-fallthrough=] 312 | if (spapr_ovec_test(spapr->ov5_cas, OV5_HP_EVT)) { | ^ hw/ppc/spapr_events.c:317:5: note: here 317 | case RTAS_LOG_TYPE_EPOW: | ^~~~ cc1: all warnings being treated as errors Rewrite the comment using 'fall through' which is recognized by GCC and static analyzers. Reported-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson Message-Id: <20190719131425.10835-8-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/ppc/spapr_events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index 163a6cd25b..0e4c19523a 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -314,7 +314,7 @@ rtas_event_log_to_source(SpaprMachineState *spapr, int log_type) g_assert(source->enabled); break; } - /* fall back to epow for legacy hotplug interrupt source */ + /* fall through back to epow for legacy hotplug interrupt source */ case RTAS_LOG_TYPE_EPOW: source = spapr_event_sources_get_source(spapr->event_sources, EVENT_CLASS_EPOW); From ea2b7c9faaf22e74bc42a880ecf94c4f33c0d46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 12 Aug 2019 13:37:37 +0200 Subject: [PATCH 13/14] hw/display/sm501: Remove unused include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "cpu.h" include makes devices target-specific. Since it is not used, remove it, so the device become generic (we can now compile it once for all targets). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20190812113739.16587-2-philmd@redhat.com> [lv: fix conflict with 650d103d3ea9 ("Include hw/hw.h exactly where needed")] Signed-off-by: Laurent Vivier --- hw/display/sm501.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/display/sm501.c b/hw/display/sm501.c index d9e5762e36..1f33c87e65 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -28,7 +28,6 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" -#include "cpu.h" #include "hw/char/serial.h" #include "ui/console.h" #include "hw/sysbus.h" From 8a9224a250094222e9ff302b95e379c3e71d3c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 12 Aug 2019 13:37:38 +0200 Subject: [PATCH 14/14] hw/display: Compile various display devices as common object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Various display devices are not target-specific and can be compiled once for all the targets. After this commit, the 'make world' target is reduced by 54 objects Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Gerd Hoffmann Message-Id: <20190812113739.16587-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/Makefile.objs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index a64998fc7b..0f11d55b14 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -31,13 +31,13 @@ obj-$(CONFIG_MILKYMIST_TMU2) += milkymist-tmu2.o milkymist-tmu2.o-cflags := $(X11_CFLAGS) $(OPENGL_CFLAGS) milkymist-tmu2.o-libs := $(X11_LIBS) $(OPENGL_LIBS) -obj-$(CONFIG_OMAP) += omap_dss.o +common-obj-$(CONFIG_OMAP) += omap_dss.o obj-$(CONFIG_OMAP) += omap_lcdc.o -obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o -obj-$(CONFIG_RASPI) += bcm2835_fb.o -obj-$(CONFIG_SM501) += sm501.o -obj-$(CONFIG_TCX) += tcx.o -obj-$(CONFIG_CG3) += cg3.o +common-obj-$(CONFIG_PXA2XX) += pxa2xx_lcd.o +common-obj-$(CONFIG_RASPI) += bcm2835_fb.o +common-obj-$(CONFIG_SM501) += sm501.o +common-obj-$(CONFIG_TCX) += tcx.o +common-obj-$(CONFIG_CG3) += cg3.o obj-$(CONFIG_VGA) += vga.o @@ -53,7 +53,7 @@ virtio-gpu.o-cflags := $(VIRGL_CFLAGS) virtio-gpu.o-libs += $(VIRGL_LIBS) virtio-gpu-3d.o-cflags := $(VIRGL_CFLAGS) virtio-gpu-3d.o-libs += $(VIRGL_LIBS) -obj-$(CONFIG_DPCD) += dpcd.o -obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o +common-obj-$(CONFIG_DPCD) += dpcd.o +common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dp.o -obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o +common-obj-$(CONFIG_ATI_VGA) += ati.o ati_2d.o ati_dbg.o