From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org
Cc: anthony.perard@citrix.com, Wei Liu <wei.liu2@citrix.com>,
stefano.stabellini@eu.citrix.com
Subject: [Qemu-devel] [PATCH 2/3] xen: move Xen HVM files under hw/i386/xen
Date: Wed, 29 Jan 2014 12:15:06 +0000 [thread overview]
Message-ID: <1390997707-28607-3-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1390997707-28607-1-git-send-email-wei.liu2@citrix.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
hw/i386/Makefile.objs | 2 +-
hw/i386/xen/Makefile.objs | 1 +
hw/{ => i386}/xen/xen_apic.c | 0
hw/{ => i386}/xen/xen_platform.c | 0
hw/{ => i386}/xen/xen_pvdevice.c | 0
hw/xen/Makefile.objs | 1 -
6 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 hw/i386/xen/Makefile.objs
rename hw/{ => i386}/xen/xen_apic.c (100%)
rename hw/{ => i386}/xen/xen_platform.c (100%)
rename hw/{ => i386}/xen/xen_pvdevice.c (100%)
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 0faccd7..77dcf06 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -2,7 +2,7 @@ obj-$(CONFIG_KVM) += kvm/
obj-y += multiboot.o smbios.o
obj-y += pc.o pc_piix.o pc_q35.o
obj-y += pc_sysfw.o
-obj-$(CONFIG_XEN) += ../xenpv/
+obj-$(CONFIG_XEN) += ../xenpv/ xen/
obj-y += kvmvapic.o
obj-y += acpi-build.o
diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs
new file mode 100644
index 0000000..801a68d
--- /dev/null
+++ b/hw/i386/xen/Makefile.objs
@@ -0,0 +1 @@
+obj-y += xen_platform.o xen_apic.o xen_pvdevice.o
diff --git a/hw/xen/xen_apic.c b/hw/i386/xen/xen_apic.c
similarity index 100%
rename from hw/xen/xen_apic.c
rename to hw/i386/xen/xen_apic.c
diff --git a/hw/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
similarity index 100%
rename from hw/xen/xen_platform.c
rename to hw/i386/xen/xen_platform.c
diff --git a/hw/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
similarity index 100%
rename from hw/xen/xen_pvdevice.c
rename to hw/i386/xen/xen_pvdevice.c
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
index ce640c6..a0ca0aa 100644
--- a/hw/xen/Makefile.objs
+++ b/hw/xen/Makefile.objs
@@ -1,6 +1,5 @@
# xen backend driver support
common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
-obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o xen_pvdevice.o
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o
--
1.7.10.4
next prev parent reply other threads:[~2014-01-29 12:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-29 12:15 [Qemu-devel] [PATCH 0/3] QEMU/Xen: disentangle PV and HVM in QEMU Wei Liu
2014-01-29 12:15 ` [Qemu-devel] [PATCH 1/3] xen: move Xen PV machine files to hw/xenpv Wei Liu
2014-01-29 12:15 ` Wei Liu [this message]
2014-01-29 12:15 ` [Qemu-devel] [PATCH 3/3] xen: factor out common functions Wei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390997707-28607-3-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).