Re: [PATCH v3 06/32] libxc: make arch_setup_boot{init/late} xc_dom_arch hooks

[Andrew Cooper <andrew.cooper3@citrix.com>]

On 03/07/15 12:34, Roger Pau Monne wrote:
> diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c
> index 6fb4aee..993954e 100644
> --- a/tools/libxc/xc_dom_x86.c
> +++ b/tools/libxc/xc_dom_x86.c
> @@ -926,41 +926,7 @@ static int meminit_pv(struct xc_dom_image *dom)
>  
>  /* ------------------------------------------------------------------------ */
>  
> -static struct xc_dom_arch xc_dom_32_pae = {
> -    .guest_type = "xen-3.0-x86_32p",
> -    .native_protocol = XEN_IO_PROTO_ABI_X86_32,
> -    .page_shift = PAGE_SHIFT_X86,
> -    .sizeof_pfn = 4,
> -    .alloc_magic_pages = alloc_magic_pages,
> -    .count_pgtables = count_pgtables_x86_32_pae,
> -    .setup_pgtables = setup_pgtables_x86_32_pae,
> -    .start_info = start_info_x86_32,
> -    .shared_info = shared_info_x86_32,
> -    .vcpu = vcpu_x86_32,
> -    .meminit = meminit_pv,
> -};
> -
> -static struct xc_dom_arch xc_dom_64 = {
> -    .guest_type = "xen-3.0-x86_64",
> -    .native_protocol = XEN_IO_PROTO_ABI_X86_64,
> -    .page_shift = PAGE_SHIFT_X86,
> -    .sizeof_pfn = 8,
> -    .alloc_magic_pages = alloc_magic_pages,
> -    .count_pgtables = count_pgtables_x86_64,
> -    .setup_pgtables = setup_pgtables_x86_64,
> -    .start_info = start_info_x86_64,
> -    .shared_info = shared_info_x86_64,
> -    .vcpu = vcpu_x86_64,
> -    .meminit = meminit_pv,
> -};
> -
> -static void __init register_arch_hooks(void)
> -{
> -    xc_dom_register_arch_hooks(&xc_dom_32_pae);
> -    xc_dom_register_arch_hooks(&xc_dom_64);
> -}

Instead of moving this lot twice in two consecutive patches, have patch
5 move them to their eventual location, which makes this patch much smaller.

Otherwise, Reviewed-by: Andrew Cooper <andrew.cooper@citrix.com>