@@ -364,11 +364,6 @@ static const struct hvm_mmcfg *vpci_mmcfg_find(const struct domain *d,
return NULL;
}
-bool vpci_is_mmcfg_address(const struct domain *d, paddr_t addr)
-{
- return vpci_mmcfg_find(d, addr);
-}
-
int __hwdom_init vpci_subtract_mmcfg(const struct domain *d, struct rangeset *r)
{
const struct hvm_mmcfg *mmcfg;
@@ -153,9 +153,6 @@ int register_vpci_mmcfg_handler(struct domain *d, paddr_t addr,
/* Destroy tracked MMCFG areas. */
void destroy_vpci_mmcfg(struct domain *d);
-/* Check if an address is between a MMCFG region for a domain. */
-bool vpci_is_mmcfg_address(const struct domain *d, paddr_t addr);
-
/* Remove MMCFG regions from a given rangeset. */
int vpci_subtract_mmcfg(const struct domain *d, struct rangeset *r);
@@ -36,7 +36,6 @@ unsigned long initial_images_nrpages(nodeid_t node);
void discard_initial_images(void);
void *bootstrap_map(const module_t *mod);
-int xen_in_range(unsigned long mfn);
int remove_xen_ranges(struct rangeset *r);
extern uint8_t kbd_shift_flags;
@@ -1343,7 +1343,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
relocated = true;
/*
- * This needs to remain in sync with xen_in_range() and the
+ * This needs to remain in sync with remove_xen_ranges() and the
* respective reserve_e820_ram() invocation below. No need to
* query efi_boot_mem_unused() here, though.
*/
@@ -1495,7 +1495,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
if ( using_2M_mapping() )
efi_boot_mem_unused(NULL, NULL);
- /* This needs to remain in sync with xen_in_range(). */
+ /* This needs to remain in sync with remove_xen_ranges(). */
if ( efi_boot_mem_unused(&eb_start, &eb_end) )
{
reserve_e820_ram(&boot_e820, __pa(_stext), __pa(eb_start));
@@ -2087,55 +2087,6 @@ void arch_get_xen_caps(xen_capabilities_info_t *info)
}
}
-int __hwdom_init xen_in_range(unsigned long mfn)
-{
- paddr_t start, end;
- int i;
-
- enum { region_s3, region_ro, region_rw, region_bss, nr_regions };
- static struct {
- paddr_t s, e;
- } xen_regions[nr_regions] __hwdom_initdata;
-
- /* initialize first time */
- if ( !xen_regions[0].s )
- {
- /* S3 resume code (and other real mode trampoline code) */
- xen_regions[region_s3].s = bootsym_phys(trampoline_start);
- xen_regions[region_s3].e = bootsym_phys(trampoline_end);
-
- /*
- * This needs to remain in sync with the uses of the same symbols in
- * - __start_xen() (above)
- * - is_xen_fixed_mfn()
- * - tboot_shutdown()
- */
-
- /* hypervisor .text + .rodata */
- xen_regions[region_ro].s = __pa(&_stext);
- xen_regions[region_ro].e = __pa(&__2M_rodata_end);
- /* hypervisor .data + .bss */
- xen_regions[region_rw].s = __pa(&__2M_rwdata_start);
- xen_regions[region_rw].e = __pa(&__2M_rwdata_end);
- if ( efi_boot_mem_unused(&start, &end) )
- {
- ASSERT(__pa(start) >= xen_regions[region_rw].s);
- ASSERT(__pa(end) <= xen_regions[region_rw].e);
- xen_regions[region_rw].e = __pa(start);
- xen_regions[region_bss].s = __pa(end);
- xen_regions[region_bss].e = __pa(&__2M_rwdata_end);
- }
- }
-
- start = (paddr_t)mfn << PAGE_SHIFT;
- end = start + PAGE_SIZE;
- for ( i = 0; i < nr_regions; i++ )
- if ( (start < xen_regions[i].e) && (end > xen_regions[i].s) )
- return 1;
-
- return 0;
-}
-
int __hwdom_init remove_xen_ranges(struct rangeset *r)
{
paddr_t start, end;
@@ -321,7 +321,7 @@ void tboot_shutdown(uint32_t shutdown_type)
/*
* Xen regions for tboot to MAC. This needs to remain in sync with
- * xen_in_range().
+ * remove_xen_ranges().
*/
g_tboot_shared->num_mac_regions = 3;
/* S3 resume code (and other real mode trampoline code) */
Remove xen_in_range() and vpci_is_mmcfg_address() now that hey are unused. Adjust comments to point to the new functions that replace the existing ones. No functional change. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- Changes since v2: - Do remove vpci_is_mmcfg_address(). --- Can be squashed with the previous patch if desired, split as a separate patch for clarity. --- xen/arch/x86/hvm/io.c | 5 --- xen/arch/x86/include/asm/hvm/io.h | 3 -- xen/arch/x86/include/asm/setup.h | 1 - xen/arch/x86/setup.c | 53 ++----------------------------- xen/arch/x86/tboot.c | 2 +- 5 files changed, 3 insertions(+), 61 deletions(-)