[libvirt] [PATCH 1/2] virsh: Move daemon to misc since its not a network
Move the 'Daemon' entry to the Miscellaneous section since its not a networking driver or component. --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 242f789..8592df9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2696,9 +2696,6 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif -#ifdef WITH_LIBVIRTD - vshPrint(ctl, " Daemon"); -#endif #ifdef WITH_NETWORK vshPrint(ctl, " Network"); #endif @@ -2747,6 +2744,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); +#ifdef WITH_LIBVIRTD + vshPrint(ctl, " Daemon"); +#endif #ifdef WITH_NODE_DEVICES vshPrint(ctl, " Nodedev"); #endif -- 1.7.8.6
Match upstream's naming of QEMU. There was a notice on the ML that said the preferred spelling was QEMU a while back. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8592df9..6ade4a6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2652,7 +2652,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "%s", _("Compiled with support for:\n")); vshPrint(ctl, "%s", _(" Hypervisors:")); #ifdef WITH_QEMU - vshPrint(ctl, " QEmu/KVM"); + vshPrint(ctl, " QEMU/KVM"); #endif #ifdef WITH_LXC vshPrint(ctl, " LXC"); -- 1.7.8.6
On Sun, Sep 9, 2012 at 5:07 PM, Doug Goldstein <cardoe@cardoe.com> wrote:
Match upstream's naming of QEMU. There was a notice on the ML that said the preferred spelling was QEMU a while back. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c index 8592df9..6ade4a6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2652,7 +2652,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "%s", _("Compiled with support for:\n")); vshPrint(ctl, "%s", _(" Hypervisors:")); #ifdef WITH_QEMU - vshPrint(ctl, " QEmu/KVM"); + vshPrint(ctl, " QEMU/KVM"); #endif #ifdef WITH_LXC vshPrint(ctl, " LXC"); -- 1.7.8.6
Bump for review. -- Doug Goldstein
On 09/09/2012 04:07 PM, Doug Goldstein wrote:
Match upstream's naming of QEMU. There was a notice on the ML that said the preferred spelling was QEMU a while back. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
ACK and pushed, although we probably have a lot more offenders in src/qemu/qemu_*.c.
diff --git a/tools/virsh.c b/tools/virsh.c index 8592df9..6ade4a6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2652,7 +2652,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "%s", _("Compiled with support for:\n")); vshPrint(ctl, "%s", _(" Hypervisors:")); #ifdef WITH_QEMU - vshPrint(ctl, " QEmu/KVM"); + vshPrint(ctl, " QEMU/KVM"); #endif #ifdef WITH_LXC vshPrint(ctl, " LXC");
-- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Sun, Sep 9, 2012 at 5:07 PM, Doug Goldstein <cardoe@cardoe.com> wrote:
Move the 'Daemon' entry to the Miscellaneous section since its not a networking driver or component. --- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c index 242f789..8592df9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2696,9 +2696,6 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif -#ifdef WITH_LIBVIRTD - vshPrint(ctl, " Daemon"); -#endif #ifdef WITH_NETWORK vshPrint(ctl, " Network"); #endif @@ -2747,6 +2744,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, "\n");
vshPrint(ctl, "%s", _(" Miscellaneous:")); +#ifdef WITH_LIBVIRTD + vshPrint(ctl, " Daemon"); +#endif #ifdef WITH_NODE_DEVICES vshPrint(ctl, " Nodedev"); #endif -- 1.7.8.6
Bump for review. -- Doug Goldstein
On 09/09/2012 04:07 PM, Doug Goldstein wrote:
Move the 'Daemon' entry to the Miscellaneous section since its not a networking driver or component.
I had to run 'virsh --version=long' to see the impact of this patch in context, but once I did that, it makes total sense.
--- tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
ACK and pushed. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Doug Goldstein -
Eric Blake