summaryrefslogtreecommitdiff
path: root/hw/acpi
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-05-14 14:29:04 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-14 08:53:09 -0500
commit2d3b989529727ccace243b953a181fbae04a30d1 (patch)
tree2de1cc820daa7161bea89a4f8a591c118cc1ee8a /hw/acpi
parent035873283b3f7514ad77d409870ccfd5f9680d9e (diff)
downloadqemu-2d3b989529727ccace243b953a181fbae04a30d1.tar.gz
acpi: add dummy write function for acpi timer
Otherwise the guest can crash qemu (NULL pointer dereference). https://bugzilla.redhat.com/show_bug.cgi?id=947691 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Message-id: 1368534544-11826-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/acpi')
-rw-r--r--hw/acpi/core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 64b871846d..42eeace6f6 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -462,8 +462,15 @@ static uint64_t acpi_pm_tmr_read(void *opaque, hwaddr addr, unsigned width)
return acpi_pm_tmr_get(opaque);
}
+static void acpi_pm_tmr_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned width)
+{
+ /* nothing */
+}
+
static const MemoryRegionOps acpi_pm_tmr_ops = {
.read = acpi_pm_tmr_read,
+ .write = acpi_pm_tmr_write,
.valid.min_access_size = 4,
.valid.max_access_size = 4,
.endianness = DEVICE_LITTLE_ENDIAN,