From patchwork Thu Apr 11 16:10:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 235836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB5322C00C1 for ; Fri, 12 Apr 2013 03:06:21 +1000 (EST) Received: from localhost ([::1]:48231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQK7G-0002RR-5s for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 12:12:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQK5b-0001Ht-Uf for qemu-devel@nongnu.org; Thu, 11 Apr 2013 12:11:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQK5a-0003w5-Bn for qemu-devel@nongnu.org; Thu, 11 Apr 2013 12:11:07 -0400 Received: from mail-bk0-x22d.google.com ([2a00:1450:4008:c01::22d]:42408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQK5a-0003vm-3v for qemu-devel@nongnu.org; Thu, 11 Apr 2013 12:11:06 -0400 Received: by mail-bk0-f45.google.com with SMTP id j10so919722bkw.32 for ; Thu, 11 Apr 2013 09:11:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=LmmrfpfyCj8RnExhHBFQnVB5CkLY6krgVpPow1g9Q4Y=; b=pTfN5iMxTQo57nk6baSxU6UiQ6Db8/q5tXAu7rE9Vech2WbEoZn2m/KlNfMdBLbqpU OoGSNw7gaJp4AO8aJmm8o0z9ZpmWJxQjNq9fwQv/Yg9rbvLG7sqT1cVbsGCtfc+QRjU7 Dr2w3QjHsepzNxV5jAyzIFgclf2irzA9PzW13SzQwdG8EKXABWVjyaLf+hXKaXiA8RSK RuE6jOxJgWzEssdCxjNJbE8655OjdsQfuWq6ik7Vg/Newy/21npdgMyUNQ23jwVwWY8T VXZgy7J/f87XfOXbZ/VzPVfQoQqwm7hYX9MQ+ibxOw7NJv2OsR5pcs+m/cN4RXoiBx4l OAQg== X-Received: by 10.204.170.202 with SMTP id e10mr2648714bkz.73.1365696665300; Thu, 11 Apr 2013 09:11:05 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id r17sm2225568bkw.21.2013.04.11.09.11.03 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 11 Apr 2013 09:11:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 11 Apr 2013 18:10:33 +0200 Message-Id: <1365696633-30727-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365696633-30727-1-git-send-email-pbonzini@redhat.com> References: <1365696633-30727-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::22d Cc: peter.maydell@linaro.org, mst@redhat.com Subject: [Qemu-devel] [PATCH 12/12] hw: move memory API to hw/core X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- Makefile.target | 4 ++-- hw/core/Makefile.objs | 3 +++ ioport.c => hw/core/ioport.c | 0 memory.c => hw/core/memory.c | 0 4 files changed, 5 insertions(+), 2 deletions(-) rename ioport.c => hw/core/ioport.c (100%) rename memory.c => hw/core/memory.c (100%) diff --git a/ioport.c b/hw/core/ioport.c similarity index 100% rename from ioport.c rename to hw/core/ioport.c diff --git a/memory.c b/hw/core/memory.c similarity index 100% rename from memory.c rename to hw/core/memory.c diff --git a/Makefile.target b/Makefile.target index 2bd6d14..9ddb9fa 100644 --- a/Makefile.target +++ b/Makefile.target @@ -108,13 +108,13 @@ CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y) CONFIG_NO_GET_MEMORY_MAPPING = $(if $(subst n,,$(CONFIG_HAVE_GET_MEMORY_MAPPING)),n,y) CONFIG_NO_CORE_DUMP = $(if $(subst n,,$(CONFIG_HAVE_CORE_DUMP)),n,y) -obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o +obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o obj-y += qtest.o obj-y += hw/ obj-$(CONFIG_FDT) += device_tree.o obj-$(CONFIG_KVM) += kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o -obj-y += memory.o savevm.o cputlb.o +obj-y += savevm.o cputlb.o obj-$(CONFIG_HAVE_GET_MEMORY_MAPPING) += memory_mapping.o obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 94109f3..b9e96ca 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -11,4 +11,7 @@ common-obj-$(CONFIG_SOFTMMU) += null-machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_SOFTMMU) += qdev-addr.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o +common-obj-$(CONFIG_SOFTMMU) += ioport.o +obj-$(CONFIG_SOFTMMU) += memory.o +