diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-30 17:14:10 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-30 17:14:10 -0500 |
| commit | 3469a60d9f6f7ba6fca3fe0788391f7285ead631 (patch) | |
| tree | 460bb059eb31a09f6610e7ea3db8685a36953d44 /hw | |
| parent | 28b9d47db61a96d2630c7ffa6cbfdcdd1536f7cb (diff) | |
| parent | 594278d9f251222675f1c24f5fbb1b05560b8711 (diff) | |
| download | qemu-3469a60d9f6f7ba6fca3fe0788391f7285ead631.tar.gz | |
Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging
# By Anthony PERARD (2) and Liu, Jinsong (2)
# Via Stefano Stabellini
* sstabellini/xen-2013-09-25:
xen: Enable cpu-hotplug on xenfv machine.
xen: Fix vcpu initialization.
qemu: Add qemu xen logic for Xen HVM S3 resume
qemu: Adjust qemu wakeup
Message-id: alpine.DEB.2.02.1309251749180.5498@kaball.uk.xensource.com
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/core.c | 3 | ||||
| -rw-r--r-- | hw/i386/pc_piix.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 7467b88e27..7138139d32 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -324,12 +324,13 @@ static void acpi_notify_wakeup(Notifier *notifier, void *data) (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_TIMER_STATUS); break; case QEMU_WAKEUP_REASON_OTHER: - default: /* ACPI_BITMASK_WAKE_STATUS should be set on resume. Pretend that resume was caused by power button */ ar->pm1.evt.sts |= (ACPI_BITMASK_WAKE_STATUS | ACPI_BITMASK_POWER_BUTTON_STATUS); break; + default: + break; } } diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 907792b721..c6042c7e23 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -741,6 +741,7 @@ static QEMUMachine xenfv_machine = { .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", + .hot_add_cpu = pc_hot_add_cpu, }; #endif |