lkml.org 
[lkml]   [2011]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH R4 2/7] xen/balloon: HVM mode support
    HVM mode support.

    Signed-off-by: Daniel Kiper <dkiper@net-space.pl>
    ---
    drivers/xen/balloon.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
    index b4206fd..952cfe2 100644
    --- a/drivers/xen/balloon.c
    +++ b/drivers/xen/balloon.c
    @@ -227,7 +227,7 @@ static int increase_reservation(unsigned long nr_pages)
    set_phys_to_machine(pfn, frame_list[i]);

    /* Link back into the page tables if not highmem. */
    - if (pfn < max_low_pfn) {
    + if (xen_pv_domain() && !PageHighMem(page)) {
    int ret;
    ret = HYPERVISOR_update_va_mapping(
    (unsigned long)__va(pfn << PAGE_SHIFT),
    @@ -275,7 +275,7 @@ static int decrease_reservation(unsigned long nr_pages)

    scrub_page(page);

    - if (!PageHighMem(page)) {
    + if (xen_pv_domain() && !PageHighMem(page)) {
    ret = HYPERVISOR_update_va_mapping(
    (unsigned long)__va(pfn << PAGE_SHIFT),
    __pte_ma(0), 0);
    @@ -390,12 +390,12 @@ static int __init balloon_init(void)
    unsigned long pfn, extra_pfn_end;
    struct page *page;

    - if (!xen_pv_domain())
    + if (!xen_domain())
    return -ENODEV;

    pr_info("xen_balloon: Initialising balloon driver.\n");

    - balloon_stats.current_pages = min(xen_start_info->nr_pages, max_pfn);
    + balloon_stats.current_pages = xen_pv_domain() ? min(xen_start_info->nr_pages, max_pfn) : max_pfn;
    balloon_stats.target_pages = balloon_stats.current_pages;
    balloon_stats.balloon_low = 0;
    balloon_stats.balloon_high = 0;
    --
    1.5.6.5

    \
     
     \ /
      Last update: 2011-03-08 22:49    [W:0.043 / U:0.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site