From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lnch5-0004Kt-1G for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:51:43 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lnch4-0004KD-Bg for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:51:42 -0400 Received: from [199.232.76.173] (port=39321 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lnch4-0004K5-1a for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:51:42 -0400 Received: from savannah.gnu.org ([199.232.41.3]:34288 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lnch3-0001J1-OQ for qemu-devel@nongnu.org; Sat, 28 Mar 2009 13:51:41 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Lnch3-0000ck-B8 for qemu-devel@nongnu.org; Sat, 28 Mar 2009 17:51:41 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1Lnch3-0000cg-49 for qemu-devel@nongnu.org; Sat, 28 Mar 2009 17:51:41 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Sat, 28 Mar 2009 17:51:41 +0000 Subject: [Qemu-devel] [6906] kvm: Drop kvm_patch_opcode_byte (Jan Kiszka) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6906 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6906 Author: aliguori Date: 2009-03-28 17:51:40 +0000 (Sat, 28 Mar 2009) Log Message: ----------- kvm: Drop kvm_patch_opcode_byte (Jan Kiszka) As cpu_memory_rw_debug is now capable of modifying ROM, we can drop our own patch function. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/target-i386/kvm.c Modified: trunk/target-i386/kvm.c =================================================================== --- trunk/target-i386/kvm.c 2009-03-28 17:51:36 UTC (rev 6905) +++ trunk/target-i386/kvm.c 2009-03-28 17:51:40 UTC (rev 6906) @@ -686,31 +686,12 @@ } #ifdef KVM_CAP_SET_GUEST_DEBUG -static int kvm_patch_opcode_byte(CPUState *env, target_ulong addr, uint8_t val) -{ - target_phys_addr_t phys_page_addr; - unsigned long pd; - uint8_t *ptr; - - phys_page_addr = cpu_get_phys_page_debug(env, addr & TARGET_PAGE_MASK); - if (phys_page_addr == -1) - return -EINVAL; - - pd = cpu_get_physical_page_desc(phys_page_addr); - if ((pd & ~TARGET_PAGE_MASK) != IO_MEM_RAM && - (pd & ~TARGET_PAGE_MASK) != IO_MEM_ROM && !(pd & IO_MEM_ROMD)) - return -EINVAL; - - ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) - + (addr & ~TARGET_PAGE_MASK); - *ptr = val; - return 0; -} - int kvm_arch_insert_sw_breakpoint(CPUState *env, struct kvm_sw_breakpoint *bp) { + const static uint8_t int3 = 0xcc; + if (cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&bp->saved_insn, 1, 0) || - kvm_patch_opcode_byte(env, bp->pc, 0xcc)) + cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&int3, 1, 1)) return -EINVAL; return 0; } @@ -720,7 +701,7 @@ uint8_t int3; if (cpu_memory_rw_debug(env, bp->pc, &int3, 1, 0) || int3 != 0xcc || - kvm_patch_opcode_byte(env, bp->pc, bp->saved_insn)) + cpu_memory_rw_debug(env, bp->pc, (uint8_t *)&bp->saved_insn, 1, 1)) return -EINVAL; return 0; }