From d7348eb37c3602a0021d5bc600b2f37110249620 Mon Sep 17 00:00:00 2001 From: "munkyu.im" Date: Wed, 28 Sep 2011 17:00:39 +0900 Subject: [PATCH] =?utf8?q?[Title]=20=20=20=20=20add=20sdb=5Fsetup()=20(Acc?= =?utf8?q?identally=20it=20was=20omitted=20from=20the=20previous=20job)=20?= =?utf8?q?and=20change=20printf(minor)//=20Summary=20[Type]=20=20=20=20=20?= =?utf8?q?=20//=20Commit=20Type:=20Feature=20/=20Bugfix=20/=20Enhancement?= =?utf8?q?=20[Module]=20=20=20=20//=20Module=20Name=20-=20(Main=20/=20Sub)?= =?utf8?q?=20[Priority]=20=20//=20Importance=C2=A0:=20Critical=20/=20Major?= =?utf8?q?=20/=20Minor=20[CQ#]=20=20=20=20=20=20=20//=20CQ=20Issue=20Numbe?= =?utf8?q?r=20[Redmine#]=20=20//=20Redmine=20Isuue=20Number=20[Problem]=20?= =?utf8?q?=20=20//=20Problem=20Description=20[Cause]=20=20=20=20=20//=20Ca?= =?utf8?q?use=20Description=20[Solution]=20=20//=20Solution=20Description?= =?utf8?q?=20[TestCase]=20=20//=20Executed=20the=20test-target?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sdb.c | 8 +++----- vl.c | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sdb.c b/sdb.c index c1b8df4..067acca 100644 --- a/sdb.c +++ b/sdb.c @@ -219,7 +219,7 @@ void sdb_setup(void) if(net_slirp_redir((char*)buf) < 0) continue; - printf("SDB listening on port from %d to %d\n", port, port+9); + fprintf(stdout,"SDBD established on port %d\n", port+1); success = 1; break; } @@ -227,8 +227,6 @@ void sdb_setup(void) fprintf(stderr, "it seems too many emulator instances are running on this machine. Aborting\n" ); exit(1); } - setenv( "SDB_PORT", (char*)buf, 1); - fflush(stdout); /* Save base port. */ SLP_base_port = port; @@ -248,8 +246,8 @@ void sdb_setup(void) sprintf(tmp,"0013host:emulator:%d",port+1); socket_send(s, tmp, 30); - printf("sent '%s' to SDB server\n", tmp); - fflush(stdout); +// printf("sent '%s' to SDB server\n", tmp); +// fflush(stdout); } while (0); diff --git a/vl.c b/vl.c index d9a2a99..ffa1a4f 100644 --- a/vl.c +++ b/vl.c @@ -166,6 +166,7 @@ int main(int argc, char **argv) #include "arch_init.h" #include "vl.h" #include "ui/qemu-spice.h" +#include "sdb.h" //#define DEBUG_NET //#define DEBUG_SLIRP @@ -3146,6 +3147,9 @@ int qemu_main(int argc, char **argv, char **envp) * when bus is created by qdev.c */ qemu_register_reset(qbus_reset_all_fn, sysbus_get_default()); qemu_run_machine_init_done_notifiers(); + + /* call sdb setup function */ + sdb_setup(); qemu_system_reset(); if (loadvm) { -- 2.7.4