From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=35827 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PpuXm-0001uT-Lb
	for qemu-devel@nongnu.org; Wed, 16 Feb 2011 22:28:39 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1PpuXl-0004OS-Ms
	for qemu-devel@nongnu.org; Wed, 16 Feb 2011 22:28:38 -0500
Received: from mx1.redhat.com ([209.132.183.28]:39750)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1PpuXl-0004OG-Fy
	for qemu-devel@nongnu.org; Wed, 16 Feb 2011 22:28:37 -0500
Date: Thu, 17 Feb 2011 00:53:36 -0200
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20110217025336.GA22404@amt.cnet>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] Fix vmport segfault
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-devel@nongnu.org


Fix regression caused by qdev conversion.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/hw/vmport.c b/hw/vmport.c
index 292d78f..38ec259 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -43,15 +43,15 @@ typedef struct _VMPortState
     void *opaque[VMPORT_ENTRIES];
 } VMPortState;
 
-static VMPortState port_state;
+static VMPortState *port_state;
 
 void vmport_register(unsigned char command, IOPortReadFunc *func, void *opaque)
 {
     if (command >= VMPORT_ENTRIES)
         return;
 
-    port_state.func[command] = func;
-    port_state.opaque[command] = opaque;
+    port_state->func[command] = func;
+    port_state->opaque[command] = opaque;
 }
 
 static uint32_t vmport_ioport_read(void *opaque, uint32_t addr)
@@ -128,6 +128,7 @@ static int vmport_initfn(ISADevice *dev)
     register_ioport_read(0x5658, 1, 4, vmport_ioport_read, &s);
     register_ioport_write(0x5658, 1, 4, vmport_ioport_write, &s);
     isa_init_ioport(dev, 0x5658);
+    port_state = s;
     /* Register some generic port commands */
     vmport_register(VMPORT_CMD_GETVERSION, vmport_cmd_get_version, NULL);
     vmport_register(VMPORT_CMD_GETRAMSIZE, vmport_cmd_ram_size, NULL);