From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christian Limpach <christian.limpach@gmail.com>
Subject: Re: [PATCH] fix the control panel problem for latest tree
Date: Fri, 16 Sep 2005 19:51:17 +0100
Message-ID: <3d8eece205091611511f17b6e1@mail.gmail.com>
References: <3ACA40606221794F80A5670F0AF15F84098454E1@pdsmsx403>
Reply-To: Christian.Limpach@cl.cam.ac.uk
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <3ACA40606221794F80A5670F0AF15F84098454E1@pdsmsx403>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "Ling, Xiaofeng" <xiaofeng.ling@intel.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Thanks!

On 9/16/05, Ling, Xiaofeng <xiaofeng.ling@intel.com> wrote:
> The new image handling structure break the vmx guest loading, this patch
> fix it.
>=20
> Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
>=20
> diff -r fe916b4a7d74 -r 089ec1b6817c tools/python/xen/xend/image.py
> --- a/tools/python/xen/xend/image.py    Fri Sep 16 02:53:39 2005
> +++ b/tools/python/xen/xend/image.py    Fri Sep 16 06:30:21 2005
> @@ -271,9 +271,10 @@
>     def configure(self, config):
>         ImageHandler.configure(self, config)
>         if not config:
> -            self.memmap, self.dmargs, self.device_model, self.display =
=3D self.vm.gatherVm(
> +            self.memmap, dmargs, self.device_model, self.display =3D sel=
f.vm.gatherVm(
>                 ("image/memmap"), ("image/dmargs"), ("image/device-model"=
),
>                 ("image/display"))
> +            self.dmargs =3D dmargs.split(' ')
>             return
>=20
>         self.memmap =3D sxp.child_value(config, 'memmap')
> @@ -283,10 +284,10 @@
>             raise VmError("vmx: missing device model")
>         self.display =3D sxp.child_value(config, 'display')
>=20
> -        self.storeVm(("image/memmap", self.memmap),
> -                     ("image/dmargs", self.dmargs),
> -                     ("image/device-model", self.device_model),
> -                     ("image/display", self.display))
> +        self.vm.storeVm(("image/memmap", self.memmap),
> +                        ("image/dmargs", " ".join(self.dmargs)),
> +                        ("image/device-model", self.device_model),
> +                        ("image/display", self.display))
>=20
>     def createImage(self):
>         """Create a VM for the VMX environment.
> @@ -346,7 +347,7 @@
>                 ret.append("%s" % v)
>=20
>         # Handle disk/network related options
> -        devices =3D sxp.children(config, 'device')
> +        devices =3D sxp.children(self.vm.config, 'device')
>         for device in devices:
>             name =3D sxp.name(sxp.child0(device))
>             if name =3D=3D 'vbd':
>=20
>=20
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
>=20
>=20
>=20
>