From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37523 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pke2Y-00040h-0T for qemu-devel@nongnu.org; Wed, 02 Feb 2011 09:50:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pke2E-0006TK-Tb for qemu-devel@nongnu.org; Wed, 02 Feb 2011 09:50:35 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:22831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pke2E-0006Qb-QF for qemu-devel@nongnu.org; Wed, 02 Feb 2011 09:50:18 -0500 From: anthony.perard@citrix.com Date: Wed, 2 Feb 2011 14:49:32 +0000 Message-Id: <1296658172-16609-16-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1296658172-16609-1-git-send-email-anthony.perard@citrix.com> References: <1296658172-16609-1-git-send-email-anthony.perard@citrix.com> Subject: [Qemu-devel] [PATCH V10 15/15] xen: Add Xen hypercall for sleep state in the cmos_s3 callback. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Cc: Anthony PERARD , Xen Devel , Stefano Stabellini From: Anthony PERARD Signed-off-by: Anthony PERARD --- hw/pc_piix.c | 6 +++++- hw/xen.h | 1 + xen-all.c | 9 +++++++++ xen-stub.c | 4 ++++ 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 27d9030..f86873d 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -176,7 +176,11 @@ static void pc_init1(ram_addr_t ram_size, uint8_t *eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */ i2c_bus *smbus; - cmos_s3 = qemu_allocate_irqs(pc_cmos_set_s3_resume, rtc_state, 1); + if (!xen_enabled()) { + cmos_s3 = qemu_allocate_irqs(pc_cmos_set_s3_resume, rtc_state, 1); + } else { + cmos_s3 = qemu_allocate_irqs(xen_cmos_set_s3_resume, rtc_state, 1); + } smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1); /* TODO: Populate SPD eeprom data. */ smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, diff --git a/hw/xen.h b/hw/xen.h index a67b5bd..5bcbd6f 100644 --- a/hw/xen.h +++ b/hw/xen.h @@ -43,6 +43,7 @@ static inline int xen_mapcache_enabled(void) int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num); void xen_piix3_set_irq(void *opaque, int irq_num, int level); void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len); +void xen_cmos_set_s3_resume(void *opaque, int irq, int level); qemu_irq *xen_interrupt_controller_init(void); diff --git a/xen-all.c b/xen-all.c index 5892bd8..4eb53b3 100644 --- a/xen-all.c +++ b/xen-all.c @@ -11,6 +11,7 @@ #include #include "hw/pci.h" +#include "hw/pc.h" #include "hw/xen_common.h" #include "hw/xen_backend.h" @@ -92,6 +93,14 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) } } +void xen_cmos_set_s3_resume(void *opaque, int irq, int level) +{ + pc_cmos_set_s3_resume(opaque, irq, level); + if (level) { + xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 3); + } +} + /* Xen Interrupt Controller */ static void xen_set_irq(void *opaque, int irq, int level) diff --git a/xen-stub.c b/xen-stub.c index 86486f8..0d2a663 100644 --- a/xen-stub.c +++ b/xen-stub.c @@ -24,6 +24,10 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len) { } +void xen_cmos_set_s3_resume(void *opaque, int irq, int level) +{ +} + void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size) { } -- 1.7.1