Stefano Stabellini
2009-Mar-23 16:29 UTC
[Xen-devel] [PATCH] qemu-xen: do not use pipe with stubdom
This patch allows stubdoms to start after the recent merge.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
diff --git a/vl.c b/vl.c
index 9b9f7d5..a5361fd 100644
--- a/vl.c
+++ b/vl.c
@@ -1773,7 +1773,7 @@ static int init_timer_alarm(void)
struct qemu_alarm_timer *t = NULL;
int i, err = -1;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_STUBDOM)
int fds[2];
err = pipe(fds);
@@ -1805,7 +1805,7 @@ static int init_timer_alarm(void)
goto fail;
}
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_STUBDOM)
qemu_set_fd_handler2(alarm_timer_rfd, NULL,
try_to_rearm_timer, NULL, t);
#endif
@@ -1815,7 +1815,7 @@ static int init_timer_alarm(void)
return 0;
fail:
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_STUBDOM)
close(fds[0]);
close(fds[1]);
#endif
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Boris Derzhavets
2009-Mar-23 17:40 UTC
Re: [Xen-devel] [PATCH] qemu-xen: do not use pipe with stubdom
Patch applied in Xen Unstable & Suse''s 2.6.27-5 env .
First start fs-backend
root@ServerXen331:~# /usr/sbin/fs-backend &
[1] 6548
root@ServerXen331:~# Path changed backend/vfs/exports/requests
Awaiting next connection.
Path changed backend/vfs/exports/requests/2/0/frontend
Handling connection from dom=2, for export=0
Frontend found at: /local/domain/2/device/vfs/0 (gref=1789, evtchn=5)
Awaiting next connection.
Awaiting next connection.
Backend consumed: 0 requests
Pushed responces and notify=0
Path changed backend/vfs/exports/requests/2/0/frontend
Awaiting next connection.
terminate_mount_request /local/domain/2/device/vfs/0
free_mount_request /local/domain/2/device/vfs/0
Awaiting next connection.
Path changed backend/vfs/exports/requests/3/0/frontend
Handling connection from dom=3, for export=0
Frontend found at: /local/domain/3/device/vfs/0 (gref=1789, evtchn=5)
Awaiting next connection.
Awaiting next connection.
Backend consumed: 0 requests
Pushed responces and notify=0
Path changed backend/vfs/exports/requests/3/0/frontend
Awaiting next connection.
terminate_mount_request /local/domain/3/device/vfs/0
free_mount_request /local/domain/3/device/vfs/0
Awaiting next connection.
Next in an other terminal :-
root@ServerXen331:/etc/xen# cat RHELhvm-dm
kernel = "/usr/lib/xen/boot/ioemu-stubdom.gz"
vif = [ '' '', ''bridge=eth0'']
# vfb = [ ''type=sdl'' ]
vfb = [ ''type=vnc'' ]
disk =
[''phy:/dev/loop0,hdc:cdrom,r'',''phy:/dev/sdb8,hda,w'']
root@ServerXen331:/etc/xen# cat RHELhvm-stubdom
kernel = "/usr/lib/xen/boot/hvmloader"
builder=''hvm''
memory =1024
name = "RHELhvm"
vif = [ ''type=ioemu, bridge=eth0'' ]
device_model = "/usr/lib/xen/bin/stubdom-dm"
boot="d"
sdl=0
opengl=0
vnc=0
stdvga=0
root@ServerXen331:/etc/xen# xm create RHELhvm-stubdom
Using config file "./RHELhvm-stubdom".
Started domain RHELhvm (id=11)
root@ServerXen331:/etc/xen# xm list
Name ID Mem VCPUs State Time(s)
Domain-0 0 6922 2 r-----
99.5
RHELhvm 11 1024 1 ------
0.0
root@ServerXen331:/etc/xen# netstat -a|grep 590
tcp 0 0 *:5901 *:* LISTEN
unix 2 [ ACC ] STREAM LISTENING 18590
/tmp/seahorse-bvfLoE/S.gpg-agent
unix 3 [ ] STREAM CONNECTED 19590
@/dbus-vfs-daemon/socket-lDpa7MVy
Boris
--- On Mon, 3/23/09, Stefano Stabellini <stefano.stabellini@eu.citrix.com>
wrote:
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [Xen-devel] [PATCH] qemu-xen: do not use pipe with stubdom
To: "xen-devel" <xen-devel@lists.xensource.com>
Date: Monday, March 23, 2009, 12:29 PM
This patch allows stubdoms to start after the recent merge.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
diff --git a/vl.c b/vl.c
index 9b9f7d5..a5361fd 100644
--- a/vl.c
+++ b/vl.c
@@ -1773,7 +1773,7 @@ static int init_timer_alarm(void)
struct qemu_alarm_timer *t = NULL;
int i, err = -1;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_STUBDOM)
int fds[2];
err = pipe(fds);
@@ -1805,7 +1805,7 @@ static int init_timer_alarm(void)
goto fail;
}
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_STUBDOM)
qemu_set_fd_handler2(alarm_timer_rfd, NULL,
try_to_rearm_timer, NULL, t);
#endif
@@ -1815,7 +1815,7 @@ static int init_timer_alarm(void)
return 0;
fail:
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(CONFIG_STUBDOM)
close(fds[0]);
close(fds[1]);
#endif
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel