← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kvm/hardy-backports

« back to all changes in this revision

Viewing changes to qemu/hw/pc.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-01-03 10:39:25 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20080103103925-8480u7sq2646hvbh
Tags: 1:59+dfsg-0ubuntu1
* New upstream release
* Build with alsa support (cherry pick from 57+dfsg-2)

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu/hw/pc.c
857
857
        isa_bios_size = 128 * 1024;
858
858
    cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size,
859
859
                                 IO_MEM_UNASSIGNED);
 
860
    /* kvm tpr optimization needs the bios accessible for write, at least to qemu itself */
860
861
    cpu_register_physical_memory(0x100000 - isa_bios_size,
861
862
                                 isa_bios_size,
862
 
                                 (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
 
863
                                 (bios_offset + bios_size - isa_bios_size) /* | IO_MEM_ROM */);
863
864
#ifdef USE_KVM
864
865
    if (kvm_allowed)
865
866
        kvm_cpu_register_physical_memory(0x100000 - isa_bios_size,
866
867
                                         isa_bios_size,
867
 
                                         (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
 
868
                                         (bios_offset + bios_size - isa_bios_size)
 
869
                                         /* | IO_MEM_ROM */);
868
870
#endif
869
871
 
870
872