From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf03C-0003QX-D0 for qemu-devel@nongnu.org; Tue, 21 May 2013 23:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uf037-00017y-KW for qemu-devel@nongnu.org; Tue, 21 May 2013 23:49:18 -0400 Received: from [222.73.24.84] (port=11978 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uf037-00010i-9P for qemu-devel@nongnu.org; Tue, 21 May 2013 23:49:13 -0400 From: liguang Date: Wed, 22 May 2013 11:46:35 +0800 Message-Id: <1369194397-608-3-git-send-email-lig.fnst@cn.fujitsu.com> In-Reply-To: <1369194397-608-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1369194397-608-1-git-send-email-lig.fnst@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH 2/4] acpi/gpe: expand bits of gpe register List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Stefan Berger , "Michael S. Tsirkin" , Bruce Rogers , Joel Schopp , Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , liguang , Isaku Yamahata Signed-off-by: liguang --- hw/acpi/core.c | 8 ++++---- hw/acpi/ich9.c | 2 +- hw/acpi/piix4.c | 2 +- include/hw/acpi/acpi.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 42eeace..38ddeb8 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -575,9 +575,9 @@ void acpi_gpe_reset(ACPIREGS *ar) memset(ar->gpe.en, 0, ar->gpe.len / 2); } -static uint8_t *acpi_gpe_ioport_get_ptr(ACPIREGS *ar, uint32_t addr) +static uint32_t *acpi_gpe_ioport_get_ptr(ACPIREGS *ar, uint32_t addr) { - uint8_t *cur = NULL; + uint32_t *cur = NULL; if (addr < ar->gpe.len / 2) { cur = ar->gpe.sts + addr; @@ -592,7 +592,7 @@ static uint8_t *acpi_gpe_ioport_get_ptr(ACPIREGS *ar, uint32_t addr) void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val) { - uint8_t *cur; + uint32_t *cur; cur = acpi_gpe_ioport_get_ptr(ar, addr); if (addr < ar->gpe.len / 2) { @@ -608,7 +608,7 @@ void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val) uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr) { - uint8_t *cur; + uint32_t *cur; uint32_t val; cur = acpi_gpe_ioport_get_ptr(ar, addr); diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4a17f32..582dbec 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -153,7 +153,7 @@ static int ich9_pm_post_load(void *opaque, int version_id) .info = &vmstate_info_uint8, \ .size = sizeof(uint8_t), \ .flags = VMS_ARRAY | VMS_POINTER, \ - .offset = vmstate_offset_pointer(_state, _field, uint8_t), \ + .offset = vmstate_offset_pointer(_state, _field, uint32_t), \ } const VMStateDescription vmstate_ich9_pm = { diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index c4af1cc..3a7b669 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -205,7 +205,7 @@ static int vmstate_acpi_post_load(void *opaque, int version_id) .info = &vmstate_info_uint16, \ .size = sizeof(uint16_t), \ .flags = VMS_SINGLE | VMS_POINTER, \ - .offset = vmstate_offset_pointer(_state, _field, uint8_t), \ + .offset = vmstate_offset_pointer(_state, _field, uint32_t), \ } static const VMStateDescription vmstate_gpe = { diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 635be7b..deca3ce 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -112,8 +112,8 @@ struct ACPIPM1CNT { struct ACPIGPE { uint8_t len; - uint8_t *sts; - uint8_t *en; + uint32_t *sts; + uint32_t *en; }; struct ACPIREGS { -- 1.7.2.5