From 540c750cf41f3a670f0955ad393a16fb3a0ca39c Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 12 Dec 2013 13:47:54 -0500 Subject: [PATCH] stapvirt: clarify that power cycling is required Using 'restart' misleads people into thinking the guest OS just needs to be restarted when really a full powering off of the machine is required. --- man/stapvirt.1 | 10 +++++----- stapvirt.c | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/man/stapvirt.1 b/man/stapvirt.1 index cbe63ace8..0ffdb4007 100644 --- a/man/stapvirt.1 +++ b/man/stapvirt.1 @@ -83,7 +83,7 @@ List available domains. .IP "\fBport-add\fR \fIDOMAIN\fR" Add a permanent SystemTap port to the domain's definition. If the domain is -currently running, it must be restarted before changes take effect. +currently running, it must be powered off before changes take effect. .IP "\fBport-list\fR \fIDOMAIN\fR" List the UNIX socket paths of the permanent SystemTap ports in the domain's @@ -91,7 +91,7 @@ definition. .IP "\fBport-remove\fR \fIDOMAIN\fR" Remove a permanent SystemTap port from the domain's definition. If the domain is -currently running, it must be restarted before changes take effect. +currently running, it must be powered off before changes take effect. .IP "\fBquery\fR \fIDOMAIN\fR" Display the following information about the domain: its name, its UUID, its @@ -173,8 +173,8 @@ It now indicates that there is 1 permanent port. We can also use the /var/lib/libvirt/qemu/TestVM.org.systemtap.stapsh.0.sock .ESAMPLE -After stopping and restarting the domain, we are now ready to use the port with -\fIstap\fR: +After powering off and restarting the domain, we are now ready to use the port +with \fIstap\fR: .SAMPLE \fB$\fR stap -e 'probe begin { printf("Hello from TestVM!\\n"); exit() }' \\ @@ -188,7 +188,7 @@ command: .SAMPLE \fB$\fR stapvirt port-remove TestVM Removed port org.systemtap.stapsh.0 -The domain must be restarted before changes take effect. +The domain must be powered off before changes take effect. .ESAMPLE And that's all there is to it! diff --git a/stapvirt.c b/stapvirt.c index e777fa092..51abcc1c7 100644 --- a/stapvirt.c +++ b/stapvirt.c @@ -883,7 +883,7 @@ cmd_port_add() printf("Added new port %s\n", getXmlPortName(newPort)); if (virDomainIsActive(targetDom) == 1) // helpful hint for user - printf("The domain must be restarted before changes take effect.\n"); + printf("The domain must be powered off before changes take effect.\n"); goto cleanup; error: @@ -918,7 +918,7 @@ cmd_port_remove() printf("Removed port %s\n", getXmlPortName(maxPort)); if (virDomainIsActive(targetDom) == 1) // helpful hint for user - printf("The domain must be restarted before changes take effect.\n"); + printf("The domain must be powered off before changes take effect.\n"); goto cleanup; error: @@ -1229,7 +1229,7 @@ cleanup: static void usage(int code) { - // 80 screen width = 94 here + // 80 screen width = 94 here --> put last printed char in col 93 at the V after this... V // The port-add command purposely does not also hotplug the port, even if // supported // - It would make it harder to figure out the final state @@ -1256,15 +1256,15 @@ usage(int code) eprintf(" List available domains.\n"); eprintf(" port-add \n"); eprintf(" Add a permanent SystemTap port to the domain's definition. If the\n"); - eprintf(" domain is currently running, it must be restarted before changes take\n"); - eprintf(" effect.\n"); + eprintf(" domain is currently running, it must be powered off before changes\n"); + eprintf(" take effect.\n"); eprintf(" port-list \n"); eprintf(" List the UNIX socket paths of the permanent SystemTap ports in the\n"); eprintf(" domain's definition.\n"); eprintf(" port-remove \n"); eprintf(" Remove a permanent SystemTap port from the domain's definition. If\n"); - eprintf(" the domain is currently running, it must be restarted before changes\n"); - eprintf(" take effect.\n"); + eprintf(" the domain is currently running, it must be powered off before\n"); + eprintf(" changes take effect.\n"); eprintf(" query \n"); eprintf(" Display the following information about the domain: its name, its\n"); eprintf(" UUID, its state, the number of permanent SystemTap ports installed,\n"); -- 2.43.5