← Back to branch summary

~fboudra/qemu-linaro/new-upstream-release-1.2.0-2012.09-0ubuntu1

« back to all changes in this revision

Viewing changes to hw/acpi.c

  • Committer: Fathi Boudra
  • Author(s): Fathi Boudra
  • Date: 2012-08-21 06:47:11 UTC
  • mfrom: (0.1.16)
  • Revision ID: fathi.boudra@linaro.org-20120821064711-7yxmubp2v8a44xce
Tags: 1.1.50-2012.08-0ubuntu1
https://launchpad.net/bugs/1030588
https://launchpad.net/bugs/1030594
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control: 
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/acpi.c
370
370
    qemu_register_wakeup_notifier(&ar->wakeup);
371
371
}
372
372
 
373
 
void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val)
 
373
void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val, char s4)
374
374
{
375
375
    ar->pm1.cnt.cnt = val & ~(ACPI_BITMASK_SLEEP_ENABLE);
376
376
 
385
385
            qemu_system_suspend_request();
386
386
            break;
387
387
        default:
 
388
            if (sus_typ == s4) { /* S4 request */
 
389
                qemu_system_shutdown_request();
 
390
            }
388
391
            break;
389
392
        }
390
393
    }