← Back to branch summary

~ressu/+junk/xen-debian

« back to all changes in this revision

Viewing changes to xen/arch/x86/hvm/stdvga.c

  • Committer: sami at haahtinen
  • Author(s): Bastian Blank
  • Date: 2011-03-17 14:12:45 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: sami@haahtinen.name-20110317141245-owgqox0l0p3g5857
Tags: 4.1.0~rc6-1
http://bugs.debian.org/596545
* New upstream release candidate.
* Build documentation using pdflatex.
* Use python 2.6. (closes: #596545)
* Fix lintian override.
* Install new tools: xl, xenpaging.
* Enable blktap2.
  - Use own md5 implementation.
  - Fix includes.
  - Fix linking of blktap2 binaries.
  - Remove optimization setting.
* Temporarily disable hvmloader, wants to download ipxe.
* Remove xenstored pid check from xl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xen/arch/x86/hvm/stdvga.c
469
469
    int i;
470
470
    int sign = p->df ? -1 : 1;
471
471
    p2m_type_t p2mt;
 
472
    struct p2m_domain *p2m = p2m_get_hostp2m(current->domain);
472
473
 
473
474
    if ( p->data_is_ptr )
474
475
    {
481
482
                if ( hvm_copy_to_guest_phys(data, &tmp, p->size) !=
482
483
                     HVMCOPY_okay )
483
484
                {
484
 
                    (void)gfn_to_mfn_current(data >> PAGE_SHIFT, &p2mt);
 
485
                    (void)gfn_to_mfn(p2m, data >> PAGE_SHIFT, &p2mt);
485
486
                    /*
486
487
                     * The only case we handle is vga_mem <-> vga_mem.
487
488
                     * Anything else disables caching and leaves it to qemu-dm.
503
504
                if ( hvm_copy_from_guest_phys(&tmp, data, p->size) !=
504
505
                     HVMCOPY_okay )
505
506
                {
506
 
                    (void)gfn_to_mfn_current(data >> PAGE_SHIFT, &p2mt);
 
507
                    (void)gfn_to_mfn(p2m, data >> PAGE_SHIFT, &p2mt);
507
508
                    if ( (p2mt != p2m_mmio_dm) || (data < VGA_MEM_BASE) ||
508
509
                         ((data + p->size) > (VGA_MEM_BASE + VGA_MEM_SIZE)) )
509
510
                        return 0;