Skip to content

Commit

Permalink
migration: Fix coding style (whitespace issues)
Browse files Browse the repository at this point in the history
* Remove trailing whitespace (fixes 9 errors from checkpatch.pl).
  One comment line was longer than 80 characters, so wrap it
  and fix a typo, too.
* Replace tabs by blanks (fixes 1 error).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
stweil authored and Michael Tokarev committed Mar 10, 2015
1 parent 2a0457b commit 02942db
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions migration/rdma.c
Expand Up @@ -702,7 +702,7 @@ static void qemu_rdma_dump_id(const char *who, struct ibv_context *verbs)
verbs->device->ibdev_path,
port.link_layer,
(port.link_layer == IBV_LINK_LAYER_INFINIBAND) ? "Infiniband" :
((port.link_layer == IBV_LINK_LAYER_ETHERNET)
((port.link_layer == IBV_LINK_LAYER_ETHERNET)
? "Ethernet" : "Unknown"));
}

Expand Down Expand Up @@ -737,21 +737,21 @@ static void qemu_rdma_dump_gid(const char *who, struct rdma_cm_id *id)
* and validate what time of hardware it is.
*
* Unfortunately, this puts the user in a fix:
*
*
* If the source VM connects with an IPv4 address without knowing that the
* destination has bound to '[::]' the migration will unconditionally fail
* unless the management software is explicitly listening on the the IPv4
* address while using a RoCE-based device.
*
* If the source VM connects with an IPv6 address, then we're OK because we can
* throw an error on the source (and similarly on the destination).
*
*
* But in mixed environments, this will be broken for a while until it is fixed
* inside linux.
*
* We do provide a *tiny* bit of help in this function: We can list all of the
* devices in the system and check to see if all the devices are RoCE or
* Infiniband.
* Infiniband.
*
* If we detect that we have a *pure* RoCE environment, then we can safely
* thrown an error even if the management software has specified '[::]' as the
Expand All @@ -770,17 +770,17 @@ static int qemu_rdma_broken_ipv6_kernel(Error **errp, struct ibv_context *verbs)
/* This bug only exists in linux, to our knowledge. */
#ifdef CONFIG_LINUX

/*
/*
* Verbs are only NULL if management has bound to '[::]'.
*
*
* Let's iterate through all the devices and see if there any pure IB
* devices (non-ethernet).
*
*
* If not, then we can safely proceed with the migration.
* Otherwise, there are no guarantees until the bug is fixed in linux.
*/
if (!verbs) {
int num_devices, x;
int num_devices, x;
struct ibv_device ** dev_list = ibv_get_device_list(&num_devices);
bool roce_found = false;
bool ib_found = false;
Expand Down Expand Up @@ -825,8 +825,8 @@ static int qemu_rdma_broken_ipv6_kernel(Error **errp, struct ibv_context *verbs)

/*
* If we have a verbs context, that means that some other than '[::]' was
* used by the management software for binding. In which case we can actually
* warn the user about a potential broken kernel;
* used by the management software for binding. In which case we can
* actually warn the user about a potentially broken kernel.
*/

/* IB ports start with 1, not 0 */
Expand Down

0 comments on commit 02942db

Please sign in to comment.