Change in ...coreboot[master]: util/sconfig: Throw an error if override tree has no devices

List overview All Threads
Download

newer

older

Change in ...coreboot[master]:...

Furquan Shaikh (Code Review)

11 Apr 2019 11 Apr '19

10:46 p.m.

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32289

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

util/sconfig: Throw an error if override tree has no devices

If override tree does not have any device, then the chip info structure in it cannot be associated with the correct device and ends up being added as a standalone chip info structure without any device actually using it. This change prevents this condition by throwing an error during compilation.

BUG=b:130342895

Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Signed-off-by: Furquan Shaikh furquan@google.com --- M util/sconfig/main.c 1 file changed, 5 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/32289/1

diff --git a/util/sconfig/main.c b/util/sconfig/main.c index 4ac935e..5382f47 100644 --- a/util/sconfig/main.c +++ b/util/sconfig/main.c @@ -1316,6 +1316,11 @@ override_devtree = argv[OVERRIDE_DEVICEFILE_ARG]; parse_devicetree(override_devtree, &override_root_bus);

+ if (!dev_has_children(&override_root_dev)) { + fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); + exit(1); + } + override_devicetree(&base_root_bus, &override_root_bus); }

Attachments:

attachment.htm (text/html — 2.9 KB)

Show replies by date

build bot (Jenkins) (Code Review)

11 Apr 11 Apr

10:46 p.m.

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/#/c/32289/1/util/sconfig/main.c File util/sconfig/main.c:

https://review.coreboot.org/#/c/32289/1/util/sconfig/main.c@1320 PS1, Line 1320: fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); line over 80 characters

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 1 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-CC: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Thu, 11 Apr 2019 22:46:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

build bot (Jenkins) (Code Review)

10:47 p.m.

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/32289/2/util/sconfig/main.c File util/sconfig/main.c:

https://review.coreboot.org/#/c/32289/2/util/sconfig/main.c@1320 PS2, Line 1320: fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); line over 80 characters

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 2 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Thu, 11 Apr 2019 22:47:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Aaron Durbin (Code Review)

16 Apr 16 Apr

2:35 p.m.

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

Patch Set 2: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 2 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Shelley Chen shchen@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 16 Apr 2019 14:35:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

build bot (Jenkins) (Code Review)

23 Apr 23 Apr

6:47 a.m.

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/32289/3/util/sconfig/main.c File util/sconfig/main.c:

https://review.coreboot.org/#/c/32289/3/util/sconfig/main.c@1320 PS3, Line 1320: fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); line over 80 characters

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 3 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Shelley Chen shchen@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 23 Apr 2019 06:47:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Furquan Shaikh (Code Review)

6:47 a.m.

Hello Aaron Durbin, Shelley Chen, build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/32289

to look at the new patch set (#4).

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

util/sconfig: Throw an error if override tree has no devices

BUG=b:130342895

Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Signed-off-by: Furquan Shaikh furquan@google.com --- M util/sconfig/main.c 1 file changed, 5 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/32289/4

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 4 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Shelley Chen shchen@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

build bot (Jenkins) (Code Review)

6:48 a.m.

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/#/c/32289/4/util/sconfig/main.c File util/sconfig/main.c:

https://review.coreboot.org/#/c/32289/4/util/sconfig/main.c@1320 PS4, Line 1320: fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); line over 80 characters

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 4 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Shelley Chen shchen@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 23 Apr 2019 06:48:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Duncan Laurie (Code Review)

24 Apr 24 Apr

3:54 p.m.

Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

Patch Set 4: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 4 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Shelley Chen shchen@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 24 Apr 2019 15:54:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Furquan Shaikh (Code Review)

4:23 p.m.

Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32289 )

Change subject: util/sconfig: Throw an error if override tree has no devices ......................................................................

util/sconfig: Throw an error if override tree has no devices

BUG=b:130342895

Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Signed-off-by: Furquan Shaikh furquan@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32289 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Duncan Laurie dlaurie@chromium.org Reviewed-by: Aaron Durbin adurbin@chromium.org --- M util/sconfig/main.c 1 file changed, 5 insertions(+), 0 deletions(-)

Approvals: build bot (Jenkins): Verified Duncan Laurie: Looks good to me, approved Aaron Durbin: Looks good to me, approved

+ if (!dev_has_children(&override_root_dev)) { + fprintf(stderr, "ERROR: Override tree needs at least one device!\n"); + exit(1); + } + override_devicetree(&base_root_bus, &override_root_bus); }

-- To view, visit https://review.coreboot.org/c/coreboot/+/32289 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7b8bb6b3228030a465976ca32ce8ef63f41365dd Gerrit-Change-Number: 32289 Gerrit-PatchSet: 5 Gerrit-Owner: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Duncan Laurie dlaurie@chromium.org Gerrit-Reviewer: Furquan Shaikh furquan@google.com Gerrit-Reviewer: Martin Roth martinroth@google.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Shelley Chen shchen@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: merged

2045

days inactive

2058

days old

coreboot-gerrit@coreboot.org

8 comments

4 participants

tags (0)

participants (4)

Aaron Durbin (Code Review)
build bot (Jenkins) (Code Review)
Duncan Laurie (Code Review)
Furquan Shaikh (Code Review)