From nobody Mon Feb 9 06:34:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1550516986385347.4646273568535; Mon, 18 Feb 2019 11:09:46 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 87BC4227A1; Mon, 18 Feb 2019 19:09:44 +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 56EEA5ED5A; Mon, 18 Feb 2019 19:09:44 +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 13DF3181A048; Mon, 18 Feb 2019 19:09:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1IJ9Swk019040 for ; Mon, 18 Feb 2019 14:09:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id D99C81024909; Mon, 18 Feb 2019 19:09:28 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0DF71001F5B for ; Mon, 18 Feb 2019 19:09:25 +0000 (UTC) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 34B8985360 for ; Mon, 18 Feb 2019 19:09:22 +0000 (UTC) Received: by mail-qt1-f173.google.com with SMTP id p48so20428570qtk.2 for ; Mon, 18 Feb 2019 11:09:22 -0800 (PST) Received: from localhost.localdomain ([177.95.254.156]) by smtp.gmail.com with ESMTPSA id s21sm9106768qki.94.2019.02.18.11.09.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 11:09:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=YcwHPvSsn3htfHA2qizJoA7aR6E7WTSPxip5NQ6fC+Q=; b=V4W101F91z4rYVfOxGeGcUg2LfBzwLKVaH950JfzlsrpTS5i+pTJ2rmbEHrj6sj6Wt H/PL/xxAEVQ9zqIJARCNhr35rzJ6QAeJh/eQiQj1C4cz5m6nt5cToP6OlJE4iblI74Ij oj3xEBcwUpOzlJYhVBs5Y929813yYLwJIG9miAST4jLVt5BCMGDIxkjzJXcMPZWdKRuh qZD7BlxmE4Ytx7BlaRBmEqIK/wNfjM5cYqbGS/nDTGJ7i1WyGhyLoK7YOs8LTiKvkD0/ g5iKVBymUlJfTOh/YO26iWk61S98S32DsYHqNfUq6gGOTkNWVsIuZyR1+nKe2OScgB+a Q7Ng== 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=YcwHPvSsn3htfHA2qizJoA7aR6E7WTSPxip5NQ6fC+Q=; b=Thzj8Sn3CY/pgAWraJBY5dqYAqMnPhqIMZwHMXaz9UxKlctsIYq6seVjC8/strHvGY Y997+06Zh5ZQmsSmZkx/OBAzoDc0GkBF3BDFopULcQ99rL+icbL8B8Go822fJFufX1KL lff2ILd+U8wPdT9gYFxqObbsTLB5Y1FpyqdfTIKPBK1C9PzRkkBr3dYv0rBUfHhcUunj 9Xuk0emG2dsMHnb1xRWXU8SMnKvVJLgbaY7uj2i5ZqUhWTJzm1ZRNX+IPUvF5Ybd21U3 iBO/pCLsjbJqZUtjeqnWfOKgrNwrq7+QFVhB/HmfDmQDhxKeINyqXWR/jFqVqlTbqmpi LQxQ== X-Gm-Message-State: AHQUAuZ5ja+++3ZvNeqO0EyBsN7HohQRH49DyZOvF9XS3dGx03C3BbFK vIvG3wqegjQLdPwsemdGoG9g9mOR X-Google-Smtp-Source: AHgI3IZrH332CMJT0FqBOswmbAZhuOwFhNKjJTaqGPndDNtloLH9vPu7lLv8p9J7yi6dFw0towSv2w== X-Received: by 2002:ac8:3f0f:: with SMTP id c15mr19500212qtk.142.1550516961239; Mon, 18 Feb 2019 11:09:21 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 18 Feb 2019 16:09:07 -0300 Message-Id: <20190218190910.22477-4-jcfaracco@gmail.com> In-Reply-To: <20190218190910.22477-1-jcfaracco@gmail.com> References: <20190218190910.22477-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 18 Feb 2019 19:09:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 18 Feb 2019 19:09:22 +0000 (UTC) for IP:'209.85.160.173' DOMAIN:'mail-qt1-f173.google.com' HELO:'mail-qt1-f173.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.11 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS) 209.85.160.173 mail-qt1-f173.google.com 209.85.160.173 mail-qt1-f173.google.com X-Scanned-By: MIMEDefang 2.83 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/6] lxc: Converting full string entries in types only. 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 18 Feb 2019 19:09:45 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit removes the full network entry setting: "lxc.network.X" to type only. Like "type", "name", "flags", etc. So, here no matter if the settings is "lxc.network.X" or "lxc.net.X.Y". Signed-off-by: Julio Faracco Reviewed-by: John Ferlan --- src/lxc/lxc_native.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index c144f3c52e..ed50415a93 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -562,7 +562,7 @@ lxcNetworkParseDataIPs(const char *name, virConfValuePt= r value, lxcNetworkParseD if (VIR_ALLOC(ip) < 0) return -1; =20 - if (STREQ(name, "lxc.network.ipv6")) + if (STREQ(name, "ipv6")) family =3D AF_INET6; =20 ipparts =3D virStringSplit(value->str, "/", 2); @@ -589,12 +589,11 @@ lxcNetworkParseDataIPs(const char *name, virConfValue= Ptr value, lxcNetworkParseD } =20 static int -lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data) +lxcNetworkParseDataSuffix(const char *name, virConfValuePtr value, lxcNetw= orkParseData *parseData) { - lxcNetworkParseData *parseData =3D data; int status; =20 - if (STREQ(name, "lxc.network.type")) { + if (STREQ(name, "type")) { virDomainDefPtr def =3D parseData->def; size_t networks =3D parseData->networks; bool privnet =3D parseData->privnet; @@ -619,30 +618,31 @@ lxcNetworkWalkCallback(const char *name, virConfValue= Ptr value, void *data) /* Keep the new value */ parseData->type =3D value->str; } - else if (STREQ(name, "lxc.network.link")) + else if (STREQ(name, "link")) parseData->link =3D value->str; - else if (STREQ(name, "lxc.network.hwaddr")) + else if (STREQ(name, "hwaddr")) parseData->mac =3D value->str; - else if (STREQ(name, "lxc.network.flags")) + else if (STREQ(name, "flags")) parseData->flag =3D value->str; - else if (STREQ(name, "lxc.network.macvlan.mode")) + else if (STREQ(name, "macvlan.mode")) parseData->macvlanmode =3D value->str; - else if (STREQ(name, "lxc.network.vlan.id")) + else if (STREQ(name, "vlan.id")) parseData->vlanid =3D value->str; - else if (STREQ(name, "lxc.network.name")) + else if (STREQ(name, "name")) parseData->name =3D value->str; - else if (STREQ(name, "lxc.network.ipv4") || - STREQ(name, "lxc.network.ipv6")) { + else if (STREQ(name, "ipv4") || + STREQ(name, "ipv6")) { if (lxcNetworkParseDataIPs(name, value, parseData) < 0) return -1; - } else if (STREQ(name, "lxc.network.ipv4.gateway")) { + } else if (STREQ(name, "ipv4.gateway")) { parseData->gateway_ipv4 =3D value->str; - } else if (STREQ(name, "lxc.network.ipv6.gateway")) { + } else if (STREQ(name, "ipv6.gateway")) { parseData->gateway_ipv6 =3D value->str; - } else if (STRPREFIX(name, "lxc.network")) { + } else { VIR_WARN("Unhandled network property: %s =3D %s", name, value->str); + return -1; } =20 return 0; --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list