Re: [PATCH] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work.

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

On Wed, Nov 13, 2013 at 06:43:16PM +0000, Stefano Stabellini wrote:
> On Wed, 13 Nov 2013, Konrad Rzeszutek Wilk wrote:
> > On Wed, Nov 13, 2013 at 06:03:44PM +0000, Stefano Stabellini wrote:
> > > On Tue, 12 Nov 2013, Konrad Rzeszutek Wilk wrote:
> > > > On Tue, Nov 12, 2013 at 03:42:18PM +0000, Ian Jackson wrote:
> > > > > Konrad Rzeszutek Wilk writes ("[PATCH] hw/piix4acpi: Make writes to ACPI_DBG_IO_ADDR actually work."):
> > > > > > The ACPI AML code has little snippets where it uses two
> > > > > > memory locations to stash debug information when doing PCI
> > > > > > hotplug, such as:
> > > > > 
> > > > > Thanks.
> > > > > 
> > > > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> > > > > Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
> > > > 
> > > > Yeey!
> > > > > 
> > > > > to qemu-xen-traditional master.
> > > > 
> > > > It also applies to the qemu-xen but I forgot to CC Stefano. Doing it
> > > > here.
> > > 
> > > Unfortunately the code in upstream qemu is very different in this area,
> > > and it looks like ACPI_DBG_IO_ADDR is actually unused.
> > 
> > Correct. Not for upstream qemu but for qemu-xen. You are the maintainer
> > of that tree too right?
> 
> Right, the situation is the same in qemu-xen as in upstream QEMU.

I see that the qemu-xen has changed the name of the file, so its
acpi_piix4.c instead of piix4_acpi.c.

This seems to apply to my local xen-unstable tree:

diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 059b64f..4ad9043 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -197,7 +197,7 @@ static void apm_ctrl_changed(uint32_t val, void *arg)
     }
 }
 
-static void acpi_dbg_writel(void *opaque, uint32_t addr, uint32_t val)
+static void acpi_dbg_writeb(void *opaque, uint32_t addr, uint32_t val)
 {
     PIIX4_DPRINTF("ACPI: DBG: 0x%08x\n", val);
 }
@@ -453,7 +453,7 @@ static int piix4_pm_initfn(PCIDevice *dev)
     /* APM */
     apm_init(&s->apm, apm_ctrl_changed, s);
 
-    register_ioport_write(ACPI_DBG_IO_ADDR, 4, 4, acpi_dbg_writel, s);
+    register_ioport_write(ACPI_DBG_IO_ADDR, 4, 1, acpi_dbg_writeb, s);
 
     if (s->kvm_enabled) {
         /* Mark SMM as already inited to prevent SMM from running.  KVM does not


Would you like me to repost it with the right file and the same
commit description?

Thank you.