From patchwork Tue Jan 31 18:55:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9548155 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 51C1760236 for ; Tue, 31 Jan 2017 19:12:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42D9727F07 for ; Tue, 31 Jan 2017 19:12:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36D3427F8F; Tue, 31 Jan 2017 19:12:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 995A527F07 for ; Tue, 31 Jan 2017 19:12:33 +0000 (UTC) Received: from localhost ([::1]:40607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYdqy-0001eq-Ir for patchwork-qemu-devel@patchwork.kernel.org; Tue, 31 Jan 2017 14:12:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYdaW-0002PU-UG for qemu-devel@nongnu.org; Tue, 31 Jan 2017 13:55:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYdaV-0004qw-LJ for qemu-devel@nongnu.org; Tue, 31 Jan 2017 13:55:33 -0500 Received: from mail-yb0-x241.google.com ([2607:f8b0:4002:c09::241]:34482) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cYdaV-0004qn-8p for qemu-devel@nongnu.org; Tue, 31 Jan 2017 13:55:31 -0500 Received: by mail-yb0-x241.google.com with SMTP id w194so30920777ybe.1 for ; Tue, 31 Jan 2017 10:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8LJYj2s3CuJMq8b8wGw1iVE9KwWHdG1FLHbu7d0zHMw=; b=vh7bvKfQiOLyINgXiVT+j3KNR04gpqqT24loAbpcfzYT9IbyeObTWbNPas0IwY2J80 O13T4f+no5n1rDVR4qKMDrTru3qOKSPc6O3nt4z1GAtT//49Nc2LINAyODjj4dzsZx5e t6R6cK3zFVY1aYzU5JzbvO3+GyfVhh8xCDcKAXS+jRC3FFArxoDAzVtp9lqrDlX7w1pB JvoJCnx5KAjJM2xN2gfrRIwv692Z8qT5Ypjx2Z4sxZ/q5LTjmHs+T5q6DT24q5RtM5aD ZMu0aVc0XDnPHl+KHVJ314Qgr4M281Bnp5wFYsjDzPbkpHI7obYYDJ1zd4X19OmXk713 zPgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8LJYj2s3CuJMq8b8wGw1iVE9KwWHdG1FLHbu7d0zHMw=; b=L9e/SiSCjD+QsT0ahvbVlvAfZi3A4B/c/bsz7QCpdQmoNuVmcCxqwQFOKBfh5iZqWU jxogPnn5ZBLlviTlYc6rrTvrHl+xo2NRfpGr+AFtRKNgZ4FdJX1YGz2/5lAa3b0J2v+O qhUe+x2nXnqm2TKPvrIE020+bCXw4SuwSrNZwWctVMvaI2G/RTjgJDQRYfZjXkPuRkiy KNdHN6bqpkmQ2tzIeBd+1Ldm0s5X7UEnK9Odk/9khI5CpdX0GR+ZxdfT2BJSZmfYZELn J37aD35cp4PUC1RFIkpkmjkh4pdLXVP02OkjWEKIZCXqrp8lJDQtEtqT1xJY3/GJXRSo 2byQ== X-Gm-Message-State: AIkVDXKIiKpGSY3V59Nm+1UOk+tQwWiVxy8W+xdInnZcpBt3SxWg5uZ+4slkAqwpWHc5Db//qohbF4ZeQBOUjg== X-Received: by 10.13.245.2 with SMTP id e2mr19909944ywf.159.1485888930336; Tue, 31 Jan 2017 10:55:30 -0800 (PST) MIME-Version: 1.0 References: <20170131162122.29408-1-marcandre.lureau@redhat.com> In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Tue, 31 Jan 2017 18:55:19 +0000 Message-ID: To: Peter Maydell X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4002:c09::241 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: Re: [Qemu-devel] [PULL 00/41] Chr split patches X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Developers Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi! On Tue, Jan 31, 2017 at 10:42 PM Peter Maydell wrote: > On 31 January 2017 at 16:20, Marc-André Lureau > wrote: > > The following changes since commit > a0def594286d9110a6035e02eef558cf3cf5d847: > > > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into > staging (2017-01-30 10:23:20 +0000) > > > > are available in the git repository at: > > > > https://github.com/elmarco/qemu.git tags/chr-split-pull-request > > > > for you to fetch changes up to 3766519be2843e0947425cafd1e7e205dd63f0fd: > > > > char: headers clean-up (2017-01-31 13:03:48 +0400) > > > > ---------------------------------------------------------------- > > > > 'make check' fails on a linux-user-targets-only build: > > tests/test-char.o: In function `char_stdio_test_subprocess': > /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:47: undefined > reference to `qemu_chr_new' > /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:50: undefined > reference to `qemu_chr_fe_init' > /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:51: undefined > reference to `qemu_chr_fe_set_open' > /home/petmay01/linaro/qemu-for-merges/tests/test-char.c:52: undefined > reference to `qemu_chr_fe_write' > [etc etc etc] > > Oh good catch. We want to have chardev-obj-y defined globally, but only linked with -softmmu target. A possible fix to squash with chardev-obj-j patch is: Eric, do you want me to resend the patch for review or is that enough for you to ack? diff --git a/Makefile.objs b/Makefile.objs index 91a4794f28..b09a9588fc 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -4,6 +4,8 @@ stub-obj-y = stubs/ crypto/ util-obj-y = util/ qobject/ qapi/ util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o +chardev-obj-y = chardev/ + ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img @@ -78,8 +80,6 @@ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o common-obj-$(CONFIG_FDT) += device_tree.o -chardev-obj-y = chardev/ - ###################################################################### # qapi diff --git a/Makefile.target b/Makefile.target index 5a487b5187..054db85e9e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -188,10 +188,9 @@ dummy := $(call unnest-vars,.., \ common-obj-m) target-obj-y := $(target-obj-y-save) all-obj-y += $(common-obj-y) -all-obj-y += $(chardev-obj-y) all-obj-y += $(target-obj-y) all-obj-y += $(qom-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) +all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y) all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)