[PATCH] hvmloader: fix building error

[PATCH] hvmloader: fix building error

[Wen Congyang]

commit b9245b75 introduces a building error:
make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
smbios.c:384:46: error: invalid digit "8" in octal constant
smbios.c:792:46: error: invalid digit "8" in octal constant
make[1]: *** [smbios.o] Error 1

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
---
 tools/firmware/hvmloader/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 34008d2..e4830ca 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -91,7 +91,7 @@ all: subdirs-all
 	$(MAKE) hvmloader
 
 ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
-smbios.o: CFLAGS += -D__SMBIOS_DATE__="$(SMBIOS_REL_DATE)"
+smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
 
 hvmloader: $(OBJS) acpi/acpi.a
 	$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $^
-- 
2.1.0

Re: [PATCH] hvmloader: fix building error

[Olaf Hering]

On Wed, Apr 08, Wen Congyang wrote:

> commit b9245b75 introduces a building error:
> make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
> gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
> smbios.c:384:46: error: invalid digit "8" in octal constant
> smbios.c:792:46: error: invalid digit "8" in octal constant
> make[1]: *** [smbios.o] Error 1

Oh, I did not spot that because in my builds the octal number was always
valid. But you are right, it has to be a string constant.

Olaf

Re: [PATCH] hvmloader: fix building error

[Olaf Hering]

On Wed, Apr 08, Wen Congyang wrote:

> On 04/08/2015 03:21 PM, Olaf Hering wrote:
> > On Wed, Apr 08, Wen Congyang wrote:
> > 
> >> commit b9245b75 introduces a building error:
> >> make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
> >> gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
> >> smbios.c:384:46: error: invalid digit "8" in octal constant
> >> smbios.c:792:46: error: invalid digit "8" in octal constant
> >> make[1]: *** [smbios.o] Error 1
> > 
> > Oh, I did not spot that because in my builds the octal number was always
> > valid. But you are right, it has to be a string constant.
> 
> Do you run 'make -C tools/ clean' before building?

No, I dont. I do 'git clean -dffx', often.

Olaf

Re: [PATCH] hvmloader: fix building error

[Wen Congyang]

On 04/08/2015 03:21 PM, Olaf Hering wrote:
> On Wed, Apr 08, Wen Congyang wrote:
> 
>> commit b9245b75 introduces a building error:
>> make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
>> gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
>> smbios.c:384:46: error: invalid digit "8" in octal constant
>> smbios.c:792:46: error: invalid digit "8" in octal constant
>> make[1]: *** [smbios.o] Error 1
> 
> Oh, I did not spot that because in my builds the octal number was always
> valid. But you are right, it has to be a string constant.

Do you run 'make -C tools/ clean' before building?

Thanks
Wen Congyang

> 
> Olaf
> 

Re: [PATCH] hvmloader: fix building error

[Wen Congyang]

On 04/08/2015 03:28 PM, Olaf Hering wrote:
> On Wed, Apr 08, Wen Congyang wrote:
> 
>> On 04/08/2015 03:21 PM, Olaf Hering wrote:
>>> On Wed, Apr 08, Wen Congyang wrote:
>>>
>>>> commit b9245b75 introduces a building error:
>>>> make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
>>>> gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
>>>> smbios.c:384:46: error: invalid digit "8" in octal constant
>>>> smbios.c:792:46: error: invalid digit "8" in octal constant
>>>> make[1]: *** [smbios.o] Error 1
>>>
>>> Oh, I did not spot that because in my builds the octal number was always
>>> valid. But you are right, it has to be a string constant.
>>
>> Do you run 'make -C tools/ clean' before building?
> 
> No, I dont. I do 'git clean -dffx', often.

I guess if you do it, you will also find this problem.

Thanks
Wen Congyang

> 
> Olaf
> .
> 

Re: [PATCH] hvmloader: fix building error

[Andrew Cooper]

On 08/04/15 08:33, Wen Congyang wrote:
> On 04/08/2015 03:28 PM, Olaf Hering wrote:
>> On Wed, Apr 08, Wen Congyang wrote:
>>
>>> On 04/08/2015 03:21 PM, Olaf Hering wrote:
>>>> On Wed, Apr 08, Wen Congyang wrote:
>>>>
>>>>> commit b9245b75 introduces a building error:
>>>>> make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
>>>>> gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
>>>>> smbios.c:384:46: error: invalid digit "8" in octal constant
>>>>> smbios.c:792:46: error: invalid digit "8" in octal constant
>>>>> make[1]: *** [smbios.o] Error 1
>>>> Oh, I did not spot that because in my builds the octal number was always
>>>> valid. But you are right, it has to be a string constant.
>>> Do you run 'make -C tools/ clean' before building?
>> No, I dont. I do 'git clean -dffx', often.
> I guess if you do it, you will also find this problem.

It will entirely depend on whether you attempt to compile it on an 8th
or 9th of a month, or in August or September.  Outside of that that
window, the resulting number will parse correctly and not fail to compile.

For the fix itself, Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH] hvmloader: fix building error

[Wen Congyang]

On 04/08/2015 04:46 PM, Andrew Cooper wrote:
> On 08/04/15 08:33, Wen Congyang wrote:
>> On 04/08/2015 03:28 PM, Olaf Hering wrote:
>>> On Wed, Apr 08, Wen Congyang wrote:
>>>
>>>> On 04/08/2015 03:21 PM, Olaf Hering wrote:
>>>>> On Wed, Apr 08, Wen Congyang wrote:
>>>>>
>>>>>> commit b9245b75 introduces a building error:
>>>>>> make[1]: Entering directory `/root/work/xen/tools/firmware/hvmloader'
>>>>>> gcc   -O1 -fno-omit-frame-pointer -m32 -march=i686 -g -fno-strict-aliasing -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement   -O0 -g3 -D__XEN_TOOLS__ -MMD -MF .smbios.o.d -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -fno-optimize-sibling-calls -mno-tls-direct-seg-refs  -Werror -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float -I/root/work/xen/tools/firmware/hvmloader/../../../tools/include -DENABLE_ROMBIOS -DENABLE_SEABIOS -D__SMBIOS_DATE__="04/08/2015"  -c -o smbios.o smbios.c
>>>>>> smbios.c:384:46: error: invalid digit "8" in octal constant
>>>>>> smbios.c:792:46: error: invalid digit "8" in octal constant
>>>>>> make[1]: *** [smbios.o] Error 1
>>>>> Oh, I did not spot that because in my builds the octal number was always
>>>>> valid. But you are right, it has to be a string constant.
>>>> Do you run 'make -C tools/ clean' before building?
>>> No, I dont. I do 'git clean -dffx', often.
>> I guess if you do it, you will also find this problem.
> 
> It will entirely depend on whether you attempt to compile it on an 8th
> or 9th of a month, or in August or September.  Outside of that that
> window, the resulting number will parse correctly and not fail to compile.

Yes, outside of that window, the problem is hidden.

> 
> For the fix itself, Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
> .
> 

Re: [PATCH] hvmloader: fix building error

[Ian Jackson]

Wen Congyang writes ("[Xen-devel] [PATCH] hvmloader: fix building error"):
> commit b9245b75 introduces a building error:
...
> smbios.c:384:46: error: invalid digit "8" in octal constant
> smbios.c:792:46: error: invalid digit "8" in octal constant
> make[1]: *** [smbios.o] Error 1

Thanks for this fix,

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

(CC'ing Andrew Cooper who also requested this fix and Jan Beulich who
acked and committed b9245b75.)

Ian.

Re: [PATCH] hvmloader: fix building error

[Andrew Cooper]

On 08/04/15 11:46, Ian Jackson wrote:
> Wen Congyang writes ("[Xen-devel] [PATCH] hvmloader: fix building error"):
>> commit b9245b75 introduces a building error:
> ...
>> smbios.c:384:46: error: invalid digit "8" in octal constant
>> smbios.c:792:46: error: invalid digit "8" in octal constant
>> make[1]: *** [smbios.o] Error 1
> Thanks for this fix,
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
>
> (CC'ing Andrew Cooper who also requested this fix and Jan Beulich who
> acked and committed b9245b75.)

There is an acked-by me on the bottom of the thread.

~Andrew