* [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
@ 2006-04-03 15:57 Ben Thomas
2006-04-03 16:58 ` Keir Fraser
2006-04-04 15:15 ` Edwin Zhai
0 siblings, 2 replies; 8+ messages in thread
From: Ben Thomas @ 2006-04-03 15:57 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 2383 bytes --]
Add code to make handling domain poweroff/reboot symmetrical
between paravirtualized and fully virtualized.
A paravirtualized domain uses sched_op to shut down and set the
reason code. This will send a VIRQ_DOM_EXC, which can be
handled in dom0 by control software. In some ways, this resembles
SIGCHILD/waitpid, and is a reasonable model.
The fully virtualized case has qemu invoke xm directly. This is a
different path than paravirtualized. It also removes
decision and policy making choices from the rest of the control
software and places it within qemu. When any dom0 logic
eventually gets a VIRQ_DOM_EXC, the information about the
domain is gone having been destroyed by xm.
It would be useful if all shutdown/reboot operations were
symmetrical from domain 0's point of view. One approach
would be to redefine sched_op to handle other domains than
the current domain, but this seemed excessive. Another
approach, which is what this patch implements, adds
a DOM0 hypervisor call very similar to the existing
DOM0_DESTROYDOMAIN, called DOM0_SHUTDOWNDOMAIN, which handles
the shutdown and reason -- basically, just like a
paravirtualized system.
Like DOM0_DESTROYDOMAIN, add a xenctrl wrapper, and have qemu
call it.
With this change, both domain types shutdown/reboot using
the same dom0 management logic. All control decisions are
removed from qemu, which now simply handles the request
and reason. At a very high level, the flow is "notify of
shutdown and reason", "send VIRQ_DOM_EXC", process, and
destroy domain. Paravirtualized and fully-virtualized
domains would differ slightly in the first step of
notification. Paravirtualized continues to use sched_op,
fully virtualized uses DOM0_SHUTDOWNDOMAIN. The rest
of the steps would be identical in both cases.
Or, back to the opening sentence, make the operations as
symmetrical as possible.
(As a freebie, #if 0 some very verbose logging code in qemu.
Totally unrelated, but as long as I was there...)
Signed-off-by: Ben Thomas (ben@virtualiron.com)
--
------------------------------------------------------------------------
Ben Thomas Virtual Iron Software
bthomas@virtualiron.com Tower 1, Floor 2
978-849-1214 900 Chelmsford Street
Lowell, MA 01851
[-- Attachment #2: shutdown.patch --]
[-- Type: text/x-patch, Size: 5608 bytes --]
diff -r 4ad317429111 tools/ioemu/target-i386-dm/helper2.c
--- a/tools/ioemu/target-i386-dm/helper2.c Sun Apr 2 16:16:53 2006 +0100
+++ b/tools/ioemu/target-i386-dm/helper2.c Mon Apr 3 11:22:29 2006 -0400
@@ -409,12 +409,20 @@ void
void
destroy_hvm_domain(void)
{
- extern FILE* logfile;
- char destroy_cmd[32];
-
- sprintf(destroy_cmd, "xm destroy %d", domid);
- if (system(destroy_cmd) == -1)
- fprintf(logfile, "%s failed.!\n", destroy_cmd);
+ int xcHandle;
+ int sts;
+
+ xcHandle = xc_interface_open();
+ if (xcHandle < 0)
+ fprintf(logfile, "Cannot acquire xenctrl handle\n");
+ else {
+ sts = xc_domain_shutdown(xcHandle, domid, SHUTDOWN_poweroff);
+ if (sts != 0)
+ fprintf(logfile, "? xc_domain_shutdown failed to issue poweroff, sts %d\n", sts);
+ else
+ fprintf(logfile, "Issued domain %d poweroff\n", domid);
+ xc_interface_close(xcHandle);
+ }
}
fd_set wakeup_rfds;
@@ -480,13 +488,24 @@ int main_loop(void)
static void qemu_hvm_reset(void *unused)
{
- char cmd[64];
+ int xcHandle;
+ int sts;
/* pause domain first, to avoid repeated reboot request*/
xc_domain_pause(xc_handle, domid);
- sprintf(cmd, "xm shutdown -R %d", domid);
- system(cmd);
+ xcHandle = xc_interface_open();
+ if (xcHandle < 0)
+ fprintf(logfile, "Cannot acquire xenctrl handle\n");
+ else {
+ sts = xc_domain_shutdown(xcHandle, domid, SHUTDOWN_reboot);
+ if (sts != 0)
+ fprintf(logfile, "? xc_domain_shutdown failed to issue reboot, sts %d\n", sts);
+ else
+ fprintf(logfile, "Issued domain %d reboot\n", domid);
+ xc_interface_close(xcHandle);
+ }
+
}
CPUState * cpu_init()
diff -r 4ad317429111 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Sun Apr 2 16:16:53 2006 +0100
+++ b/tools/ioemu/vl.c Mon Apr 3 11:22:29 2006 -0400
@@ -2556,8 +2556,10 @@ static int set_mm_mapping(int xc_handle,
return -1;
}
+#if 0 /* Enable for debugging -- generates many lines in log file */
for (i = 0; i < nr_pages; i++)
fprintf(stderr, "set_map result i %x result %lx\n", i, extent_start[i]);
+#endif
return 0;
}
diff -r 4ad317429111 tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c Sun Apr 2 16:16:53 2006 +0100
+++ b/tools/libxc/xc_domain.c Mon Apr 3 11:22:29 2006 -0400
@@ -55,6 +55,17 @@ int xc_domain_destroy(int xc_handle,
DECLARE_DOM0_OP;
op.cmd = DOM0_DESTROYDOMAIN;
op.u.destroydomain.domain = (domid_t)domid;
+ return do_dom0_op(xc_handle, &op);
+}
+
+int xc_domain_shutdown(int xc_handle,
+ uint32_t domid,
+ int reason)
+{
+ DECLARE_DOM0_OP;
+ op.cmd = DOM0_SHUTDOWNDOMAIN;
+ op.u.shutdowndomain.domain = (domid_t)domid;
+ op.u.shutdowndomain.shutdown_reason = reason;
return do_dom0_op(xc_handle, &op);
}
diff -r 4ad317429111 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Sun Apr 2 16:16:53 2006 +0100
+++ b/tools/libxc/xenctrl.h Mon Apr 3 11:22:29 2006 -0400
@@ -205,6 +205,21 @@ int xc_domain_unpause(int xc_handle,
*/
int xc_domain_destroy(int xc_handle,
uint32_t domid);
+
+/**
+ * This function will shutdown a domain. This is intended for use in
+ * fully-virtualized domains where this operation is analogous to the
+ * sched_op operations in a paravirtualized domain. The caller is
+ * expected to give the reason for the shutdown.
+ *
+ * @parm xc_handle a handle to an open hypervisor interface
+ * @parm domid the domain id to destroy
+ * @parm reason is the reason (SHUTDOWN_xxx) for the shutdown
+ * @return 0 on success, -1 on failure
+ */
+int xc_domain_shutdown(int xc_handle,
+ uint32_t domid,
+ int reason);
int xc_vcpu_setaffinity(int xc_handle,
uint32_t domid,
diff -r 4ad317429111 xen/common/dom0_ops.c
--- a/xen/common/dom0_ops.c Sun Apr 2 16:16:53 2006 +0100
+++ b/xen/common/dom0_ops.c Mon Apr 3 11:22:29 2006 -0400
@@ -682,6 +682,23 @@ long do_dom0_op(GUEST_HANDLE(dom0_op_t)
break;
#endif
+ case DOM0_SHUTDOWNDOMAIN:
+ {
+ struct domain *d = find_domain_by_id(op->u.shutdowndomain.domain);
+ ret = -ESRCH;
+ if ( d != NULL )
+ {
+ ret = -EINVAL;
+ if ( d != current->domain )
+ {
+ domain_shutdown(d, op->u.shutdowndomain.shutdown_reason);
+ ret = 0;
+ }
+ put_domain(d);
+ }
+ }
+ break;
+
default:
ret = arch_do_dom0_op(op, u_dom0_op);
break;
diff -r 4ad317429111 xen/include/public/dom0_ops.h
--- a/xen/include/public/dom0_ops.h Sun Apr 2 16:16:53 2006 +0100
+++ b/xen/include/public/dom0_ops.h Mon Apr 3 11:22:29 2006 -0400
@@ -470,6 +470,15 @@ typedef struct dom0_hypercall_init {
unsigned long mfn; /* machine frame to be initialised */
} dom0_hypercall_init_t;
DEFINE_GUEST_HANDLE(dom0_hypercall_init_t);
+
+#define DOM0_SHUTDOWNDOMAIN 49
+typedef struct dom0_shutdowndomain {
+ /* IN variables. */
+ domid_t domain; /* domain to be affected */
+ int shutdown_reason; /* SHUTDOWN_xxx reason code */
+} dom0_shutdowndomain_t;
+
+DEFINE_GUEST_HANDLE(dom0_shutdowndomain_t);
typedef struct dom0_op {
uint32_t cmd;
@@ -512,6 +521,7 @@ typedef struct dom0_op {
struct dom0_irq_permission irq_permission;
struct dom0_iomem_permission iomem_permission;
struct dom0_hypercall_init hypercall_init;
+ struct dom0_shutdowndomain shutdowndomain;
uint8_t pad[128];
} u;
} dom0_op_t;
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
2006-04-03 15:57 [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot Ben Thomas
@ 2006-04-03 16:58 ` Keir Fraser
2006-04-03 17:14 ` Ben Thomas
2006-04-04 15:18 ` Edwin Zhai
2006-04-04 15:15 ` Edwin Zhai
1 sibling, 2 replies; 8+ messages in thread
From: Keir Fraser @ 2006-04-03 16:58 UTC (permalink / raw)
To: Ben Thomas; +Cc: xen-devel
On 3 Apr 2006, at 16:57, Ben Thomas wrote:
> It would be useful if all shutdown/reboot operations were
> symmetrical from domain 0's point of view. One approach
> would be to redefine sched_op to handle other domains than
> the current domain, but this seemed excessive.
I'd prefer an extra sched_op (maybe SCHEDOP_remote_shutdown with
accompanying sched_remote_shutdown structure). This will need to be
invokable by the emulator mini domain at some point in the future, so
adding this as a dom0_op isn't really for the best.
-- Keir
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
2006-04-03 16:58 ` Keir Fraser
@ 2006-04-03 17:14 ` Ben Thomas
2006-04-03 18:18 ` Keir Fraser
2006-04-04 15:18 ` Edwin Zhai
1 sibling, 1 reply; 8+ messages in thread
From: Ben Thomas @ 2006-04-03 17:14 UTC (permalink / raw)
To: Keir Fraser; +Cc: xen-devel
Keir Fraser wrote:
>
> On 3 Apr 2006, at 16:57, Ben Thomas wrote:
>
>> It would be useful if all shutdown/reboot operations were
>> symmetrical from domain 0's point of view. One approach
>> would be to redefine sched_op to handle other domains than
>> the current domain, but this seemed excessive.
>
>
> I'd prefer an extra sched_op (maybe SCHEDOP_remote_shutdown with
> accompanying sched_remote_shutdown structure). This will need to be
> invokable by the emulator mini domain at some point in the future, so
> adding this as a dom0_op isn't really for the best.
>
> -- Keir
>
Ok, that's workable. Is there anything else that needs modification ?
Do you foresee a need for any sort of need for filtering and/or
permissioning of allowable domains as specified in remote_shutdown ?
As long as a non-privileged domain may execute this op, what
level of protection(s) need to exist? (That also was part of my
factoring it into a DOM0 op).
I'm willing to go with anything that gets the job done. This is
one of several points of asymmetry that I'd like to see get
resolved.
Thanks,
-b
--
------------------------------------------------------------------------
Ben Thomas Virtual Iron Software
bthomas@virtualiron.com Tower 1, Floor 2
978-849-1214 900 Chelmsford Street
Lowell, MA 01851
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
2006-04-03 17:14 ` Ben Thomas
@ 2006-04-03 18:18 ` Keir Fraser
0 siblings, 0 replies; 8+ messages in thread
From: Keir Fraser @ 2006-04-03 18:18 UTC (permalink / raw)
To: Ben Thomas; +Cc: xen-devel
On 3 Apr 2006, at 18:14, Ben Thomas wrote:
> Ok, that's workable. Is there anything else that needs modification ?
>
> Do you foresee a need for any sort of need for filtering and/or
> permissioning of allowable domains as specified in remote_shutdown ?
> As long as a non-privileged domain may execute this op, what
> level of protection(s) need to exist? (That also was part of my
> factoring it into a DOM0 op).
>
> I'm willing to go with anything that gets the job done. This is
> one of several points of asymmetry that I'd like to see get
> resolved.
For now, IS_PRIV() is the correct check as for a dom0_op, but it can be
revisited in future.
Apart from that the patch looked okay to me.
-- Keir
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
2006-04-03 16:58 ` Keir Fraser
2006-04-03 17:14 ` Ben Thomas
@ 2006-04-04 15:18 ` Edwin Zhai
2006-04-04 16:42 ` Keir Fraser
1 sibling, 1 reply; 8+ messages in thread
From: Edwin Zhai @ 2006-04-04 15:18 UTC (permalink / raw)
To: Keir Fraser; +Cc: Ben Thomas, xen-devel
On Mon, Apr 03, 2006 at 05:58:22PM +0100, Keir Fraser wrote:
>
> I'd prefer an extra sched_op (maybe SCHEDOP_remote_shutdown with
can we use common code to avoid extra same function?
> accompanying sched_remote_shutdown structure). This will need to be
> invokable by the emulator mini domain at some point in the future, so
> adding this as a dom0_op isn't really for the best.
>
> -- Keir
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
--
thanks,
edwin
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
2006-04-04 15:18 ` Edwin Zhai
@ 2006-04-04 16:42 ` Keir Fraser
0 siblings, 0 replies; 8+ messages in thread
From: Keir Fraser @ 2006-04-04 16:42 UTC (permalink / raw)
To: Edwin Zhai; +Cc: Ben Thomas, xen-devel
On 4 Apr 2006, at 16:18, Edwin Zhai wrote:
>> I'd prefer an extra sched_op (maybe SCHEDOP_remote_shutdown with
> can we use common code to avoid extra same function?
We need a separate interface function as it takes an extra parameter.
There'll be code sharing inside Xen, of course.
-- Keir
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
2006-04-03 15:57 [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot Ben Thomas
2006-04-03 16:58 ` Keir Fraser
@ 2006-04-04 15:15 ` Edwin Zhai
1 sibling, 0 replies; 8+ messages in thread
From: Edwin Zhai @ 2006-04-04 15:15 UTC (permalink / raw)
To: Ben Thomas; +Cc: xen-devel
thomas,
your patch is reasonable.
as my understanding, destroy is totally different from shutdown. destroy just
issues a hyper-call(DOM0_OP), while shutdown writes xenstore and waits the guest
handling almost everything( use sched_op hypercall for itself).
so, qemu's destroy command(kill hvm dom immediately when hang) should use the
original destroy hyper-call to take place of "xm destroy".
On Mon, Apr 03, 2006 at 11:57:51AM -0400, Ben Thomas wrote:
> Add code to make handling domain poweroff/reboot symmetrical
> between paravirtualized and fully virtualized.
>
> A paravirtualized domain uses sched_op to shut down and set the
> reason code. This will send a VIRQ_DOM_EXC, which can be
> handled in dom0 by control software. In some ways, this resembles
> SIGCHILD/waitpid, and is a reasonable model.
>
> The fully virtualized case has qemu invoke xm directly. This is a
> different path than paravirtualized. It also removes
> decision and policy making choices from the rest of the control
> software and places it within qemu. When any dom0 logic
> eventually gets a VIRQ_DOM_EXC, the information about the
> domain is gone having been destroyed by xm.
>
> It would be useful if all shutdown/reboot operations were
> symmetrical from domain 0's point of view. One approach
> would be to redefine sched_op to handle other domains than
> the current domain, but this seemed excessive. Another
> approach, which is what this patch implements, adds
> a DOM0 hypervisor call very similar to the existing
> DOM0_DESTROYDOMAIN, called DOM0_SHUTDOWNDOMAIN, which handles
> the shutdown and reason -- basically, just like a
> paravirtualized system.
>
> Like DOM0_DESTROYDOMAIN, add a xenctrl wrapper, and have qemu
> call it.
>
> With this change, both domain types shutdown/reboot using
> the same dom0 management logic. All control decisions are
> removed from qemu, which now simply handles the request
> and reason. At a very high level, the flow is "notify of
> shutdown and reason", "send VIRQ_DOM_EXC", process, and
> destroy domain. Paravirtualized and fully-virtualized
> domains would differ slightly in the first step of
> notification. Paravirtualized continues to use sched_op,
> fully virtualized uses DOM0_SHUTDOWNDOMAIN. The rest
> of the steps would be identical in both cases.
>
> Or, back to the opening sentence, make the operations as
> symmetrical as possible.
>
> (As a freebie, #if 0 some very verbose logging code in qemu.
> Totally unrelated, but as long as I was there...)
>
> Signed-off-by: Ben Thomas (ben@virtualiron.com)
>
>
> --
> ------------------------------------------------------------------------
> Ben Thomas Virtual Iron Software
> bthomas@virtualiron.com Tower 1, Floor 2
> 978-849-1214 900 Chelmsford Street
> Lowell, MA 01851
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
--
thanks,
edwin
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot
@ 2006-04-06 13:31 Ben Thomas
0 siblings, 0 replies; 8+ messages in thread
From: Ben Thomas @ 2006-04-06 13:31 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 2212 bytes --]
Add code to make handling domain poweroff/reboot symmetrical
between paravirtualized and fully virtualized.
A paravirtualized domain uses sched_op to shut down and set the
reason code. This will send a VIRQ_DOM_EXC, which can be
handled in dom0 by control software. In some ways, this resembles
SIGCHILD/waitpid, and is a reasonable model.
The fully virtualized case has qemu invoke xm directly. This is a
different path than paravirtualized. It also removes
decision and policy making choices from the rest of the control
software and places it within qemu. When any dom0 logic
eventually gets a VIRQ_DOM_EXC, the information about the
domain is gone having been destroyed by xm.
It would be useful if all shutdown/reboot operations were
symmetrical from domain 0's point of view. This approach
uses the new sched_op to handle other domains than
the current domain. The new code, SCHEDOP_remote_shutdown,
is very much like SCHEDOP_shutdown, but is called with
the id of the domain which is to be shut down. This allows
fully virtualized shutdown and para-virtualized shutdown
to be identical from that point forward.
A libxenctrl wrapper, xc_shutdown_domain has been added
and qemu now calls it.
With this change, both domain types shutdown/reboot using
the same dom0 management logic. All control decisions are
removed from qemu, which now simply handles the request
and reason. At a very high level, the flow is "notify of
shutdown and reason", "send VIRQ_DOM_EXC", process, and
destroy domain. Paravirtualized and fully-virtualized
domains would differ slightly in the first step of
notification.
Or, back to the opening sentence, make the operations as
symmetrical as possible.
As a freebie, #if 0 some very verbose logging code in qemu.
Totally unrelated, but as long as I was there...
Signed-off-by: Ben Thomas (ben@virtualiron.com)
--
------------------------------------------------------------------------
Ben Thomas Virtual Iron Software
bthomas@virtualiron.com Tower 1, Floor 2
978-849-1214 900 Chelmsford Street
Lowell, MA 01851
[-- Attachment #2: schedop.patch --]
[-- Type: text/x-patch, Size: 6894 bytes --]
diff -r e1152d55ea31 linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Wed Apr 5 17:41:51 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Thu Apr 6 09:27:37 2006 -0400
@@ -277,6 +277,7 @@ static int __init privcmd_init(void)
set_bit(__HYPERVISOR_mmu_update, hypercall_permission_map);
set_bit(__HYPERVISOR_mmuext_op, hypercall_permission_map);
set_bit(__HYPERVISOR_xen_version, hypercall_permission_map);
+ set_bit(__HYPERVISOR_sched_op, hypercall_permission_map);
privcmd_intf = create_xen_proc_entry("privcmd", 0400);
if (privcmd_intf != NULL)
diff -r e1152d55ea31 tools/ioemu/target-i386-dm/helper2.c
--- a/tools/ioemu/target-i386-dm/helper2.c Wed Apr 5 17:41:51 2006 +0100
+++ b/tools/ioemu/target-i386-dm/helper2.c Thu Apr 6 09:27:37 2006 -0400
@@ -409,12 +409,20 @@ void
void
destroy_hvm_domain(void)
{
- extern FILE* logfile;
- char destroy_cmd[32];
-
- sprintf(destroy_cmd, "xm destroy %d", domid);
- if (system(destroy_cmd) == -1)
- fprintf(logfile, "%s failed.!\n", destroy_cmd);
+ int xcHandle;
+ int sts;
+
+ xcHandle = xc_interface_open();
+ if (xcHandle < 0)
+ fprintf(logfile, "Cannot acquire xenctrl handle\n");
+ else {
+ sts = xc_domain_shutdown(xcHandle, domid, SHUTDOWN_poweroff);
+ if (sts != 0)
+ fprintf(logfile, "? xc_domain_shutdown failed to issue poweroff, sts %d, errno %d\n", sts, errno);
+ else
+ fprintf(logfile, "Issued domain %d poweroff\n", domid);
+ xc_interface_close(xcHandle);
+ }
}
fd_set wakeup_rfds;
@@ -480,13 +488,24 @@ int main_loop(void)
static void qemu_hvm_reset(void *unused)
{
- char cmd[64];
-
- /* pause domain first, to avoid repeated reboot request*/
- xc_domain_pause(xc_handle, domid);
-
- sprintf(cmd, "xm shutdown -R %d", domid);
- system(cmd);
+ int xcHandle;
+ int sts;
+
+ /* pause domain first, to avoid repeated reboot request*/
+ xc_domain_pause(xc_handle, domid);
+
+ xcHandle = xc_interface_open();
+ if (xcHandle < 0)
+ fprintf(logfile, "Cannot acquire xenctrl handle\n");
+ else {
+ sts = xc_domain_shutdown(xcHandle, domid, SHUTDOWN_reboot);
+ if (sts != 0)
+ fprintf(logfile, "? xc_domain_shutdown failed to issue reboot, sts %d\n", sts);
+ else
+ fprintf(logfile, "Issued domain %d reboot\n", domid);
+ xc_interface_close(xcHandle);
+ }
+
}
CPUState * cpu_init()
diff -r e1152d55ea31 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Wed Apr 5 17:41:51 2006 +0100
+++ b/tools/ioemu/vl.c Thu Apr 6 09:27:37 2006 -0400
@@ -2556,8 +2556,10 @@ static int set_mm_mapping(int xc_handle,
return -1;
}
+#if 0 /* Generates lots of log file output - turn on for debugging */
for (i = 0; i < nr_pages; i++)
fprintf(stderr, "set_map result i %x result %lx\n", i, extent_start[i]);
+#endif
return 0;
}
diff -r e1152d55ea31 tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c Wed Apr 5 17:41:51 2006 +0100
+++ b/tools/libxc/xc_domain.c Thu Apr 6 09:27:37 2006 -0400
@@ -57,6 +57,35 @@ int xc_domain_destroy(int xc_handle,
op.u.destroydomain.domain = (domid_t)domid;
return do_dom0_op(xc_handle, &op);
}
+
+int xc_domain_shutdown(int xc_handle,
+ uint32_t domid,
+ int reason)
+{
+ int ret = -1;
+ sched_remote_shutdown_t arg;
+ DECLARE_HYPERCALL;
+
+ hypercall.op = __HYPERVISOR_sched_op;
+ hypercall.arg[0] = (unsigned long)SCHEDOP_remote_shutdown;
+ hypercall.arg[1] = (unsigned long)&arg;
+ arg.domain_id = domid;
+ arg.reason = reason;
+
+ if ( mlock(&arg, sizeof(arg)) != 0 )
+ {
+ PERROR("Could not lock memory for Xen hypercall");
+ goto out1;
+ }
+
+ ret = do_xen_hypercall(xc_handle, &hypercall);
+
+ safe_munlock(&arg, sizeof(arg));
+
+ out1:
+ return ret;
+}
+
int xc_vcpu_setaffinity(int xc_handle,
uint32_t domid,
diff -r e1152d55ea31 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Wed Apr 5 17:41:51 2006 +0100
+++ b/tools/libxc/xenctrl.h Thu Apr 6 09:27:37 2006 -0400
@@ -205,6 +205,21 @@ int xc_domain_unpause(int xc_handle,
*/
int xc_domain_destroy(int xc_handle,
uint32_t domid);
+
+/**
+ * This function will shutdown a domain. This is intended for use in
+ * fully-virtualized domains where this operation is analogous to the
+ * sched_op operations in a paravirtualized domain. The caller is
+ * expected to give the reason for the shutdown.
+ *
+ * @parm xc_handle a handle to an open hypervisor interface
+ * @parm domid the domain id to destroy
+ * @parm reason is the reason (SHUTDOWN_xxx) for the shutdown
+ * @return 0 on success, -1 on failure
+ */
+int xc_domain_shutdown(int xc_handle,
+ uint32_t domid,
+ int reason);
int xc_vcpu_setaffinity(int xc_handle,
uint32_t domid,
diff -r e1152d55ea31 xen/common/schedule.c
--- a/xen/common/schedule.c Wed Apr 5 17:41:51 2006 +0100
+++ b/xen/common/schedule.c Thu Apr 6 09:27:37 2006 -0400
@@ -413,6 +413,30 @@ long do_sched_op(int cmd, GUEST_HANDLE(v
break;
}
+ case SCHEDOP_remote_shutdown:
+ {
+ struct domain *d;
+ struct sched_remote_shutdown sched_remote_shutdown;
+
+ if ( !IS_PRIV(current->domain) )
+ return -EPERM;
+
+ ret = -EFAULT;
+ if ( copy_from_guest(&sched_remote_shutdown, arg, 1) )
+ break;
+
+ ret = -ESRCH;
+ d = find_domain_by_id(sched_remote_shutdown.domain_id);
+ if ( d != NULL )
+ {
+ domain_shutdown(d, (u8)sched_remote_shutdown.reason);
+ put_domain(d);
+ ret = 0;
+ }
+
+ break;
+ }
+
default:
ret = -ENOSYS;
}
diff -r e1152d55ea31 xen/include/public/sched.h
--- a/xen/include/public/sched.h Wed Apr 5 17:41:51 2006 +0100
+++ b/xen/include/public/sched.h Thu Apr 6 09:27:37 2006 -0400
@@ -65,6 +65,19 @@ DEFINE_GUEST_HANDLE(sched_poll_t);
DEFINE_GUEST_HANDLE(sched_poll_t);
/*
+ * Declare a shutdown for another domain. The main use of this function is
+ * in interpreting shutdown requests and reasons for fully-virtualized
+ * domains. A para-virtualized domain may use SCHEDOP_shutdown directly.
+ * @arg == pointer to sched_remote_shutdown structure.
+ */
+#define SCHEDOP_remote_shutdown 4
+typedef struct sched_remote_shutdown {
+ domid_t domain_id; /* Remote domain ID */
+ unsigned int reason; /* SHUTDOWN_xxx reason */
+} sched_remote_shutdown_t;
+DEFINE_GUEST_HANDLE(sched_remote_shutdown_t);
+
+/*
* Reason codes for SCHEDOP_shutdown. These may be interpreted by control
* software to determine the appropriate action. For the most part, Xen does
* not care about the shutdown code.
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2006-04-06 13:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-03 15:57 [PATCH] - add symmetry to para and fully virtualized domain shutdown/reboot Ben Thomas
2006-04-03 16:58 ` Keir Fraser
2006-04-03 17:14 ` Ben Thomas
2006-04-03 18:18 ` Keir Fraser
2006-04-04 15:18 ` Edwin Zhai
2006-04-04 16:42 ` Keir Fraser
2006-04-04 15:15 ` Edwin Zhai
-- strict thread matches above, loose matches on Subject: below --
2006-04-06 13:31 Ben Thomas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.