set up multiboot information structure #23
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fabianfreyer
force-pushed
the
multiboot/info
branch
from
d17091e to
de30786
Compare
Codecov Report
@@ Coverage Diff @@
## master #23 +/- ##
==========================================
- Coverage 73.78% 71.01% -2.78%
==========================================
Files 4 4
Lines 618 790 +172
==========================================
+ Hits 456 561 +105
- Misses 162 229 +67
Continue to review full report at Codecov.
|
fabianfreyer
force-pushed
the
multiboot/info
branch
3 times, most recently
from
b2451ba to
2104248
Compare
fabianfreyer
commented
Feb 20, 2018
loader.c
Outdated
| @@ -122,6 +127,11 @@ loader_main(struct loader_callbacks *cb, void *arg, int version, int ndisks) | |||
| if (multiboot_load(kernel, kernsz, mb)) { | |||
| goto error; | |||
| } | |||
|
|
|||
| if (multiboot_info_set_cmdline(&mb->info, loader_args.cmdline)) { | |||
There was a problem hiding this comment.
This should really only be called if loader_args.cmdline is set, otherwise we segfault here, as it is initialized to NULL.
fabianfreyer
force-pushed
the
multiboot/info
branch
8 times, most recently
from
20d1f82 to
93e27b0
Compare
info should be the multiboot info structure, rename this to avoid a later name collision.
instead, use the one from the struct multiboot context variable.
fabianfreyer
force-pushed
the
multiboot/info
branch
from
6199e2c to
f4384ac
Compare
Memory information is given in kiB in the multiboot information structure, but multiboot_info_set_mmap used these values as bytes.
fabianfreyer
force-pushed
the
multiboot/info
branch
from
024f886 to
83eed4e
Compare
also fix an off-by-one error caught by this test
fabianfreyer
force-pushed
the
multiboot/info
branch
from
6a2a1c0 to
aa7b4eb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4