From patchwork Tue Apr 27 12:57:44 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Naphtali Sprei <nsprei@redhat.com>
X-Patchwork-Id: 95416
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3RCvxe5022323
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 27 Apr 2010 12:57:59 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753197Ab0D0M5w (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 27 Apr 2010 08:57:52 -0400
Received: from mx1.redhat.com ([209.132.183.28]:38106 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752333Ab0D0M5t (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 27 Apr 2010 08:57:49 -0400
Received: from int-mx04.intmail.prod.int.phx2.redhat.com
	(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3RCvnPb029079
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Tue, 27 Apr 2010 08:57:49 -0400
Received: from localhost.localdomain (dhcp-0-60.tlv.redhat.com [10.35.0.60])
	by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o3RCvj9s016249
	for <kvm@vger.kernel.org>; Tue, 27 Apr 2010 08:57:48 -0400
From: Naphtali Sprei <nsprei@redhat.com>
To: kvm@vger.kernel.org
Subject: [qemu-kvm tests PATCH v2 2/3] qemu-kvm tests cleanup: adapt
	stringio test to kernel-mode run
Date: Tue, 27 Apr 2010 15:57:44 +0300
Message-Id: <1272373065-3162-3-git-send-email-nsprei@redhat.com>
In-Reply-To: <1272373065-3162-2-git-send-email-nsprei@redhat.com>
References: <1272373065-3162-1-git-send-email-nsprei@redhat.com>
	<1272373065-3162-2-git-send-email-nsprei@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 27 Apr 2010 12:57:59 +0000 (UTC)


diff --git a/kvm/user/config-x86-common.mak b/kvm/user/config-x86-common.mak
index 960741e..d312681 100644
--- a/kvm/user/config-x86-common.mak
+++ b/kvm/user/config-x86-common.mak
@@ -54,7 +54,7 @@ $(TEST_DIR)/realmode.flat: $(TEST_DIR)/realmode.o
 
 $(TEST_DIR)/realmode.o: bits = 32
 
-$(TEST_DIR)/stringio.flat: $(TEST_DIR)/stringio.o
+$(TEST_DIR)/stringio.flat: $(cstart.o) $(TEST_DIR)/stringio.o
 
 $(TEST_DIR)/msr.flat: $(cstart.o) $(TEST_DIR)/msr.o
 
diff --git a/kvm/user/test/x86/stringio.S b/kvm/user/test/x86/stringio.S
index 31ddc47..461621c 100644
--- a/kvm/user/test/x86/stringio.S
+++ b/kvm/user/test/x86/stringio.S
@@ -8,24 +8,29 @@
 1:	
 .endm	
 
+TESTDEV_PORT = 0xf1
+
 	str "forward", "forward"
 	str "backward", "backward"
 		
 .text
 
-
+.global main
+main:
 	cld
 	movl forward, %ecx
 	lea  4+forward, %rsi
-	movw $1, %dx
+	movw $TESTDEV_PORT, %dx
 	rep outsb
 
 	std
 	movl backward, %ecx
 	lea 4+backward-1(%rcx), %rsi
-	movw $2, %dx
+	movw $TESTDEV_PORT, %dx
 	rep outsb
 	
-	hlt
+	mov $0, %rsi
+	call exit
+