From a2ed069746f1ae69d202ce4a62d237ed5d96cf04 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Mon, 11 Apr 2016 11:44:29 +0200 Subject: [PATCH] qemu: parse vlan trunks Fixes an error when trying to edit a network with assigned trunks. --- www/manager6/Parser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js index 7750434e..f92449a4 100644 --- a/www/manager6/Parser.js +++ b/www/manager6/Parser.js @@ -47,6 +47,8 @@ Ext.define('PVE.Parser', { statics: { res.disconnect = match_res[1]; } else if ((match_res = p.match(/^queues=(\d+)$/)) !== null) { res.queues = match_res[1]; + } else if ((match_res = p.match(/^trunks=(\d+(?:-\d+)?(?:;\d+(?:-\d+)?)*)$/)) !== null) { + res.trunks = match_res[1]; } else { errors = true; return false; // break @@ -84,6 +86,9 @@ Ext.define('PVE.Parser', { statics: { if (net.disconnect) { netstr += ",link_down=" + net.disconnect; } + if (net.trunks) { + netstr += ",trunks=" + net.trunks; + } return netstr; },