From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9Hn5-0006mJ-38
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:03:59 -0400
Received: from [140.186.70.92] (port=53971 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9Hn2-0006lB-08
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:03:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mtosatti@redhat.com>) id 1O9Hmv-0003BZ-K9
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:03:55 -0400
Received: from mx1.redhat.com ([209.132.183.28]:15919)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mtosatti@redhat.com>) id 1O9Hmv-0003B6-6v
	for qemu-devel@nongnu.org; Tue, 04 May 2010 09:03:49 -0400
Message-Id: <20100504124634.512988258@redhat.com>
Date: Tue, 04 May 2010 09:45:25 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20100504124518.979470863@redhat.com>
Content-Disposition: inline; filename=move-stopped
Subject: [Qemu-devel] [patch uq/master 7/9] move stop/stopped CPU_COMMON
	fields after area zeroed by reset
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.gnu.org/pipermail/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: kvm@vger.kernel.org, qemu-devel@nongnu.org
Cc: Marcelo Tosatti <mtosatti@redhat.com>

cpu_reset zeroes CPUState upto breakpoints member. Contents of
stop/stopped should not be zeroed on cpu_reset.

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

Index: qemu/cpu-defs.h
===================================================================
--- qemu.orig/cpu-defs.h
+++ qemu/cpu-defs.h
@@ -159,8 +159,6 @@ typedef struct CPUWatchpoint {
     target_ulong mem_io_vaddr; /* target virtual addr at which the      \
                                      memory was accessed */             \
     uint32_t halted; /* Nonzero if the CPU is in suspend state */       \
-    uint32_t stop;   /* Stop request */                                 \
-    uint32_t stopped; /* Artificially stopped */                        \
     uint32_t interrupt_request;                                         \
     volatile sig_atomic_t exit_request;                                 \
     CPU_COMMON_TLB                                                      \
@@ -203,6 +201,8 @@ typedef struct CPUWatchpoint {
     void *opaque;                                                       \
                                                                         \
     uint32_t created;                                                   \
+    uint32_t stop;   /* Stop request */                                 \
+    uint32_t stopped; /* Artificially stopped */                        \
     struct QemuThread *thread;                                          \
     struct QemuCond *halt_cond;                                         \
     struct qemu_work_item *queued_work_first, *queued_work_last;        \