From patchwork Sun Sep 17 15:05:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 112847 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2742770qgf; Sun, 17 Sep 2017 08:08:13 -0700 (PDT) X-Received: by 10.55.159.130 with SMTP id i124mr16824231qke.339.1505660893521; Sun, 17 Sep 2017 08:08:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505660893; cv=none; d=google.com; s=arc-20160816; b=Ts0oYDLXczfEAnlWndbQqnaOWmnZapZVl6zbTj7o13Rkcq4JFCptlK4tpM1srHsdHQ bjcH/O1BoXsFzbu297v5MgEHJ6rc/apWuLMP61vXf4eNRhlFffLvaVuuRt8foYZywdSY NN0u/37xUq36RlSalLT5Y8uy93evE7P3lsVa3LJmFK8uhLab4KfxEa/qbf39uaUhkO3P 43leAxRUNXLLgs2tqRVgPUGFdldPbOhSOFBDZpLVkxAGhaatR7hEkYgzhcTeiWLuI0Mi 2cst/qKufwS85Szerfa6SbiJI/R57PeSlrff8Xz0AYX/pK7XP7N5V6J8ocriA0wrBWrM 2hNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=qVTTHJ/pxmTTS0zl46thP2KUCG+eOUYI/Z53RhpXwKs=; b=yNSBtPDCm+kyJ/7U9UNdx5UICDpP5HmLA5ziJmV3eHQDK0vO7OhYzO8KV0w+hnQBXr z7eYbpAuKFTM5IIpFDCOXx9ptaN1amcs8BZxZyI5lMTrLg6hPFPrhdV0HA/bLRnW/Ysp 088rQiuO5pQNXcM3bEQwv43414zfVYju2bPKud68cu+AdTbBipZxjF3a6n8OFwdzLkfp vVY3PfFnYvgD2bh7ZwMRXp+a3/+fl34Tn2zQjvUrle/u1HZT36sf9apS7uWZ4zTAZaR5 +xPBXs0rTJxsdN60p73ibRlkSkXt3T+vdwSrAfThBbfuG6C5zgc+OaaEAiENlMnSQDak pB8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EOAs+NY1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u90si5120177qku.129.2017.09.17.08.08.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 17 Sep 2017 08:08:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EOAs+NY1; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtbB5-00011A-Bf for patch@linaro.org; Sun, 17 Sep 2017 11:08:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtb8r-0007yv-PB for qemu-devel@nongnu.org; Sun, 17 Sep 2017 11:05:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtb8m-00088d-RP for qemu-devel@nongnu.org; Sun, 17 Sep 2017 11:05:53 -0400 Received: from mail-oi0-x229.google.com ([2607:f8b0:4003:c06::229]:44063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dtb8m-00088I-M1 for qemu-devel@nongnu.org; Sun, 17 Sep 2017 11:05:48 -0400 Received: by mail-oi0-x229.google.com with SMTP id l74so3684278oih.1 for ; Sun, 17 Sep 2017 08:05:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qVTTHJ/pxmTTS0zl46thP2KUCG+eOUYI/Z53RhpXwKs=; b=EOAs+NY1FWd2xM/ZbTF6plrMAbxRYyPkwqUtXrnnLHHOemV0uumZHjnHAlzLJfJmhK 2MNgri0uHbpiP4cxpvZSwsyJ/zOzhtPEMjmbiqG7lWLwM/gkAWSEcdgb/DOqU6PBfWMe otnEYhVmmQPtjKjtRiPOBu8bF7rl/J0ivxd6Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qVTTHJ/pxmTTS0zl46thP2KUCG+eOUYI/Z53RhpXwKs=; b=TQ0T15GUBZW49D2/ADUWYYBb1Yw8OVehZx5Z8hUAfQh7DyZWNmC+x3AA8wNJFrosuh W4DMyJiCN1TeF3rrSxhNd0WQ2VYjgr7IWL050l2DYiZsfqfh6Oc6/6ZZJbOt/0C1y9bS l9JYpWvvCvHYGjM3tQKmDMbrJh+oRpFfPSMZcWUfK1sU8DPceOYvN0L28MIsOqDMgpN2 8v48/2GvOJ3m2wLsZwHeWqSn3fTbG+Y667uF0NVNgUbEvRdtChHEskZqtCPwf6Ft985Z tmHIarsWJYas/9Y6Fq3tETi3IvVlu/LzFUtXyWfQ0ls4P59j15kLGa9tdOEpg011YLg+ wXSg== X-Gm-Message-State: AHPjjUg7rSX6wGqUOf34/X2xkK6KuGM67lbKmi6u82juL5RKa0ybrjSW gx2ADP0B3d4yf9uSVcdsjA== X-Google-Smtp-Source: AOwi7QDSVqK2EPz0o4Wh1d3mpGRHXOuhW8xB6NfHU8mGy4IK2hcBCg+pawMxpEoJnx+Zbvvg8KEhEA== X-Received: by 10.202.85.202 with SMTP id j193mr18182155oib.122.1505660747598; Sun, 17 Sep 2017 08:05:47 -0700 (PDT) Received: from bigtime.twiddle.net (162.189-204-159.bestel.com.mx. [189.204.159.162]) by smtp.gmail.com with ESMTPSA id j2sm5348789oia.20.2017.09.17.08.05.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 17 Sep 2017 08:05:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 17 Sep 2017 08:05:21 -0700 Message-Id: <20170917150535.8284-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170917150535.8284-1-richard.henderson@linaro.org> References: <20170917150535.8284-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::229 Subject: [Qemu-devel] [PULL 03/17] accel/tcg: move user-exec to accel/tcg/ 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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20170911213328.9701-3-f4bug@amsat.org> Signed-off-by: Richard Henderson --- Makefile.target | 4 ++-- user-exec-stub.c => accel/tcg/user-exec-stub.c | 0 user-exec.c => accel/tcg/user-exec.c | 0 MAINTAINERS | 3 +-- accel/tcg/Makefile.objs | 3 +++ 5 files changed, 6 insertions(+), 4 deletions(-) rename user-exec-stub.c => accel/tcg/user-exec-stub.c (100%) rename user-exec.c => accel/tcg/user-exec.c (100%) -- 2.13.5 diff --git a/Makefile.target b/Makefile.target index 7f42c45db8..520305b025 100644 --- a/Makefile.target +++ b/Makefile.target @@ -119,7 +119,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/linux-user obj-y += linux-user/ -obj-y += gdbstub.o thunk.o user-exec.o user-exec-stub.o +obj-y += gdbstub.o thunk.o endif #CONFIG_LINUX_USER @@ -132,7 +132,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) obj-y += bsd-user/ -obj-y += gdbstub.o user-exec.o user-exec-stub.o +obj-y += gdbstub.o endif #CONFIG_BSD_USER diff --git a/user-exec-stub.c b/accel/tcg/user-exec-stub.c similarity index 100% rename from user-exec-stub.c rename to accel/tcg/user-exec-stub.c diff --git a/user-exec.c b/accel/tcg/user-exec.c similarity index 100% rename from user-exec.c rename to accel/tcg/user-exec.c diff --git a/MAINTAINERS b/MAINTAINERS index 2127bb241a..4bd1797330 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1603,8 +1603,7 @@ Overall M: Riku Voipio S: Maintained F: thunk.c -F: user-exec.c -F: user-exec-stub.c +F: accel/tcg/user-exec*.c BSD user S: Orphan diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index 22642e6f75..f2422d0fb3 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -2,3 +2,6 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o obj-y += cpu-exec.o cpu-exec-common.o translate-all.o obj-y += translator.o + +obj-$(CONFIG_USER_ONLY) += user-exec.o +obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.o