From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek =?utf-8?Q?Marczykowski-G=C3=B3recki?= Subject: [PATCH for-4.7, 4.6] libxl: do not assume Dom0 backend while getting nic info Date: Mon, 5 Sep 2016 12:15:26 +0200 Message-ID: <20160905101526.GA21832@mail-itl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5114735186979189863==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xen.org Cc: Wei Liu , Ian Jackson , Marek =?utf-8?Q?Marczykowski-G=C3=B3recki?= List-Id: xen-devel@lists.xenproject.org --===============5114735186979189863== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Fill backend_domid field based on backend path. Cc: Ian Jackson Cc: Wei Liu Signed-off-by: Marek Marczykowski-G=C3=B3recki --- tools/libxl/libxl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e1ab6ec..9a888a1 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3601,6 +3601,18 @@ static int libxl__device_nic_from_xenstore(libxl__gc= *gc, else nic->devid =3D 0; =20 + rc =3D libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/backend", libxl_path), &tmp); + if (rc) goto out; + + if (!tmp) { + LOG(ERROR, "nic %s does not exist (no backend path)", libxl_path); + rc =3D ERROR_FAIL; + goto out; + } + rc =3D libxl__backendpath_parse_domid(gc, tmp, &nic->backend_domid); + if (rc) goto out; + /* nic->mtu =3D */ =20 tmp =3D READ_LIBXLDEV(gc, "mac"); --=20 2.5.5 --h31gzZEtNLTqOjlF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEbBAEBCAAGBQJXzUW/AAoJENuP0xzK19csnLQH+ItQwY9/mlRK4zkHnwVyiVjH wZevNrRJgm5IgNhmpoDrmo/Tad1Q7IIMNeLHU8W86fj8kxtNnQs3E6x1jSP/0TLS 0F6E+z40QNzcHfhrWD/jPVer0LNsQmyMt/OnEm+ihkBoDc8QZo+0o573OuNEB63v VVQs9em7HcToYvMz9ir2TcK/4Ghc/FvtZu7bLRWgbMr/QgjVScxqrpnL7MdMPfDI QNviwiAg0Lhfub1TPi+hMU/6u9rU++j9QWpxlmimeaWWm5Pq0018FTO70qkPwDUR sCLG1PdtA5dIQ1yY78VzQAOc2vzN6fLpW9hMbbJq/Q7z+SwtXxBGN8UVEoXIRQ== =58Pk -----END PGP SIGNATURE----- --h31gzZEtNLTqOjlF-- --===============5114735186979189863== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5v cmcveGVuLWRldmVsCg== --===============5114735186979189863==--