| Message ID | 20200917154048.1140580-4-hudson@trmm.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | efi: Unified Xen hypervisor/kernel/initrd images | expand |
On 17.09.2020 17:40, Trammell Hudson wrote: > Add a separate function to display the address ranges used by > the files and call `efi_arch_handle_module()` on the modules. > > Signed-off-by: Trammell Hudson <hudson@trmm.net> You've lost the ack I gave, and ... > --- a/xen/common/efi/boot.c > +++ b/xen/common/efi/boot.c > @@ -540,6 +540,22 @@ static char * __init split_string(char *s) > return NULL; > } > > +static void __init handle_file_info(CHAR16 *name, > + const struct file *file, const char *options) ... with the const added here you ought to mention (in a post- description remark perhaps) that this now depends on a not yet applied patch on the list). Remember that reviewers and committer may be different people, and even if the committer participated in review, (s)he may have forgotten by the time a patch is otherwise ready to go in. And btw - briefly mentioning what changes you made compared to the previous version (again in a post-description remark) helps reviews quite a bit. Jan
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 77530a0595..e0280f7a21 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -540,6 +540,22 @@ static char * __init split_string(char *s) return NULL; } +static void __init handle_file_info(CHAR16 *name, + const struct file *file, const char *options) +{ + if ( file == &cfg ) + return; + + PrintStr(name); + PrintStr(L": "); + DisplayUint(file->addr, 2 * sizeof(file->addr)); + PrintStr(L"-"); + DisplayUint(file->addr + file->size, 2 * sizeof(file->addr)); + PrintStr(newline); + + efi_arch_handle_module(file, name, options); +} + static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, struct file *file, const char *options) { @@ -584,16 +600,7 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, else { file->size = size; - if ( file != &cfg ) - { - PrintStr(name); - PrintStr(L": "); - DisplayUint(file->addr, 2 * sizeof(file->addr)); - PrintStr(L"-"); - DisplayUint(file->addr + size, 2 * sizeof(file->addr)); - PrintStr(newline); - efi_arch_handle_module(file, name, options); - } + handle_file_info(name, file, options); ret = FileHandle->Read(FileHandle, &file->size, file->str); if ( !EFI_ERROR(ret) && file->size != size )
Add a separate function to display the address ranges used by the files and call `efi_arch_handle_module()` on the modules. Signed-off-by: Trammell Hudson <hudson@trmm.net> --- xen/common/efi/boot.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)