virnetdevopenvswitch: Add vmuuid notes on virNetDevOpenvswitchInterfaceSetQos

Add vmuuid notes on virNetDevOpenvswitchInterfaceSetQos,
and change vmid to vmuuid.

Signed-off-by: Jinsheng Zhang <zhangjl02@inspur.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 7a64a8dbe6a6445bc3b5efea0c10cc8ce214cb3d..d86ad0eafdfa2b5038ee834c8ccb28c989d0c86d 100644 (file)
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -624,6 +624,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
  * virNetDevOpenvswitchInterfaceSetQos:
  * @ifname: on which interface
  * @bandwidth: rates to set (may be NULL)
+ * @vmuuid: the Domain UUID that has this interface
  * @swapped: true if IN/OUT should be set contrariwise
  *
  * Update qos configuration of an OVS port.
@@ -640,7 +641,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
 int
 virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
                                     const virNetDevBandwidth *bandwidth,
-                                    const unsigned char *vmid,
+                                    const unsigned char *vmuuid,
                                     bool swapped)
 {
     virNetDevBandwidthRate *rx = NULL; /* From domain POV */
@@ -674,7 +675,7 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
     }
 
     if (!bandwidth->out && !bandwidth->in) {
-        if (virNetDevOpenvswitchInterfaceClearQos(ifname, vmid) < 0) {
+        if (virNetDevOpenvswitchInterfaceClearQos(ifname, vmuuid) < 0) {
             VIR_WARN("Clean qos for interface %s failed", ifname);
         }
         return 0;
@@ -699,7 +700,7 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
 
         /* find queue */
         cmd = virNetDevOpenvswitchCreateCmd();
-        virUUIDFormat(vmid, vmuuidstr);
+        virUUIDFormat(vmuuid, vmuuidstr);
         vmid_ex_id = g_strdup_printf("external-ids:vm-id=\"%s\"", vmuuidstr);
         ifname_ex_id = g_strdup_printf("external-ids:ifname=\"%s\"", ifname);
         virCommandAddArgList(cmd, "--no-heading", "--columns=_uuid", "find", "queue",
@@ -801,7 +802,7 @@ virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
 
 int
 virNetDevOpenvswitchInterfaceClearQos(const char *ifname,
-                                      const unsigned char *vmid)
+                                      const unsigned char *vmuuid)
 {
     char vmuuidstr[VIR_UUID_STRING_BUFLEN];
     g_autoptr(virCommand) cmd = NULL;
@@ -813,7 +814,7 @@ virNetDevOpenvswitchInterfaceClearQos(const char *ifname,
 
     /* find qos */
     cmd = virNetDevOpenvswitchCreateCmd();
-    virUUIDFormat(vmid, vmuuidstr);
+    virUUIDFormat(vmuuid, vmuuidstr);
     vmid_ex_id = g_strdup_printf("external-ids:vm-id=\"%s\"", vmuuidstr);
     virCommandAddArgList(cmd, "--no-heading", "--columns=_uuid", "find", "qos", vmid_ex_id, NULL);
     virCommandSetOutputBuffer(cmd, &qos_uuid);

diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index 2dcd1aec6bc3c38766624bb1bb753eb25ec0bd3f..b16c8fe318296f99680e872ccdb89a459b9d2569 100644 (file)
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -73,10 +73,10 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
 
 int virNetDevOpenvswitchInterfaceSetQos(const char *ifname,
                                         const virNetDevBandwidth *bandwidth,
-                                        const unsigned char *vmid,
+                                        const unsigned char *vmuuid,
                                         bool swapped)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT;
 
 int virNetDevOpenvswitchInterfaceClearQos(const char *ifname,
-                                          const unsigned char *vmid)
+                                          const unsigned char *vmuuid)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;