Message ID | 1457628755-20267-10-git-send-email-wei.liu2@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > -build: $(STUBDOMPATH) > +build: $(STUBDOM_BUILD) Wei, in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly. Do you have any plan to fix them? :) btw, if the others(or me) want to fix the code style, how to fix it? send out a big patch? Any suggestions? Thanks.:) Quan
On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > -build: $(STUBDOMPATH) > > +build: $(STUBDOM_BUILD) > > Wei, > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is inconsistent and ugly. > Do you have any plan to fix them? :) > No, I don't. > btw, if the others(or me) want to fix the code style, how to fix it? send out a big patch? Any suggestions? > Thanks.:) > I personally prefer small patches in a series, but I don't object to having large patch(es) either. At the end of the day, I think Daniel's opinion matters most. After a plan is agreed upon, you can then provide a branch for us to pull in. Note that upstream don't test vtpm in any fashion so you do need to run your tests. The only thing that matters to me is that when you will do it -- you will need to patch a different tree after I split off stubdom. In order to minimise the fuss one of us will need to wait for the other. Wei. > > Quan > > >
On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > -build: $(STUBDOMPATH) > > > +build: $(STUBDOM_BUILD) > > > > Wei, > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is > > inconsistent and ugly. > I personally prefer small patches in a series, but I don't object to having large > patch(es) either. ok. I think so too. It may be one file per patch. > At the end of the day, I think Daniel's opinion matters most. > After a plan is agreed upon, you can then provide a branch for us to pull in. I think I am not authorized to branch, could you provide a branch and tell me how to commit to that branch? Sorry, I am unfamiliar with the upstream process. > Note > that upstream don't test vtpm in any fashion so you do need to run your tests. > I will test it. I think I hope Daniel could help my patches. btw, I have made a quick patch to fix the seal/unseal issue. I will send out later. > The only thing that matters to me is that when you will do it -- you will need to > patch a different tree after I split off stubdom. In order to minimise the fuss one > of us will need to wait for the other. > Once you have done, please let me know. Quan
On Fri, Apr 01, 2016 at 01:41:40AM +0000, Xu, Quan wrote: > On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > > -build: $(STUBDOMPATH) > > > > +build: $(STUBDOM_BUILD) > > > > > > Wei, > > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is > > > inconsistent and ugly. > > I personally prefer small patches in a series, but I don't object to having large > > patch(es) either. > > ok. I think so too. It may be one file per patch. > > > > At the end of the day, I think Daniel's opinion matters most. > > After a plan is agreed upon, you can then provide a branch for us to pull in. > > I think I am not authorized to branch, could you provide a branch and tell me how to commit to that branch? > Sorry, I am unfamiliar with the upstream process. > Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). You can just do the following: $ git clone xen.git # or stubdom.git $ cd xen.git # or stubdom.git $ git branch wip.vtpm-coding-style-fix-v1 ... do work, commit as you go alone ... $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 ... post your patch series on xen-devel, along with the git repository and branch When your patches are all acked by Daniel, you can then fold all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked) and prod committers to pull from that branch. > > Note > > that upstream don't test vtpm in any fashion so you do need to run your tests. > > > I will test it. I think I hope Daniel could help my patches. > btw, I have made a quick patch to fix the seal/unseal issue. I will send out later. > > > The only thing that matters to me is that when you will do it -- you will need to > > patch a different tree after I split off stubdom. In order to minimise the fuss one > > of us will need to wait for the other. > > > Once you have done, please let me know. OK, I will try to sort it out within April. Feel free to ping me if I drop the ball. Wei. > Quan
> -----Original Message----- > From: Xen-devel [mailto:xen-devel-bounces@lists.xen.org] On Behalf Of Wei > Liu > Sent: Friday, April 01, 2016 6:03 PM > To: Xu, Quan > Cc: Xen-devel; Daniel De Graaf; Wei Liu > Subject: Re: [Xen-devel] [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH > target > > On Fri, Apr 01, 2016 at 01:41:40AM +0000, Xu, Quan wrote: > > On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > > > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > -build: $(STUBDOMPATH) > > > > > +build: $(STUBDOM_BUILD) > > > > > > > > Wei, > > > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code > > > > style is inconsistent and ugly. > > > I personally prefer small patches in a series, but I don't object to > > > having large > > > patch(es) either. > > > > ok. I think so too. It may be one file per patch. > > > > > > > At the end of the day, I think Daniel's opinion matters most. > > > After a plan is agreed upon, you can then provide a branch for us to pull in. > > > > I think I am not authorized to branch, could you provide a branch and tell me > how to commit to that branch? > > Sorry, I am unfamiliar with the upstream process. > > > > Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). > You can just do the following: > > $ git clone xen.git # or stubdom.git > $ cd xen.git # or stubdom.git > $ git branch wip.vtpm-coding-style-fix-v1 > ... do work, commit as you go alone ... > $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 > ... post your patch series on xen-devel, along with the git repository > and branch > Wei, When I tried to follow above steps, I got: error: Cannot access URL http://xenbits.xen.org/git-http/xen.git/, return code 22 fatal: git-http-push failed could you help me? Quan > When your patches are all acked by Daniel, you can then fold all the tags into > your own branch (wip.vtpm-coding-style-fix-v$X-acked) > and prod committers to pull from that branch. > > > > Note > > > that upstream don't test vtpm in any fashion so you do need to run your > tests. > > > > > I will test it. I think I hope Daniel could help my patches. > > btw, I have made a quick patch to fix the seal/unseal issue. I will send out > later. > > > > > The only thing that matters to me is that when you will do it -- you > > > will need to patch a different tree after I split off stubdom. In > > > order to minimise the fuss one of us will need to wait for the other. > > > > > Once you have done, please let me know. > > OK, I will try to sort it out within April. Feel free to ping me if I drop the ball. > > Wei. > > > Quan > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Wed, Apr 06, 2016 at 09:09:22AM +0000, Xu, Quan wrote: > > > > -----Original Message----- > > From: Xen-devel [mailto:xen-devel-bounces@lists.xen.org] On Behalf Of Wei > > Liu > > Sent: Friday, April 01, 2016 6:03 PM > > To: Xu, Quan > > Cc: Xen-devel; Daniel De Graaf; Wei Liu > > Subject: Re: [Xen-devel] [PATCH RFC v1 09/14] Makefile: delete STUBDOMPATH > > target > > > > On Fri, Apr 01, 2016 at 01:41:40AM +0000, Xu, Quan wrote: > > > On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > > > > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > > > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > > -build: $(STUBDOMPATH) > > > > > > +build: $(STUBDOM_BUILD) > > > > > > > > > > Wei, > > > > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code > > > > > style is inconsistent and ugly. > > > > I personally prefer small patches in a series, but I don't object to > > > > having large > > > > patch(es) either. > > > > > > ok. I think so too. It may be one file per patch. > > > > > > > > > > At the end of the day, I think Daniel's opinion matters most. > > > > After a plan is agreed upon, you can then provide a branch for us to pull in. > > > > > > I think I am not authorized to branch, could you provide a branch and tell me > > how to commit to that branch? > > > Sorry, I am unfamiliar with the upstream process. > > > > > > > Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). > > You can just do the following: > > > > $ git clone xen.git # or stubdom.git > > $ cd xen.git # or stubdom.git > > $ git branch wip.vtpm-coding-style-fix-v1 > > ... do work, commit as you go alone ... > > $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 > > ... post your patch series on xen-devel, along with the git repository > > and branch > > > > Wei, > When I tried to follow above steps, I got: > error: Cannot access URL http://xenbits.xen.org/git-http/xen.git/, return code 22 > fatal: git-http-push failed > could you help me? > > You shouldn't push to the official xen.git. You can push to other public git repository hosting service like bitbucket or github. Wei. > Quan > > > > > > > When your patches are all acked by Daniel, you can then fold all the tags into > > your own branch (wip.vtpm-coding-style-fix-v$X-acked) > > and prod committers to pull from that branch. > > > > > > Note > > > > that upstream don't test vtpm in any fashion so you do need to run your > > tests. > > > > > > > I will test it. I think I hope Daniel could help my patches. > > > btw, I have made a quick patch to fix the seal/unseal issue. I will send out > > later. > > > > > > > The only thing that matters to me is that when you will do it -- you > > > > will need to patch a different tree after I split off stubdom. In > > > > order to minimise the fuss one of us will need to wait for the other. > > > > > > > Once you have done, please let me know. > > > > OK, I will try to sort it out within April. Feel free to ping me if I drop the ball. > > > > Wei. > > > > > Quan > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel
On Fri, Apr 01, 2016 at 11:03:28AM +0100, Wei Liu wrote: > On Fri, Apr 01, 2016 at 01:41:40AM +0000, Xu, Quan wrote: > > On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > > > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > -build: $(STUBDOMPATH) > > > > > +build: $(STUBDOM_BUILD) > > > > > > > > Wei, > > > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code style is > > > > inconsistent and ugly. > > > I personally prefer small patches in a series, but I don't object to having large > > > patch(es) either. > > > > ok. I think so too. It may be one file per patch. > > > > > > > At the end of the day, I think Daniel's opinion matters most. > > > After a plan is agreed upon, you can then provide a branch for us to pull in. > > > > I think I am not authorized to branch, could you provide a branch and tell me how to commit to that branch? > > Sorry, I am unfamiliar with the upstream process. > > > > Oh, you don't need to branch on the main tree (xen.git or future > stubdom.git). You can just do the following: > > $ git clone xen.git # or stubdom.git > $ cd xen.git # or stubdom.git > $ git branch wip.vtpm-coding-style-fix-v1 > ... do work, commit as you go alone ... > $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 > ... post your patch series on xen-devel, along with the git repository > and branch > > When your patches are all acked by Daniel, you can then fold > all the tags into your own branch (wip.vtpm-coding-style-fix-v$X-acked) > and prod committers to pull from that branch. > > > > Note > > > that upstream don't test vtpm in any fashion so you do need to run your tests. > > > > > I will test it. I think I hope Daniel could help my patches. > > btw, I have made a quick patch to fix the seal/unseal issue. I will send out later. > > > > > The only thing that matters to me is that when you will do it -- you will need to > > > patch a different tree after I split off stubdom. In order to minimise the fuss one > > > of us will need to wait for the other. > > > > > Once you have done, please let me know. > > OK, I will try to sort it out within April. Feel free to ping me if I > drop the ball. > OK, so the plan has become a bit more complicated. I'm still trying to work out everything -- I've collected some opinions during hackathon and people seemed to be of the opinion that things can be done a bit differently. I don't expect to have everything ready in April. So if you want to work on vtpm code, please let me know. Wei. > Wei. > > > Quan
Wei, I have spent a lot of days to clean up the code of vtpm / vtpmmgr. but there are tricky issue to boot domu on TPM2.0.. So I am afraid I can't finish it as today is my last working day at intel. Now, these patch are on https://github.com/virt2x/vtpm2vtpmmgr Sorry for that. Quan On April 01, 2016 6:03 PM, Wei Liu <wei.liu2@citrix.com> wrote: > On Fri, Apr 01, 2016 at 01:41:40AM +0000, Xu, Quan wrote: > > On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > > > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > -build: $(STUBDOMPATH) > > > > > +build: $(STUBDOM_BUILD) > > > > > > > > Wei, > > > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code > > > > style is inconsistent and ugly. > > > I personally prefer small patches in a series, but I don't object to > > > having large > > > patch(es) either. > > > > ok. I think so too. It may be one file per patch. > > > > > > > At the end of the day, I think Daniel's opinion matters most. > > > After a plan is agreed upon, you can then provide a branch for us to pull in. > > > > I think I am not authorized to branch, could you provide a branch and tell me > how to commit to that branch? > > Sorry, I am unfamiliar with the upstream process. > > > > Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). > You can just do the following: > > $ git clone xen.git # or stubdom.git > $ cd xen.git # or stubdom.git > $ git branch wip.vtpm-coding-style-fix-v1 > ... do work, commit as you go alone ... > $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 > ... post your patch series on xen-devel, along with the git repository > and branch > > When your patches are all acked by Daniel, you can then fold all the tags into > your own branch (wip.vtpm-coding-style-fix-v$X-acked) > and prod committers to pull from that branch. > > > > Note > > > that upstream don't test vtpm in any fashion so you do need to run your > tests. > > > > > I will test it. I think I hope Daniel could help my patches. > > btw, I have made a quick patch to fix the seal/unseal issue. I will send out > later. > > > > > The only thing that matters to me is that when you will do it -- you > > > will need to patch a different tree after I split off stubdom. In > > > order to minimise the fuss one of us will need to wait for the other. > > > > > Once you have done, please let me know. > > OK, I will try to sort it out within April. Feel free to ping me if I drop the ball. > > Wei. > > > Quan > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Tue, Jul 05, 2016 at 01:53:22PM +0000, Xu, Quan wrote: > Wei, > I have spent a lot of days to clean up the code of vtpm / vtpmmgr. but there are tricky issue to boot domu on TPM2.0.. > So I am afraid I can't finish it as today is my last working day at intel. > > Now, these patch are on https://github.com/virt2x/vtpm2vtpmmgr > Sorry for that. No need to be sorry. Thanks for letting us know. Last but not least, thanks for your contribution to Xen and all the best with your new journey! Wei. > Quan > > On April 01, 2016 6:03 PM, Wei Liu <wei.liu2@citrix.com> wrote: > > On Fri, Apr 01, 2016 at 01:41:40AM +0000, Xu, Quan wrote: > > > On March 31, 2016 9:50pm, Wei Liu <wei.liu2@citrix.com> wrote: > > > > On Thu, Mar 31, 2016 at 10:21:22AM +0000, Xu, Quan wrote: > > > > > On March 11, 2016 12:53am, Wei Liu <wei.liu2@citrix.com> wrote: > > > > > > -build: $(STUBDOMPATH) > > > > > > +build: $(STUBDOM_BUILD) > > > > > > > > > > Wei, > > > > > in original code, in stubdom/vtpm and stubdom/vtpmmgr, the code > > > > > style is inconsistent and ugly. > > > > I personally prefer small patches in a series, but I don't object to > > > > having large > > > > patch(es) either. > > > > > > ok. I think so too. It may be one file per patch. > > > > > > > > > > At the end of the day, I think Daniel's opinion matters most. > > > > After a plan is agreed upon, you can then provide a branch for us to pull in. > > > > > > I think I am not authorized to branch, could you provide a branch and tell me > > how to commit to that branch? > > > Sorry, I am unfamiliar with the upstream process. > > > > > > > Oh, you don't need to branch on the main tree (xen.git or future stubdom.git). > > You can just do the following: > > > > $ git clone xen.git # or stubdom.git > > $ cd xen.git # or stubdom.git > > $ git branch wip.vtpm-coding-style-fix-v1 > > ... do work, commit as you go alone ... > > $ git push $some_public_remote wip.vtpm-coding-style-fix-v1 > > ... post your patch series on xen-devel, along with the git repository > > and branch > > > > When your patches are all acked by Daniel, you can then fold all the tags into > > your own branch (wip.vtpm-coding-style-fix-v$X-acked) > > and prod committers to pull from that branch. > > > > > > Note > > > > that upstream don't test vtpm in any fashion so you do need to run your > > tests. > > > > > > > I will test it. I think I hope Daniel could help my patches. > > > btw, I have made a quick patch to fix the seal/unseal issue. I will send out > > later. > > > > > > > The only thing that matters to me is that when you will do it -- you > > > > will need to patch a different tree after I split off stubdom. In > > > > order to minimise the fuss one of us will need to wait for the other. > > > > > > > Once you have done, please let me know. > > > > OK, I will try to sort it out within April. Feel free to ping me if I drop the ball. > > > > Wei. > > > > > Quan > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel
diff --git a/Makefile b/Makefile index 875760c..19b80a0 100644 --- a/Makefile +++ b/Makefile @@ -62,16 +62,10 @@ TARGET_LDFLAGS += -nostdlib -L$(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib TARGETS=$(STUBDOM_TARGETS) -STUBDOMPATH="stubdompath.sh" -genpath-target = $(call buildmakevars2file,$(STUBDOMPATH)) -$(eval $(genpath-target)) - .PHONY: all all: build ifeq ($(STUBDOM_SUPPORTED),1) -build: $(STUBDOMPATH) $(STUBDOM_BUILD) -else -build: $(STUBDOMPATH) +build: $(STUBDOM_BUILD) endif ############## @@ -540,15 +534,12 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore ######### ifeq ($(STUBDOM_SUPPORTED),1) -install: $(STUBDOMPATH) $(STUBDOM_INSTALL) -else -install: $(STUBDOMPATH) +install: $(STUBDOM_INSTALL) endif install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)" - $(INSTALL_DATA) stubdompath.sh "$(DESTDIR)$(LIBEXEC_BIN)" $(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)" $(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-ioemu/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/ioemu-stubdom.gz" @@ -591,7 +582,6 @@ clean: $(MAKE) -C vtpm clean $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) - rm -f $(STUBDOMPATH) [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean
It is used to generate a script used by toolstack to launch stubdom. It relies paths generated when building Xen, so it should be part of xen.git. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Makefile | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)