Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vchan/stubdom: remove temp hack (unneded now)

Browse Source 
This was needed when stubdom have no write access to device/vchan.
This commit is contained in:
Marek Marczykowski 2012-06-02 13:25:18 +02:00
parent 1462e36454
commit 87115716ba
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vchan/init.c
View File

@ -127,11 +127,6 @@ static int server_interface_init(struct libvchan *ctrl, int devno)
struct xs_handle *xs; struct xs_handle *xs;
char buf[64]; char buf[64];
char ref[16]; char ref[16];
/* XXX temp hack begin */
char *domid_s;
int domid = 0;
unsigned int len;
/* XXX temp hack end */
#ifdef XENCTRL_HAS_XC_INTERFACE #ifdef XENCTRL_HAS_XC_INTERFACE
xc_evtchn *evfd; xc_evtchn *evfd;
#else #else
@ -163,11 +158,6 @@ static int server_interface_init(struct libvchan *ctrl, int devno)
ctrl->evport = port; ctrl->evport = port;
ctrl->devno = devno; ctrl->devno = devno;
// stubdom debug HACK XXX
domid_s = xs_read(xs, 0, "domid", &len);
if (domid_s)
domid = atoi(domid_s);
snprintf(buf, sizeof buf, "device/vchan/%d/version", devno); snprintf(buf, sizeof buf, "device/vchan/%d/version", devno);
if (!xs_write(xs, 0, buf, "2", strlen("2"))) if (!xs_write(xs, 0, buf, "2", strlen("2")))
goto fail2; goto fail2;
@ -175,21 +165,11 @@ static int server_interface_init(struct libvchan *ctrl, int devno)
snprintf(ref, sizeof ref, "%d", ctrl->ring_ref); snprintf(ref, sizeof ref, "%d", ctrl->ring_ref);
snprintf(buf, sizeof buf, "device/vchan/%d/ring-ref", devno); snprintf(buf, sizeof buf, "device/vchan/%d/ring-ref", devno);
if (!xs_write(xs, 0, buf, ref, strlen(ref))) if (!xs_write(xs, 0, buf, ref, strlen(ref)))
#ifdef CONFIG_STUBDOM
// TEMP HACK XXX FIXME goto fail2;
fprintf(stderr, "xenstore-write /local/domain/%d/%s %s\n", domid, buf, ref);
#else
goto fail2; goto fail2;
#endif
snprintf(ref, sizeof ref, "%d", ctrl->evport); snprintf(ref, sizeof ref, "%d", ctrl->evport);
snprintf(buf, sizeof buf, "device/vchan/%d/event-channel", devno); snprintf(buf, sizeof buf, "device/vchan/%d/event-channel", devno);
if (!xs_write(xs, 0, buf, ref, strlen(ref))) if (!xs_write(xs, 0, buf, ref, strlen(ref)))
#ifdef CONFIG_STUBDOM
// TEMP HACK XXX FIXME goto fail2;
fprintf(stderr, "xenstore-write /local/domain/%d/%s %s\n", domid, buf, ref);
#else
goto fail2; goto fail2;
#endif
// do not block in stubdom - libvchan_server_handle_connected will be // do not block in stubdom - libvchan_server_handle_connected will be
// called on first input // called on first input
#ifndef CONFIG_STUBDOM #ifndef CONFIG_STUBDOM
@ -449,4 +429,4 @@ struct libvchan *libvchan_client_init(int domain, int devno)
return NULL; return NULL;
} }
#endif #endif