[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [PATCH v2 04/18] xen: prepare common code for Xen PVH support
- To: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
- From: Juergen Gross <jgross@xxxxxxxx>
- Date: Thu, 18 Oct 2018 17:39:21 +0200
- Autocrypt: addr=jgross@xxxxxxxx; prefer-encrypt=mutual; keydata= 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
- Cc: hans@xxxxxxxxxxx, grub-devel@xxxxxxx, phcoder@xxxxxxxxx, xen-devel@xxxxxxxxxxxxx
- Delivery-date: Thu, 18 Oct 2018 15:39:34 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Openpgp: preference=signencrypt
On 18/10/2018 16:59, Daniel Kiper wrote:
> On Tue, Oct 09, 2018 at 01:03:03PM +0200, Juergen Gross wrote:
>> Some common code needs to be special cased for Xen PVH mode. This hits
>> mostly Xen PV mode specific areas.
>>
>> Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
>> ---
>> grub-core/kern/i386/tsc.c | 2 +-
>> include/grub/i386/pc/int.h | 3 +++
>> include/grub/i386/tsc.h | 2 +-
>> include/grub/i386/xen/hypercall.h | 5 ++++-
>> include/grub/kernel.h | 4 +++-
>> 5 files changed, 12 insertions(+), 4 deletions(-)
>>
>> diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
>> index f266eb131..43fee3a13 100644
>> --- a/grub-core/kern/i386/tsc.c
>> +++ b/grub-core/kern/i386/tsc.c
>> @@ -65,7 +65,7 @@ grub_tsc_init (void)
>>
>> tsc_boot_time = grub_get_tsc ();
>>
>> -#ifdef GRUB_MACHINE_XEN
>> +#if defined (GRUB_MACHINE_XEN) || defined (GRUB_MACHINE_XENPVH)
>
> s/GRUB_MACHINE_XENPVH/GRUB_MACHINE_XEN_PVH/
Okay.
>
>> (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode());
>> #elif defined (GRUB_MACHINE_EFI)
>> (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit
>> () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
>> diff --git a/include/grub/i386/pc/int.h b/include/grub/i386/pc/int.h
>> index 16a53e4fe..46fb1e397 100644
>> --- a/include/grub/i386/pc/int.h
>> +++ b/include/grub/i386/pc/int.h
>> @@ -51,9 +51,12 @@ struct grub_bios_int_registers
>> #define GRUB_CPU_INT_FLAGS_DEFAULT 0
>> #endif
>>
>> +#ifndef GRUB_MACHINE_XENPVH
>> void EXPORT_FUNC (grub_bios_interrupt) (grub_uint8_t intno,
>> struct grub_bios_int_registers *regs)
>> __attribute__ ((regparm(3)));
>> +#endif
>
> Is it an issue with this declaration? I think that you should take care
> about grub-core/kern/i386/int.S. So, relevant Makefile should be
> updated instead of this declaration.
I'll have a try. I just remember I struggled a lot with this issue
when writing the patches.
Juergen
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
