[libvirt PATCH 23/31] src: util: rename some program macros

Fixes inconsistency with macro names for external programs. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- m4/virt-external-programs.m4 | 8 ++++---- src/util/virnetdevmidonet.c | 4 ++-- src/util/virnetdevopenvswitch.c | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4 index bd3cb1f7576..d905beed71d 100644 --- a/m4/virt-external-programs.m4 +++ b/m4/virt-external-programs.m4 @@ -61,8 +61,8 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ AC_PATH_PROG([UDEVADM], [udevadm], [udevadm], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [modprobe], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([RMMOD], [rmmod], [rmmod], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([MMCTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) - AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) + AC_PATH_PROG([MM_CTL], [mm-ctl], [mm-ctl], [$LIBVIRT_SBIN_PATH]) + AC_PATH_PROG([OVS_VSCTL], [ovs-vsctl], [ovs-vsctl], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([SCRUB], [scrub], [scrub], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([ADDR2LINE], [addr2line], [addr2line], [$LIBVIRT_SBIN_PATH]) AC_PATH_PROG([MDEVCTL], [mdevctl], [mdevctl], [$LIBVIRT_SBIN_PATH]) @@ -75,9 +75,9 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [ [Location or name of the radvd program]) AC_DEFINE_UNQUOTED([TC], ["$TC"], [Location or name of the tc program (see iproute2)]) - AC_DEFINE_UNQUOTED([MMCTL], ["$MMCTL"], + AC_DEFINE_UNQUOTED([MM_CTL], ["$MM_CTL"], [Location or name of the mm-ctl program]) - AC_DEFINE_UNQUOTED([OVSVSCTL], ["$OVSVSCTL"], + AC_DEFINE_UNQUOTED([OVS_VSCTL], ["$OVS_VSCTL"], [Location or name of the ovs-vsctl program]) AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"], [Location or name of the udevadm program]) diff --git a/src/util/virnetdevmidonet.c b/src/util/virnetdevmidonet.c index 354350ce1b7..be1b6e8a457 100644 --- a/src/util/virnetdevmidonet.c +++ b/src/util/virnetdevmidonet.c @@ -45,7 +45,7 @@ virNetDevMidonetBindPort(const char *ifname, virUUIDFormat(virtualport->interfaceID, virtportuuid); - cmd = virCommandNew(MMCTL); + cmd = virCommandNew(MM_CTL); virCommandAddArgList(cmd, "--bind-port", virtportuuid, ifname, NULL); @@ -79,7 +79,7 @@ virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport) virUUIDFormat(virtualport->interfaceID, virtportuuid); - cmd = virCommandNew(MMCTL); + cmd = virCommandNew(MM_CTL); virCommandAddArgList(cmd, "--unbind-port", virtportuuid, NULL); if (virCommandRun(cmd, NULL) < 0) { diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index dbb489d174d..89e55650083 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -151,7 +151,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, ovsport->profileID); } - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); @@ -199,7 +199,7 @@ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char { g_autoptr(virCommand) cmd = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); @@ -226,7 +226,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) size_t len; g_autoptr(virCommand) cmd = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); @@ -267,7 +267,7 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) return 0; } - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); @@ -373,7 +373,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, g_autoptr(virCommand) cmd = NULL; g_autofree char *output = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--if-exists", "--format=list", "--data=json", "--no-headings", "--columns=statistics", "list", @@ -439,7 +439,7 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) *master = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "iface-to-br", ifname, NULL); virCommandSetOutputBuffer(cmd, master); @@ -498,7 +498,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, return 0; tmpIfname++; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "get", "Interface", tmpIfname, "name", NULL); if (virCommandRun(cmd, &status) < 0 || @@ -525,7 +525,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, { g_autoptr(virCommand) cmd = NULL; - cmd = virCommandNew(OVSVSCTL); + cmd = virCommandNew(OVS_VSCTL); virNetDevOpenvswitchAddTimeout(cmd); virCommandAddArgList(cmd, "--", "--if-exists", "clear", "Port", ifname, "tag", -- 2.26.2