Message ID | 1491434491-1765-2-git-send-email-anthony.xu@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Apr 05, 2017 at 04:21:29PM -0700, Anthony Xu wrote: > move xen-common.c to hw/xen/ > > Signed-off -by: Anthony Xu <anthony.xu@intel.com> nit: s/Signed-off -by/Signed-off-by, not sure if it's really important or not. Reviewed-By: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> > > --- > Makefile.target | 2 -- > hw/xen/Makefile.objs | 2 +- > xen-common.c => hw/xen/xen-common.c | 0 > stubs/Makefile.objs | 1 + > xen-common-stub.c => stubs/xen-common.c | 0 > 5 files changed, 2 insertions(+), 3 deletions(-) > rename xen-common.c => hw/xen/xen-common.c (100%) > rename xen-common-stub.c => 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 += migration/ram.o migration/savevm.o > LIBS := $(libs_softmmu) $(LIBS) > > # xen support > -obj-$(CONFIG_XEN) += xen-common.o > obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o > -obj-$(call lnot,$(CONFIG_XEN)) += xen-common-stub.o > obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o > > # 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) += xen_backend.o xen_devconfig.o xen_pvdev.o > +common-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o xen_pvdev.o xen-common.o Refers to the moved file /xen-common.c to /hw/xen/xen-common.c > 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_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 += target-monitor-defs.o > stub-obj-y += target-get-monitor-def.o > stub-obj-y += pc_madt_cpu_entry.o > stub-obj-y += vmgenid.o > +stub-obj-y += xen-common.o Refers to the moved file /xen-common-stub.c to /hw/xen/stubs/xen-common.c > 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 > -- > 1.8.3.1 >
On 04/06/2017 10:10 AM, Sahid Orentino Ferdjaoui wrote: > On Wed, Apr 05, 2017 at 04:21:29PM -0700, Anthony Xu wrote: >> move xen-common.c to hw/xen/ >> >> Signed-off -by: Anthony Xu <anthony.xu@intel.com> > > nit: s/Signed-off -by/Signed-off-by, not sure if it's really important > or not. Some of the automated tooling may choke on the misspelled variant, and S-o-b is legally important, so it is worth fixing. By the way, you can use 'git commit -s' or 'git send-email -s' to add S-o-b in the proper format at a given stage in your workflow, rather than having to type it by hand; it becomes obvious that you didn't use git's automation for adding it when you have a typo or when you have more than one blank line between your S-o-b and the --- separator.
diff --git a/Makefile.target b/Makefile.target index 7df2b8c..48c027f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -150,9 +150,7 @@ obj-y += migration/ram.o migration/savevm.o LIBS := $(libs_softmmu) $(LIBS) # xen support -obj-$(CONFIG_XEN) += xen-common.o obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o -obj-$(call lnot,$(CONFIG_XEN)) += xen-common-stub.o obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o # 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) += xen_backend.o xen_devconfig.o xen_pvdev.o +common-obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o xen_pvdev.o xen-common.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_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 += target-monitor-defs.o stub-obj-y += target-get-monitor-def.o stub-obj-y += pc_madt_cpu_entry.o stub-obj-y += vmgenid.o +stub-obj-y += 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