← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2013-03-31 23:25:01 UTC
  • mfrom: (1.1.14)
  • Revision ID: package-import@ubuntu.com-20130331232501-l72jhvixkeyyz6xc
Tags: 4.2.10-dfsg-0ubuntu1
http://bugs.debian.org/703358
* Start the virtualbox-guest-x11 init script earlier.
  The vboxvideo module needs to be loaded before X starts.
* Change runlevels of virtualbox-guest-x11 init script on upgrade.
* Fix build failure with the Debian wheezy kernel which backports the drm
  subsystem from Linux 3.4. (Closes: #703358)
* Drop build-dependency on bcc as it's not needed anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm
911
911
 
912
912
section CONST2 progbits vstart=0xcc6 align=1 ; size=0x3fa class=DATA group=DGROUP
913
913
_bios_cvs_version_string:                    ; 0xf0cc6 LB 0x12
914
 
    db  'VirtualBox 4.2.8', 000h, 000h
 
914
    db  'VirtualBox 4.2.10', 000h
915
915
_bios_prefix_string:                         ; 0xf0cd8 LB 0x8
916
916
    db  'BIOS: ', 000h, 000h
917
917
_isotag:                                     ; 0xf0ce0 LB 0x6
15149
15149
    db  'XM'
15150
15150
cpu_reset:                                   ; 0xffff0 LB 0x10
15151
15151
    jmp far 0f000h:0e05bh                     ; ea 5b e0 00 f0
15152
 
    db  030h, 036h, 02fh, 032h, 033h, 02fh, 039h, 039h, 000h, 0fch, 0efh
 
15152
    db  030h, 036h, 02fh, 032h, 033h, 02fh, 039h, 039h, 000h, 0fch, 0c6h