External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 12:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Cleanup virsh -V output

Browse Source 
Fixed up virsh -V output by removing invalid WITH_PROXY & WITH_ONE
checks, adding several missing checks, and fixing the DTrace check.

Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 9faaaba432851b093b7fac880e0fac17bf8fee96)
This commit is contained in:
Doug Goldstein 2012-06-26 13:31:31 -05:00 committed by Cole Robinson
parent 6fba8c1f37
commit 87924a1345
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tools/virsh.c
View File

@ -19776,35 +19776,41 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
vshPrint(ctl, "%s", _("Compiled with support for:\n")); vshPrint(ctl, "%s", _("Compiled with support for:\n"));
vshPrint(ctl, "%s", _(" Hypervisors:")); vshPrint(ctl, "%s", _(" Hypervisors:"));
#ifdef WITH_XEN
vshPrint(ctl, " Xen");
#endif
#ifdef WITH_QEMU #ifdef WITH_QEMU
vshPrint(ctl, " QEmu/KVM"); vshPrint(ctl, " QEmu/KVM");
#endif #endif
#ifdef WITH_UML
vshPrint(ctl, " UML");
#endif
#ifdef WITH_OPENVZ
vshPrint(ctl, " OpenVZ");
#endif
#ifdef WITH_VBOX
vshPrint(ctl, " VirtualBox");
#endif
#ifdef WITH_XENAPI
vshPrint(ctl, " XenAPI");
#endif
#ifdef WITH_LXC #ifdef WITH_LXC
vshPrint(ctl, " LXC"); vshPrint(ctl, " LXC");
#endif #endif
#ifdef WITH_ESX #ifdef WITH_UML
vshPrint(ctl, " ESX"); vshPrint(ctl, " UML");
#endif
#ifdef WITH_XEN
vshPrint(ctl, " Xen");
#endif
#ifdef WITH_LIBXL
vshPrint(ctl, " LibXL");
#endif
#ifdef WITH_OPENVZ
vshPrint(ctl, " OpenVZ");
#endif
#ifdef WITH_VMWARE
vshPrint(ctl, " VMWare");
#endif #endif
#ifdef WITH_PHYP #ifdef WITH_PHYP
vshPrint(ctl, " PHYP"); vshPrint(ctl, " PHYP");
#endif #endif
#ifdef WITH_ONE #ifdef WITH_VBOX
vshPrint(ctl, " ONE"); vshPrint(ctl, " VirtualBox");
#endif
#ifdef WITH_ESX
vshPrint(ctl, " ESX");
#endif
#ifdef WITH_HYPERV
vshPrint(ctl, " Hyper-V");
#endif
#ifdef WITH_XENAPI
vshPrint(ctl, " XenAPI");
#endif #endif
#ifdef WITH_TEST #ifdef WITH_TEST
vshPrint(ctl, " Test"); vshPrint(ctl, " Test");
@ -19815,9 +19821,6 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
#ifdef WITH_REMOTE #ifdef WITH_REMOTE
vshPrint(ctl, " Remote"); vshPrint(ctl, " Remote");
#endif #endif
#ifdef WITH_PROXY
vshPrint(ctl, " Proxy");
#endif
#ifdef WITH_LIBVIRTD #ifdef WITH_LIBVIRTD
vshPrint(ctl, " Daemon"); vshPrint(ctl, " Daemon");
#endif #endif
@ -19828,7 +19831,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
vshPrint(ctl, " Bridging"); vshPrint(ctl, " Bridging");
#endif #endif
#ifdef WITH_NETCF #ifdef WITH_NETCF
vshPrint(ctl, " Netcf"); vshPrint(ctl, " Interface");
#endif #endif
#ifdef WITH_NWFILTER #ifdef WITH_NWFILTER
vshPrint(ctl, " Nwfilter"); vshPrint(ctl, " Nwfilter");
@ -19863,6 +19866,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
vshPrint(ctl, "\n"); vshPrint(ctl, "\n");
vshPrint(ctl, "%s", _(" Miscellaneous:")); vshPrint(ctl, "%s", _(" Miscellaneous:"));
#ifdef WITH_NODE_DEVICES
vshPrint(ctl, " Nodedev");
#endif
#ifdef WITH_SECDRIVER_APPARMOR #ifdef WITH_SECDRIVER_APPARMOR
vshPrint(ctl, " AppArmor"); vshPrint(ctl, " AppArmor");
#endif #endif
@ -19875,7 +19881,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED)
#ifdef ENABLE_DEBUG #ifdef ENABLE_DEBUG
vshPrint(ctl, " Debug"); vshPrint(ctl, " Debug");
#endif #endif
#ifdef WITH_DTRACE #ifdef WITH_DTRACE_PROBES
vshPrint(ctl, " DTrace"); vshPrint(ctl, " DTrace");
#endif #endif
#ifdef USE_READLINE #ifdef USE_READLINE