From patchwork Mon Jul 1 16:47:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 168265 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3626915ilk; Mon, 1 Jul 2019 18:57:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzHtrK4fGTRJyAV9azru09nPjQ2KZpFl/9R45UseAfJbL8liHxgC9S0kZQX2HFCXGbG20AL X-Received: by 2002:a50:b388:: with SMTP id s8mr32592050edd.15.1562032675218; Mon, 01 Jul 2019 18:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562032675; cv=none; d=google.com; s=arc-20160816; b=RbbPihOtWKm0qc6k/DdKRhLPIGw5+9ncoLfuCMSRswQSrTACftOw3XqWWZzK+W7EQR 1IyVDorfCHBtrpLaSbhw39n9yEk9eRDOmzvBVZl5nI+4MdHLbsHn2nuCGuVV31LgVQjF eNnhLIoB0XsR+ovJmebzVm364tvrU3Ee3hmddUHR8zodapbhf6weCMHU4KG2A609KzIz 9yhIOQukvr8pz0CEudyI5nzO5lv/cXyIPFNaovtTwIx5F+HXMOlit8JXSbFNoFgLv4xC z+/1ToEtBaJvKanpWdVHK2GgibfvaiMsgivANWPRAJRjcVazU+J73CeDlDEB0hQqN9kJ Gk0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:message-id:date:to:from :dkim-signature; bh=H5JCIl/sTUYayqnfbnRrzXQvGcI9pQ/R8Eioapux/4s=; b=0RnoTtaagBYwp2Q5eDBOh2ycsebKklgFGff/q+sEAkz0bKYjn1T0Vcb1qw8iL6a8Hv hScd71hSJROo4H6wVnhg3HbMpM97hCTDuDVHWnqi0Wh1+ebswdv1M80KhJrxl77t2TJL ciMSZgaGihXWXIWGXgYeiRet9ygeCq/JT3SDsukX307puR1McjsMDegcMUmMlJZeZlcz 19/Ac6EiGerC4PyJNFDq75/Wj+FeIe7Ax21jxo48/Dyv6gL4m8wK+ac8a29CryY/A/8p HwLKQu7Cvlh+jCMDhPO74TrXrfJ/Gim0dogbGqVfxX9woyGcwGr2ZeyMH/dBpZWGABsg t0SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Du5eu6tt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 53si10842884edu.386.2019.07.01.18.57.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 01 Jul 2019 18:57:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Du5eu6tt; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi83O-0004co-5v for patch@linaro.org; Mon, 01 Jul 2019 21:57:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57261) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hi4Sv-00016G-BW for qemu-devel@nongnu.org; Mon, 01 Jul 2019 18:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hi4Sl-00028G-3h for qemu-devel@nongnu.org; Mon, 01 Jul 2019 18:07:55 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:44478) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hi4Se-00026G-5o for qemu-devel@nongnu.org; Mon, 01 Jul 2019 18:07:46 -0400 Received: by mail-wr1-f67.google.com with SMTP id e3so5910631wrs.11 for ; Mon, 01 Jul 2019 15:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H5JCIl/sTUYayqnfbnRrzXQvGcI9pQ/R8Eioapux/4s=; b=Du5eu6ttB/k2scC1BWfNTldbtY6WQnwnoC16Kw4lShjxs6BD31KoiJX9BaakyS77cQ 0TTvHscEIu8iv4ohqdBKUyR5h47fCASWe3iaNjsjDzJo8M2tFAbivbetldnly8wR4fv+ 9Q6gmkWt3KRfArbq8EOrCLN/MP2nlvZL7+Mjd7fMvTwsHH2uxx1rPdCsLFBkw2qeIA8r SkMxX8FP81nGVnTW170XG7K6kkT3N+Z7E+fDd72g3WXbo7PQSCcFEtQE1QMsMYBs8lJf VVj96pgn2+nPYQv+rAy1mvVySjAekVdv+ctpTyaJmKubenyJ57wwypqPL6vV5/Y+fzGm ESLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=H5JCIl/sTUYayqnfbnRrzXQvGcI9pQ/R8Eioapux/4s=; b=gYrzjvLhKg4MXQB+k+ybvUzv+bHzzDvmw2KH9wnovbFvDQwFbhKeTqqZsiDN2H1/b0 nQ2MzmbDxX0uK1hdk9tQ5n17KXKhqindhkN+yErifQJEgdHhBa7ZlDRfJ1HUtwqqCI9a jvyVa4RPBuZX667Sj/lHV9km2R09PXw4COyc4nt23ROZkwd+xQyGM8GX4Nii27MRGRRW /2Ll4YtRPZ0vyvTti8dXHvLg5elBjuTONDrRAw4kJ6VP98W76Q1bH0Pniw8QFHHE1v+Y +xkKzeLnm+1tGLbMFTW0PK7NcxBUlpsY3mX3JpYXs/CYjDKoCwr8YiIcY+VIrFkkTfK1 hXQw== X-Gm-Message-State: APjAAAXVruk+1w+XNUiq/APM6SKaMVDGs7/d55dgRJY8bn79hb8oppyZ w7bnZuEaGOZi7uLhJpJEq8sTkia+/aA= X-Received: by 2002:adf:f591:: with SMTP id f17mr20621432wro.119.1561999656586; Mon, 01 Jul 2019 09:47:36 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v204sm185026wmb.15.2019.07.01.09.47.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 01 Jul 2019 09:47:36 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A997D1FF87; Mon, 1 Jul 2019 17:47:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 1 Jul 2019 17:47:32 +0100 Message-Id: <20190701164732.30518-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.221.67 Subject: [Qemu-devel] [PATCH] migration: move port_attr inside CONFIG_LINUX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise the FreeBSD compiler complains about an unused variable. Signed-off-by: Alex Bennée --- migration/rdma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/migration/rdma.c b/migration/rdma.c index 74cb2aa9f9..3036221ee8 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -839,10 +839,9 @@ static void qemu_rdma_dump_gid(const char *who, struct rdma_cm_id *id) */ static int qemu_rdma_broken_ipv6_kernel(struct ibv_context *verbs, Error **errp) { - struct ibv_port_attr port_attr; - /* This bug only exists in linux, to our knowledge. */ #ifdef CONFIG_LINUX + struct ibv_port_attr port_attr; /* * Verbs are only NULL if management has bound to '[::]'.