From patchwork Wed Jan 11 19:35:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 713915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tzKB93rWCz9t0w for ; Thu, 12 Jan 2017 06:45:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VIIjMWQQ"; dkim-atps=neutral Received: from localhost ([::1]:56635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cROpz-0005Hg-4b for incoming@patchwork.ozlabs.org; Wed, 11 Jan 2017 14:45:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cROgP-00036E-6e for qemu-devel@nongnu.org; Wed, 11 Jan 2017 14:35:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cROgO-0003K9-6b for qemu-devel@nongnu.org; Wed, 11 Jan 2017 14:35:41 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:34828) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cROgN-0003Jo-Vq for qemu-devel@nongnu.org; Wed, 11 Jan 2017 14:35:40 -0500 Received: by mail-wm0-x241.google.com with SMTP id l2so324475wml.2 for ; Wed, 11 Jan 2017 11:35:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=YVRbuqZXQlDLogEBc8zVsRGejifEmblzM8urBlpP1wI=; b=VIIjMWQQQk9w9eiXNt0xGHsDlbPtxYxpzyfemTjG9FLnBFXbeHPkHs3aogsAtM6Ks0 jvdWRJHSZcfqvV6shtjkUz4k/4zU9wi1de7SAGdXMv2xZnfHRje0ghHqPXFu2ZKHBSId uA15bl9Zu1ieg3a74N3scljNyCsTlQUCG5bY+o8IPCTIyz2qePYOnw/p/8z9hUm5dp9Q qaIY/UVQAyJvlG3UA60mPHaDu4hKGPpTmMhq4qnX6EIe38x2H10tl6DjXsn2crKdS1H3 GV/6KpEyx3WCQk2D8Xrf7LM0/HG+3SjeSx2wvn3ZR3iA4SA4lPBdjaJA13YMhDEcKkxI XCjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=YVRbuqZXQlDLogEBc8zVsRGejifEmblzM8urBlpP1wI=; b=JMh89KoaSn4inNP6+Fs8eD850Eo6LEAaLIeajzeulHDBIzzRn/7IrczG9J0nfpZhjS YOgkxbx72TmLK7uW8pgwiL2eZDjIQGQ8WApk0v3+L2qloUpgnA8YCB7kvK6TUskqFseA gXU82A0bJodEKqapvGzzghJhoPVmXPnsxAPbZTqPthVgK68tBXa0s6er956Ia/u77z8X Zp5Xu0mwheeVIR826Mp0ZKk057y+SxTsUeI98KyoAEchQVKXQPWpwae0FofjAxN/r2+W qHkY0TiYQG9A4TnGsqokolmFJCx7yDXjYl1tAil0Oh7fsuocFu49caZSKoscDZO9HGX2 kd5w== X-Gm-Message-State: AIkVDXJQxGcHnkmUHZrFxOkzf0BFh091jxRslOX8+SmuCfvww196Fph/Wwv4lJdwGoCWjg== X-Received: by 10.28.23.70 with SMTP id 67mr4123369wmx.23.1484163338728; Wed, 11 Jan 2017 11:35:38 -0800 (PST) Received: from 640k.lan (94-39-158-71.adsl-ull.clienti.tiscali.it. [94.39.158.71]) by smtp.gmail.com with ESMTPSA id k11sm10463101wmb.18.2017.01.11.11.35.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jan 2017 11:35:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 11 Jan 2017 20:35:01 +0100 Message-Id: <1484163327-111841-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484163327-111841-1-git-send-email-pbonzini@redhat.com> References: <1484163327-111841-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 07/33] stubs: move acpi stubs to hw/acpi 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No need to include them in libqemustub.a, since only system emulators need them. Signed-off-by: Paolo Bonzini --- hw/acpi/Makefile.objs | 12 ++++++++---- stubs/ipmi.c => hw/acpi/ipmi-stub.c | 0 stubs/Makefile.objs | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) rename stubs/ipmi.c => hw/acpi/ipmi-stub.c (100%) diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 834c63b..dfc8229 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -4,7 +4,11 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o -common-obj-$(CONFIG_ACPI) += acpi_interface.o -common-obj-$(CONFIG_ACPI) += bios-linker-loader.o -common-obj-$(CONFIG_ACPI) += aml-build.o -common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o + +common-obj-y += acpi_interface.o +common-obj-y += bios-linker-loader.o +common-obj-y += aml-build.o + +common-obj-$(CONFIG_IPMI) += ipmi.o +common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o +common-obj-$(CONFIG_ALL) += ipmi-stub.o diff --git a/stubs/ipmi.c b/hw/acpi/ipmi-stub.c similarity index 100% rename from stubs/ipmi.c rename to hw/acpi/ipmi-stub.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 13c5d45..c4df915 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -44,6 +44,5 @@ stub-obj-y += target-monitor-defs.o stub-obj-y += target-get-monitor-def.o stub-obj-y += vhost.o stub-obj-y += iohandler.o -stub-obj-y += ipmi.o stub-obj-y += pc_madt_cpu_entry.o stub-obj-y += migration-colo.o