← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty

« back to all changes in this revision

Viewing changes to src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c
1
 
/* $Id: VBoxAppleSim.c $ */
 
1
/* $Id: VBoxAppleSim.c 34047 2010-11-12 20:30:05Z vboxsync $ */
2
2
/** @file
3
3
 * VBoxAppleSim.c - VirtualBox Apple Firmware simulation support
4
4
 */
214
214
 
215
215
     //static const CHAR8  vBootArgs[]      = "debug=0x15e keepsyms=1 acpi=0xffffffff acpi_debug=0xff acpi_level=7 -v -x32 -s"; // or just "debug=0x8 -legacy"
216
216
     // 0x14e for serial output
217
 
     static const CHAR8  vDefBootArgs[]      = "debug=0x146 keepsyms=1 -v -serial=0x1";
 
217
     //static const CHAR8  vDefBootArgs[]      = "debug=0x146 keepsyms=1 -v -serial=0x1";
 
218
     static const CHAR8  vDefBootArgs[]      = "keepsyms=1 -v -serial=0x1";
218
219
     CHAR8  vBootArgs[256];
219
220
     UINT32 BootArgsLen;
220
221