From nobody Tue Nov 26 07:45:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=ixsystems.com ARC-Seal: i=1; a=rsa-sha256; t=1582353571; cv=none; d=zohomail.com; s=zohoarc; b=dEVw60HJum0Y+ZID/Zh13apymLy+rw9chMxfUiEalpzSYEatz2qep1RKqr0Ae4cQ0xByX9YTGBbDmJGQrO6+MvlaxxdwtUG9ibran3fdLMmILDSNKza1IxxwM42sZ1IgnBilijtF5FJ8VKpfz7JEJBhBVYcF80Td+1wXBmiJNbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582353571; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0108BU1I+kzPb9saqVvkbOMJcKsP/JB4eyqURMbjFC4=; b=kCqYZVJz08buJ5+2EX/h5ZRABDZiqywE8w1PKgW0X3zzC7yF0GEa1PGakCzilo2sFoT71l7jk5iSkez5P1EHDUawzig1jiOUZQLOHjZwpj/cs07umZA6LfRogX8ai7T0RGrRZ5bZ4F0gwlJAN82Ku84uhmSx0zroByil9KohBZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1582353571102472.1049407732256; Fri, 21 Feb 2020 22:39:31 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-446-ceJhQzVgPFCmy_ovAmSZiQ-1; Sat, 22 Feb 2020 01:39:27 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D32C8017CC; Sat, 22 Feb 2020 06:39:22 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 249265C105; Sat, 22 Feb 2020 06:39:22 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B4B6918089CE; Sat, 22 Feb 2020 06:39:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01M6dI9B021628 for ; Sat, 22 Feb 2020 01:39:18 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4D43C2166B2E; Sat, 22 Feb 2020 06:39:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 489222166B2B for ; Sat, 22 Feb 2020 06:39:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 652ED185A78E for ; Sat, 22 Feb 2020 06:39:16 +0000 (UTC) Received: from mail-yw1-f68.google.com (mail-yw1-f68.google.com [209.85.161.68]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-2-FEIuoyroPC-qeA1Ia9l14Q-1; Sat, 22 Feb 2020 01:39:14 -0500 Received: by mail-yw1-f68.google.com with SMTP id 192so2653402ywy.0 for ; Fri, 21 Feb 2020 22:39:13 -0800 (PST) Received: from xeon-freebsd.freqlabs.com. (69-228-200-148.lightspeed.knvltn.sbcglobal.net. [69.228.200.148]) by smtp.gmail.com with ESMTPSA id c84sm2482131ywa.1.2020.02.21.22.39.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 22:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582353569; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=0108BU1I+kzPb9saqVvkbOMJcKsP/JB4eyqURMbjFC4=; b=TaWMn+NAmHp6+kOXJHMqYOCYHASlU5BHyhtzjQoeNzAQVXH4KVrpezF5UJ2TqS2juCNddm UYUPfnaEbUCw9LScICO131m78fMK1AVrXMM+/xQShtjCbhWzW+605c6i6ce37VR0oBEMkb GYn+1F++wZAbynyHexwvF7PdzV6utIc= X-MC-Unique: ceJhQzVgPFCmy_ovAmSZiQ-1 X-MC-Unique: FEIuoyroPC-qeA1Ia9l14Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4lt9iEoxZecZ2N8aoMjmFGt7QFigp9OGh1jQX17pNA4=; b=tyPQEkjETWQzpthf4uHLQCrnGoORpRm7KyG5AQgpHiIo0IiO/ZesDeR9AZFcsPIrLI Zsr+knxvG/cnkcFRoIGO8byNIkj1bTemqmWGkOqhLNUmzxsiqcHQB8m7A5D24uEIEXQD K51Zl4Oopu1Sa9vy8/CsrrlpyEnZI6xuxoRM7gcfX7BeWb+AJckIoxqcrZgoTEAtqeQJ pyiJg0vPRSAkIxJPJ4utOguCo3cuiKd2d5tkVs3npaTWQyJjXlrPvahG/XC2fRQSgT3c c8BKcqvmoAbKtzGeoMIQ4tUDGFZj1sRfLkdmZA+HzxIf4HBQw18RwfyGc8T8i+yyQ5uY l7YQ== X-Gm-Message-State: APjAAAW/eqt35w7ZrDoJ0fr7FSWaAwb7nh3JuzB+yboVii3rSfGk+X48 /YDlDNm31vxPyNIaZuwcHa9HzPMoGTwvStdgldHDPndPQkyHrAhB8KUFMU68KtvoBfT8+x4jGev TK/BEeNhORJffeA9LvFfI/m7kB48mozvw2a96Dw833g7MLs9YzZ8fb0thdLwbiOwtfKo= X-Google-Smtp-Source: APXvYqzmc0hzxtTauEoERBXiB1/v4IAqGDD97GRDxUvNRlKZ/Il+uiWsvArxHOkUbGvz3ZqKn3nV5g== X-Received: by 2002:a25:ca8d:: with SMTP id a135mr41096375ybg.143.1582353553390; Fri, 21 Feb 2020 22:39:13 -0800 (PST) From: Ryan Moeller X-Google-Original-From: Ryan Moeller To: libvir-list@redhat.com Subject: [PATCH 01/16] Fix build errors on FreeBSD Date: Sat, 22 Feb 2020 01:38:40 -0500 Message-Id: <20200222063855.89637-2-ryan@iXsystems.com> In-Reply-To: <20200222063855.89637-1-ryan@iXsystems.com> References: <20200222063855.89637-1-ryan@iXsystems.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 01M6dI9B021628 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Don't free the file string until after it has been used to print the error message. I was seeing `undefined symbol: rpl_ioctl` so followed the example set by 05a38d4c4ac035ca5dac0f00ce641a8f9b087831 Signed-off-by: Ryan Moeller --- src/bhyve/bhyve_process.c | 1 - src/conf/virnetworkobj.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 519604f898..14f718403d 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 299cdba52d..1ec1585d1c 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1894,13 +1894,12 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, file =3D g_strdup_printf("%s/%s.xml", dir, de->d_name); =20 portdef =3D virNetworkPortDefParseFile(file); - VIR_FREE(file); - file =3D NULL; - if (!portdef) { VIR_WARN("Cannot parse port %s", file); + VIR_FREE(file); continue; } + VIR_FREE(file); =20 virUUIDFormat(portdef->uuid, uuidstr); if (virHashAddEntry(net->ports, uuidstr, portdef) < 0) --=20 2.24.1