From nobody Thu May 2 14:35:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491434290837200.12648186188028; Wed, 5 Apr 2017 16:18:10 -0700 (PDT) Received: from localhost ([::1]:42808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvuBl-0005Tu-PW for importer@patchew.org; Wed, 05 Apr 2017 19:18:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvu9M-0003qY-Ar for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvu9I-0006fz-ND for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:40 -0400 Received: from mga02.intel.com ([134.134.136.20]:8130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvu9I-0006fS-Cr for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:36 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2017 16:15:32 -0700 Received: from anthony.sc.intel.com ([10.3.52.155]) by FMSMGA003.fm.intel.com with ESMTP; 05 Apr 2017 16:15:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491434136; x=1522970136; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=69VxVK3RfQ1xVcRI3brsPH8XLoIYrnn3aZOAWN4iCdA=; b=Reg6zH6bcNex0Q40LKCECQoSxNLI351pYTQe3NMfqWPGsJszmIQ3k4G/ G5k1byrsTni2oIx2pt3gc5d7+Dm0FA==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,281,1488873600"; d="scan'208";a="842423554" From: Anthony Xu To: qemu-devel@nongnu.org Date: Wed, 5 Apr 2017 16:21:29 -0700 Message-Id: <1491434491-1765-2-git-send-email-anthony.xu@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1491434491-1765-1-git-send-email-anthony.xu@intel.com> References: <1491434491-1765-1-git-send-email-anthony.xu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 1/3] move xen-common.c to hw/xen/ 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: anthony.perard@citrix.com, pbonzini@redhat.com, sstabellini@kernel.org, Anthony Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" move xen-common.c to hw/xen/ Signed-off -by: Anthony Xu Reviewed-By: Sahid Orentino Ferdjaoui Reviewed-by: Stefano Stabellini --- Makefile.target | 2 -- hw/xen/Makefile.objs | 2 +- xen-common.c =3D> hw/xen/xen-common.c | 0 stubs/Makefile.objs | 1 + xen-common-stub.c =3D> stubs/xen-common.c | 0 5 files changed, 2 insertions(+), 3 deletions(-) rename xen-common.c =3D> hw/xen/xen-common.c (100%) rename xen-common-stub.c =3D> stubs/xen-common.c (100%) diff --git a/Makefile.target b/Makefile.target index 7df2b8c..48c027f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -150,9 +150,7 @@ obj-y +=3D migration/ram.o migration/savevm.o LIBS :=3D $(libs_softmmu) $(LIBS) =20 # xen support -obj-$(CONFIG_XEN) +=3D xen-common.o obj-$(CONFIG_XEN_I386) +=3D xen-hvm.o xen-mapcache.o -obj-$(call lnot,$(CONFIG_XEN)) +=3D xen-common-stub.o obj-$(call lnot,$(CONFIG_XEN_I386)) +=3D xen-hvm-stub.o =20 # Hardware support diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index 4be3ec9..64a70bc 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -1,5 +1,5 @@ # xen backend driver support -common-obj-$(CONFIG_XEN) +=3D xen_backend.o xen_devconfig.o xen_pvdev.o +common-obj-$(CONFIG_XEN) +=3D xen_backend.o xen_devconfig.o xen_pvdev.o xe= n-common.o =20 obj-$(CONFIG_XEN_PCI_PASSTHROUGH) +=3D xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) +=3D xen_pt.o xen_pt_config_init.o xen_p= t_graphics.o xen_pt_msi.o diff --git a/xen-common.c b/hw/xen/xen-common.c similarity index 100% rename from xen-common.c rename to hw/xen/xen-common.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 224f04b..6c80613 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -37,3 +37,4 @@ stub-obj-y +=3D target-monitor-defs.o stub-obj-y +=3D target-get-monitor-def.o stub-obj-y +=3D pc_madt_cpu_entry.o stub-obj-y +=3D vmgenid.o +stub-obj-y +=3D xen-common.o diff --git a/xen-common-stub.c b/stubs/xen-common.c similarity index 100% rename from xen-common-stub.c rename to stubs/xen-common.c --=20 1.8.3.1 From nobody Thu May 2 14:35:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491434217567964.6158164872608; Wed, 5 Apr 2017 16:16:57 -0700 (PDT) Received: from localhost ([::1]:42806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvuAZ-0004RT-Om for importer@patchew.org; Wed, 05 Apr 2017 19:16:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvu9M-0003qa-BV for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvu9J-0006g7-AW for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:40 -0400 Received: from mga02.intel.com ([134.134.136.20]:8130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvu9I-0006fS-SZ for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:37 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2017 16:15:32 -0700 Received: from anthony.sc.intel.com ([10.3.52.155]) by FMSMGA003.fm.intel.com with ESMTP; 05 Apr 2017 16:15:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491434136; x=1522970136; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=7Z85VniM9Jieu3yrHBoldF0EB3pytq3EV2X//WyIM6c=; b=TfNJgOyZooYW3nLW+azVTEAf4wBjCGU64CsZQiXpX9AevIjnxK8D64c9 fcVlfSceIryqWAR+AuPDVVIQHvG3xg==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,281,1488873600"; d="scan'208";a="842423558" From: Anthony Xu To: qemu-devel@nongnu.org Date: Wed, 5 Apr 2017 16:21:30 -0700 Message-Id: <1491434491-1765-3-git-send-email-anthony.xu@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1491434491-1765-1-git-send-email-anthony.xu@intel.com> References: <1491434491-1765-1-git-send-email-anthony.xu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 2/3] move xen-hvm.c to hw/i386/xen/ 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: anthony.perard@citrix.com, pbonzini@redhat.com, sstabellini@kernel.org, Anthony Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" move xen-hvm.c to hw/i386/xen/ Signed-off -by: Anthony Xu Reviewed-By: Sahid Orentino Ferdjaoui Reviewed-by: Stefano Stabellini --- Makefile.target | 3 +-- hw/i386/xen/Makefile.objs | 2 +- hw/i386/xen/trace-events | 11 +++++++++++ xen-hvm.c =3D> hw/i386/xen/xen-hvm.c | 2 +- stubs/Makefile.objs | 1 + xen-hvm-stub.c =3D> stubs/xen-hvm.c | 0 trace-events | 11 ----------- 7 files changed, 15 insertions(+), 15 deletions(-) rename xen-hvm.c =3D> hw/i386/xen/xen-hvm.c (99%) rename xen-hvm-stub.c =3D> stubs/xen-hvm.c (100%) diff --git a/Makefile.target b/Makefile.target index 48c027f..d5ff0c7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -150,8 +150,7 @@ obj-y +=3D migration/ram.o migration/savevm.o LIBS :=3D $(libs_softmmu) $(LIBS) =20 # xen support -obj-$(CONFIG_XEN_I386) +=3D xen-hvm.o xen-mapcache.o -obj-$(call lnot,$(CONFIG_XEN_I386)) +=3D xen-hvm-stub.o +obj-$(CONFIG_XEN_I386) +=3D xen-mapcache.o =20 # Hardware support ifeq ($(TARGET_NAME), sparc64) diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs index 801a68d..daf4f53 100644 --- a/hw/i386/xen/Makefile.objs +++ b/hw/i386/xen/Makefile.objs @@ -1 +1 @@ -obj-y +=3D xen_platform.o xen_apic.o xen_pvdevice.o +obj-y +=3D xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events index 321fe60..f25d622 100644 --- a/hw/i386/xen/trace-events +++ b/hw/i386/xen/trace-events @@ -4,3 +4,14 @@ xen_platform_log(char *s) "xen platform: %s" # hw/i386/xen/xen_pvdevice.c xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO spa= ce (address %"PRIx64")" xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO spa= ce (address %"PRIx64")" + +# xen-hvm.c +xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx= , size %#lx" +xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_di= rty) "%#"PRIx64" size %#lx, log_dirty %i" +handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t= data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) = "I/O=3D%p type=3D%d dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"P= RIx64" count=3D%d size=3D%d" +handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_= ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p= read type=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count= =3D%d size=3D%d" +handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is= _ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%= p write type=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" coun= t=3D%d size=3D%d" +cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, = uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p pio = dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count=3D%d si= ze=3D%d" +cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t s= ize) "I/O=3D%p pio read reg data=3D%#"PRIx64" port=3D%#"PRIx64" size=3D%d" +cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t = size) "I/O=3D%p pio write reg data=3D%#"PRIx64" port=3D%#"PRIx64" size=3D%d" +cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr,= uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p cop= y dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count=3D%d = size=3D%d" diff --git a/xen-hvm.c b/hw/i386/xen/xen-hvm.c similarity index 99% rename from xen-hvm.c rename to hw/i386/xen/xen-hvm.c index 5043beb..0892361 100644 --- a/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "qemu/range.h" #include "sysemu/xen-mapcache.h" -#include "trace-root.h" +#include "trace.h" #include "exec/address-spaces.h" =20 #include diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 6c80613..f5b47bf 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -38,3 +38,4 @@ stub-obj-y +=3D target-get-monitor-def.o stub-obj-y +=3D pc_madt_cpu_entry.o stub-obj-y +=3D vmgenid.o stub-obj-y +=3D xen-common.o +stub-obj-y +=3D xen-hvm.o diff --git a/xen-hvm-stub.c b/stubs/xen-hvm.c similarity index 100% rename from xen-hvm-stub.c rename to stubs/xen-hvm.c diff --git a/trace-events b/trace-events index b07a09b..4e14487 100644 --- a/trace-events +++ b/trace-events @@ -48,17 +48,6 @@ spice_vmc_register_interface(void *scd) "spice vmc regis= tered interface %p" spice_vmc_unregister_interface(void *scd) "spice vmc unregistered interfac= e %p" spice_vmc_event(int event) "spice vmc event %d" =20 -# xen-hvm.c -xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx= , size %#lx" -xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_di= rty) "%#"PRIx64" size %#lx, log_dirty %i" -handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t= data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) = "I/O=3D%p type=3D%d dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"P= RIx64" count=3D%d size=3D%d" -handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_= ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p= read type=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count= =3D%d size=3D%d" -handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is= _ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%= p write type=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" coun= t=3D%d size=3D%d" -cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, = uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p pio = dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count=3D%d si= ze=3D%d" -cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t s= ize) "I/O=3D%p pio read reg data=3D%#"PRIx64" port=3D%#"PRIx64" size=3D%d" -cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t = size) "I/O=3D%p pio write reg data=3D%#"PRIx64" port=3D%#"PRIx64" size=3D%d" -cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr,= uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p cop= y dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count=3D%d = size=3D%d" - # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 xen_remap_bucket(uint64_t index) "index %#"PRIx64 --=20 1.8.3.1 From nobody Thu May 2 14:35:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1491434351689206.94734726370496; Wed, 5 Apr 2017 16:19:11 -0700 (PDT) Received: from localhost ([::1]:42810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvuCk-0005zQ-Jd for importer@patchew.org; Wed, 05 Apr 2017 19:19:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cvu9M-0003qX-Ag for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cvu9J-0006gE-EA for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:40 -0400 Received: from mga02.intel.com ([134.134.136.20]:36405) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cvu9J-0006ft-1p for qemu-devel@nongnu.org; Wed, 05 Apr 2017 19:15:37 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2017 16:15:32 -0700 Received: from anthony.sc.intel.com ([10.3.52.155]) by FMSMGA003.fm.intel.com with ESMTP; 05 Apr 2017 16:15:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491434137; x=1522970137; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=xb7bpuRz5FDScT711hQj1E9atPMCmmuVR6Q5lGrcscM=; b=XjixIFzXbpcKFC6GKEHJucAEJ1YGM1nYLhNTVyKq0KI7l/3uRRTyqn+B J66PVUSTXaLYFgQHviviFVe8wMIozA==; X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,281,1488873600"; d="scan'208";a="842423560" From: Anthony Xu To: qemu-devel@nongnu.org Date: Wed, 5 Apr 2017 16:21:31 -0700 Message-Id: <1491434491-1765-4-git-send-email-anthony.xu@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1491434491-1765-1-git-send-email-anthony.xu@intel.com> References: <1491434491-1765-1-git-send-email-anthony.xu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.20 Subject: [Qemu-devel] [PATCH 3/3] move xen-mapcache.c to hw/i386/xen/ 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: anthony.perard@citrix.com, pbonzini@redhat.com, sstabellini@kernel.org, Anthony Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" move xen-mapcache.c to hw/i386/xen/ Signed-off -by: Anthony Xu Reviewed-by: Stefano Stabellini --- Makefile.target | 3 --- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/i386/xen/Makefile.objs | 2 +- hw/i386/xen/trace-events | 6 ++++++ xen-mapcache.c =3D> hw/i386/xen/xen-mapcache.c | 2 +- trace-events | 5 ----- 7 files changed, 8 insertions(+), 12 deletions(-) rename xen-mapcache.c =3D> hw/i386/xen/xen-mapcache.c (99%) diff --git a/Makefile.target b/Makefile.target index d5ff0c7..a535980 100644 --- a/Makefile.target +++ b/Makefile.target @@ -149,9 +149,6 @@ obj-y +=3D dump.o obj-y +=3D migration/ram.o migration/savevm.o LIBS :=3D $(libs_softmmu) $(LIBS) =20 -# xen support -obj-$(CONFIG_XEN_I386) +=3D xen-mapcache.o - # Hardware support ifeq ($(TARGET_NAME), sparc64) obj-y +=3D hw/sparc64/ diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 029e952..d2ab2f6 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -39,7 +39,6 @@ CONFIG_TPM_TIS=3D$(CONFIG_TPM) CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy -CONFIG_XEN_I386=3D$(CONFIG_XEN) CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-so= ftmmu.mak index d1d7432..9bde2f1 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -39,7 +39,6 @@ CONFIG_TPM_TIS=3D$(CONFIG_TPM) CONFIG_MC146818RTC=3Dy CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy -CONFIG_XEN_I386=3D$(CONFIG_XEN) CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_VMPORT=3Dy diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs index daf4f53..be9d10c 100644 --- a/hw/i386/xen/Makefile.objs +++ b/hw/i386/xen/Makefile.objs @@ -1 +1 @@ -obj-y +=3D xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o +obj-y +=3D xen_platform.o xen_apic.o xen_pvdevice.o xen-hvm.o xen-mapcache= .o diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events index f25d622..547438d 100644 --- a/hw/i386/xen/trace-events +++ b/hw/i386/xen/trace-events @@ -15,3 +15,9 @@ cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint3= 2_t data_is_ptr, uint64 cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t s= ize) "I/O=3D%p pio read reg data=3D%#"PRIx64" port=3D%#"PRIx64" size=3D%d" cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t = size) "I/O=3D%p pio write reg data=3D%#"PRIx64" port=3D%#"PRIx64" size=3D%d" cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr,= uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=3D%p cop= y dir=3D%d df=3D%d ptr=3D%d port=3D%#"PRIx64" data=3D%#"PRIx64" count=3D%d = size=3D%d" + +# xen-mapcache.c +xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 +xen_remap_bucket(uint64_t index) "index %#"PRIx64 +xen_map_cache_return(void* ptr) "%p" + diff --git a/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c similarity index 99% rename from xen-mapcache.c rename to hw/i386/xen/xen-mapcache.c index 1a96d2e..31debdf 100644 --- a/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -19,7 +19,7 @@ #include =20 #include "sysemu/xen-mapcache.h" -#include "trace-root.h" +#include "trace.h" =20 =20 //#define MAPCACHE_DEBUG diff --git a/trace-events b/trace-events index 4e14487..e582d63 100644 --- a/trace-events +++ b/trace-events @@ -48,11 +48,6 @@ spice_vmc_register_interface(void *scd) "spice vmc regis= tered interface %p" spice_vmc_unregister_interface(void *scd) "spice vmc unregistered interfac= e %p" spice_vmc_event(int event) "spice vmc event %d" =20 -# xen-mapcache.c -xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 -xen_remap_bucket(uint64_t index) "index %#"PRIx64 -xen_map_cache_return(void* ptr) "%p" - # monitor.c monitor_protocol_event_handler(uint32_t event, void *qdict) "event=3D%d da= ta=3D%p" monitor_protocol_event_emit(uint32_t event, void *data) "event=3D%d data= =3D%p" --=20 1.8.3.1