[Xen-devel] RE: [PATCH] [VT] removal of contorl interface from vmx domain builder

["Kamble, Nitin A" <nitin.a.kamble@xxxxxxxxx>]

I have applied it to xen-vt-testing branch.

More fixes for VMX guests to control panel. the control_evtchn has been removed 
by Christian from the dom0 kernel & linux dom builder. This patch cleans up the 
VMX builder part accordingly.
Signed-off-by: Nitin Kamble <nitin.a.kamble@xxxxxxxxx>

diff -r fd32207ac4f3 -r 7d9290c87c5a tools/libxc/xenguest.h
--- a/tools/libxc/xenguest.h    Fri Sep  9 00:29:36 2005
+++ b/tools/libxc/xenguest.h    Fri Sep  9 17:29:37 2005
@@ -60,7 +60,6 @@
                  struct mem_map *memmap,
                  const char *ramdisk_name,
                  const char *cmdline,
-                 unsigned int control_evtchn,
                  unsigned long flags,
                  unsigned int vcpus,
                  unsigned int store_evtchn,
diff -r fd32207ac4f3 -r 7d9290c87c5a tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Fri Sep  9 00:29:36 2005
+++ b/tools/python/xen/lowlevel/xc/xc.c Fri Sep  9 17:29:37 2005
@@ -306,20 +306,20 @@
     u32   dom;
     char *image, *ramdisk = NULL, *cmdline = "";
     PyObject *memmap;
-    int   control_evtchn, store_evtchn, device_evtchn;
+    int   store_evtchn, device_evtchn;
     int flags = 0, vcpus = 1;
     int numItems, i;
     int memsize;
     struct mem_map mem_map;
     unsigned long store_mfn = 0;

-    static char *kwd_list[] = { "dom", "control_evtchn", "store_evtchn",
+    static char *kwd_list[] = { "dom", "store_evtchn",
                                 "device_evtchn", "memsize", "image", "memmap",
                                "ramdisk", "cmdline", "flags",
                                "vcpus", NULL };

-    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiiisO!|ssii", kwd_list,
-                                      &dom, &control_evtchn, &store_evtchn,
+    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiisO!|ssii", kwd_list,
+                                      &dom, &store_evtchn,
                                       &device_evtchn, &memsize,
                                       &image, &PyList_Type, &memmap,
                                      &ramdisk, &cmdline, &flags, &vcpus) )
@@ -374,7 +374,7 @@
     }

     if ( xc_vmx_build(xc->xc_handle, dom, memsize, image, &mem_map,
-                        ramdisk, cmdline, control_evtchn, flags,
+                        ramdisk, cmdline, flags,
                         vcpus, store_evtchn, device_evtchn, &store_mfn) != 0 )
         return PyErr_SetFromErrno(xc_error);

diff -r fd32207ac4f3 -r 7d9290c87c5a tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Fri Sep  9 00:29:36 2005
+++ b/tools/python/xen/xend/image.py    Fri Sep  9 17:29:37 2005
@@ -305,7 +305,6 @@
             store_evtchn = 0
         ret = xc.vmx_build(dom            = self.vm.getDomain(),
                             image          = self.kernel,
-                            control_evtchn = self.vm.channel.getRemotePort(),
                             store_evtchn   = store_evtchn,
                             device_evtchn  = self.device_channel.port2,
                             memsize        = self.vm.memory,

Thanks & Regards,
Nitin
-----------------------------------------------------------------------------------
Sr Software Engineer
Open Source Technology Center, Intel Corp
________________________________________
From: Kamble, Nitin A 
Sent: Thursday, September 08, 2005 12:15 PM
To: xen-devel
Cc: 'Christian.Limpach@xxxxxxxxxxxx'
Subject: [PATCH] [VT] removal of contorl interface from vmx domain builder

Christian, Ian, Keir,
     I am going to apply this patch to the xen-vt-testing & xen-vt-unstable 
branches.

# HG changeset patch
# User nitin@xxxxxxxxxxxxxxxxxxxx
# Node ID 840e348a334efed62c441f5f06b5b675b15fdda5
# Parent  e169d4e9edfbb4baa744e130366eae2a6b8ec3da
Removing control interfaces from the vmx domain builder, as they are removed 
from the kernels by Christian with the changeset 549f4256ab3c
Signed-off-by: Nitin Kamble <nitin.a.kamble@xxxxxxxxx>

diff -r e169d4e9edfb -r 840e348a334e tools/libxc/xc_vmx_build.c
--- a/tools/libxc/xc_vmx_build.c    Thu Sep  8 17:58:40 2005
+++ b/tools/libxc/xc_vmx_build.c    Thu Sep  8 19:11:25 2005
@@ -241,7 +241,6 @@
                          vcpu_guest_context_t *ctxt,
                          const char *cmdline,
                          unsigned long shared_info_frame,
-                         unsigned int control_evtchn,
                          unsigned long flags,
                          unsigned int vcpus,
                          unsigned int store_evtchn,
@@ -611,7 +610,6 @@
     start_info->flags        = flags;
     start_info->pt_base      = vpt_start;
     start_info->nr_pt_frames = nr_pt_pages;
-    start_info->domain_controller_evtchn = control_evtchn;
     start_info->store_mfn    = *store_mfn;
     start_info->store_evtchn = store_evtchn;
     munmap(start_info, PAGE_SIZE);
@@ -691,7 +689,6 @@
                    struct mem_map *mem_mapp,
                    const char *ramdisk_name,
                    const char *cmdline,
-                   unsigned int control_evtchn,
                    unsigned long flags,
                    unsigned int vcpus,
                    unsigned int store_evtchn,
@@ -771,7 +768,7 @@
                        initrd_gfd, initrd_size, nr_pages,
                        ctxt, cmdline,
                        op.u.getdomaininfo.shared_info_frame,
-                       control_evtchn, flags, vcpus, store_evtchn,
+                       flags, vcpus, store_evtchn,
                        device_evtchn, store_mfn,
                        mem_mapp) < 0 )
     {

Thanks & Regards,
Nitin
-----------------------------------------------------------------------------------
Sr Software Engineer
Open Source Technology Center, Intel Corp


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel