[v2][PATCH] tools/hvmloader: link errno.h from xen internal

[v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Tiejun Chen]

We need to act on some specific hypercall error numbers, so
require the hypervisor view on the errno.h value rather than
just the build environment's number. So here link this headfile
from xen.

Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
v2:

* CCed more tools MAINTAINERS
* Rephrase long log
* Remove this line '@rm -rf errno.h' since we always force link
* Drop including this head file in util.c directly

 .gitignore                        | 1 +
 tools/firmware/hvmloader/Makefile | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b24e905..52c3038 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,6 +127,7 @@ tools/firmware/hvmloader/acpi/ssdt_*.h
 tools/firmware/hvmloader/hvmloader
 tools/firmware/hvmloader/roms.h
 tools/firmware/hvmloader/roms.inc
+tools/firmware/hvmloader/errno.h
 tools/firmware/rombios/BIOS-bochs-[^/]*
 tools/firmware/rombios/_rombios[^/]*_.c
 tools/firmware/rombios/rombios[^/]*.s
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 46a79c5..333350b 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -84,9 +84,12 @@ ROMS += $(SEABIOS_ROM)
 endif
 
 .PHONY: all
-all: subdirs-all
+all: subdirs-all .dir
 	$(MAKE) hvmloader
 
+.dir:
+	ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .
+
 ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
 smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""
 
@@ -136,7 +139,7 @@ endif
 
 .PHONY: clean
 clean: subdirs-clean
-	rm -f roms.inc roms.inc.new acpi.h
+	rm -f roms.inc roms.inc.new acpi.h errno.h
 	rm -f hvmloader hvmloader.tmp *.o $(DEPS)
 
 -include $(DEPS)
-- 
1.9.1

Re: [v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Jan Beulich]

>>> On 03.11.14 at 10:00, <tiejun.chen@intel.com> wrote:
> --- a/tools/firmware/hvmloader/Makefile
> +++ b/tools/firmware/hvmloader/Makefile
> @@ -84,9 +84,12 @@ ROMS += $(SEABIOS_ROM)
>  endif
>  
>  .PHONY: all
> -all: subdirs-all
> +all: subdirs-all .dir

Considering uses going forward, I think subdirs-all should depend on
.dir (which is being misnamed anyway, presumably due to blindly
taking what is in tools/include/Makefile, where a directory _is_ being
created). Considering that it's an individual file, the file name would
seem quite right to be used as dependency here.

Jan

Re: [v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Chen, Tiejun]

On 2014/11/3 17:43, Jan Beulich wrote:
>>>> On 03.11.14 at 10:00, <tiejun.chen@intel.com> wrote:
>> --- a/tools/firmware/hvmloader/Makefile
>> +++ b/tools/firmware/hvmloader/Makefile
>> @@ -84,9 +84,12 @@ ROMS += $(SEABIOS_ROM)
>>   endif
>>
>>   .PHONY: all
>> -all: subdirs-all
>> +all: subdirs-all .dir
>
> Considering uses going forward, I think subdirs-all should depend on
> .dir (which is being misnamed anyway, presumably due to blindly
> taking what is in tools/include/Makefile, where a directory _is_ being
> created). Considering that it's an individual file, the file name would

You're right.

> seem quite right to be used as dependency here.

So what about this?

.PHONY: all
all: subdirs-all errno
     $(MAKE) hvmloader

errno:
     ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .

Thanks
Tiejun

Re: [v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Jan Beulich]

>>> On 03.11.14 at 11:05, <tiejun.chen@intel.com> wrote:
> On 2014/11/3 17:43, Jan Beulich wrote:
>>>>> On 03.11.14 at 10:00, <tiejun.chen@intel.com> wrote:
>>> --- a/tools/firmware/hvmloader/Makefile
>>> +++ b/tools/firmware/hvmloader/Makefile
>>> @@ -84,9 +84,12 @@ ROMS += $(SEABIOS_ROM)
>>>   endif
>>>
>>>   .PHONY: all
>>> -all: subdirs-all
>>> +all: subdirs-all .dir
>>
>> Considering uses going forward, I think subdirs-all should depend on
>> .dir (which is being misnamed anyway, presumably due to blindly
>> taking what is in tools/include/Makefile, where a directory _is_ being
>> created). Considering that it's an individual file, the file name would
> 
> You're right.
> 
>> seem quite right to be used as dependency here.
> 
> So what about this?
> 
> .PHONY: all
> all: subdirs-all errno
>      $(MAKE) hvmloader
> 
> errno:
>      ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .

This addresses just one of the points I made.

Jan

Re: [v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Chen, Tiejun]

On 2014/11/3 18:19, Jan Beulich wrote:
>>>> On 03.11.14 at 11:05, <tiejun.chen@intel.com> wrote:
>> On 2014/11/3 17:43, Jan Beulich wrote:
>>>>>> On 03.11.14 at 10:00, <tiejun.chen@intel.com> wrote:
>>>> --- a/tools/firmware/hvmloader/Makefile
>>>> +++ b/tools/firmware/hvmloader/Makefile
>>>> @@ -84,9 +84,12 @@ ROMS += $(SEABIOS_ROM)
>>>>    endif
>>>>
>>>>    .PHONY: all
>>>> -all: subdirs-all
>>>> +all: subdirs-all .dir
>>>
>>> Considering uses going forward, I think subdirs-all should depend on
>>> .dir (which is being misnamed anyway, presumably due to blindly
>>> taking what is in tools/include/Makefile, where a directory _is_ being
>>> created). Considering that it's an individual file, the file name would
>>
>> You're right.
>>
>>> seem quite right to be used as dependency here.
>>
>> So what about this?
>>
>> .PHONY: all
>> all: subdirs-all errno
>>       $(MAKE) hvmloader
>>
>> errno:
>>       ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .
>
> This addresses just one of the points I made.

Are you saying that dependency?

@@ -87,6 +87,11 @@ endif
  all: subdirs-all
         $(MAKE) hvmloader

+subdirs-all: errno
+
+errno:
+       ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .
+
  ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
  smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""

Thanks
Tiejun

Re: [v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Jan Beulich]

>>> On 03.11.14 at 12:22, <tiejun.chen@intel.com> wrote:
> Are you saying that dependency?
> 
> @@ -87,6 +87,11 @@ endif
>   all: subdirs-all
>          $(MAKE) hvmloader
> 
> +subdirs-all: errno
> +
> +errno:
> +       ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .
> +
>   ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
>   smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""

Another step in the right direction. If now you also change the target
to be "errno.h" instead of "errno", we'll have what we want.

Jan

Re: [v2][PATCH] tools/hvmloader: link errno.h from xen internal

[Chen, Tiejun]

On 2014/11/3 19:37, Jan Beulich wrote:
>>>> On 03.11.14 at 12:22, <tiejun.chen@intel.com> wrote:
>> Are you saying that dependency?
>>
>> @@ -87,6 +87,11 @@ endif
>>    all: subdirs-all
>>           $(MAKE) hvmloader
>>
>> +subdirs-all: errno
>> +
>> +errno:
>> +       ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .
>> +
>>    ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
>>    smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""
>
> Another step in the right direction. If now you also change the target
> to be "errno.h" instead of "errno", we'll have what we want.
>

Okay,

  all: subdirs-all
         $(MAKE) hvmloader

+subdirs-all: errno.h
+
+errno.h:
+       ln -sf $(XEN_ROOT)/xen/include/xen/errno.h .
+
  ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
  smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(shell date +%m/%d/%Y)\""

If this is fine I will send next revision once some tools maintainer can 
give an acknowledge.

Thanks
Tiejun