bitkeeper revision 1.887 (4097b05dfqiNExFc7NLZAf6Uh05KNw)

Manual merge.

diff --cc tools/examples/xc_dom_create.py
index 382d580032481c5513241f0167be7c4ce81606d4,e803737ef0c6594dbafb523a4c74579c81e7560e..0a66613da4aff62c3676b263e0e9b0bc156fd212
--- 1/tools/examples/xc_dom_create.py
--- 2/tools/examples/xc_dom_create.py
+++ b/tools/examples/xc_dom_create.py
@@@ -248,12 -239,8 +248,8 @@@ def make_domain()
        xc.domain_destroy ( dom=id )
        sys.exit()
  
-     # will the domain have IO privileges?
-     if pci_device_list != []: io_priv = True
-     else:                     io_priv = False
- 
      if restore:
 -        ret = eval('xc.%s_restore ( dom=id, state_file=state_file, progress=1 )' % builder_fn )
 +        ret = eval('xc.%s_restore ( dom=id, state_file=state_file, progress=1)' % (builder_fn) )
          if ret < 0:
              print "Error restoring domain"
              print "Return code = " + str(ret)
@@@ -261,7 -248,7 +257,7 @@@
              sys.exit()
      else:
  
-         ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=cons_response["remote_port"], io_priv=%d )' % (builder_fn, io_priv) )
 -        ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=xend_response["remote_port"] )' % builder_fn )
++        ret = eval('xc.%s_build ( dom=id, image=image, ramdisk=ramdisk, cmdline=cmdline, control_evtchn=cons_response["remote_port"] )' % builder_fn )
          if ret < 0:
              print "Error building Linux guest OS: "
              print "Return code = " + str(ret)

diff --cc tools/xc/lib/xc_linux_build.c
index 67351210fc7a0377baf4cdd6b9a5a51eab635c69,f1bd182827bd3cb5c5f54504e854c679ba9078be..83debd904d097b0e5b36999e5ab324bd79a9d421
--- 1/tools/xc/lib/xc_linux_build.c
--- 2/tools/xc/lib/xc_linux_build.c
+++ b/tools/xc/lib/xc_linux_build.c
@@@ -71,11 -70,10 +71,10 @@@ static int setup_guestos(int xc_handle
                           gzFile initrd_gfd, unsigned long initrd_len,
                           unsigned long nr_pages,
                           unsigned long *pvsi, unsigned long *pvke,
 -                         dom0_builddomain_t *builddomain, 
 +                       full_execution_context_t *ctxt,
                           const char *cmdline,
                           unsigned long shared_info_frame,
-                          unsigned int control_evtchn,
-                          int io_priv)
+                          unsigned int control_evtchn)
  {
      l1_pgentry_t *vl1tab=NULL, *vl1e=NULL;
      l2_pgentry_t *vl2tab=NULL, *vl2e=NULL;
@@@ -446,9 -438,9 +444,9 @@@ int xc_linux_build(int xc_handle
      if ( setup_guestos(xc_handle, domid, image, image_size, 
                         initrd_gfd, initrd_size, nr_pages, 
                         &vstartinfo_start, &vkern_entry,
 -                       &launch_op.u.builddomain, cmdline,
 +                       ctxt, cmdline,
                         op.u.getdomaininfo.shared_info_frame,
-                        control_evtchn, io_priv) < 0 )
+                        control_evtchn) < 0 )
      {
          ERROR("Error constructing guest OS");
          goto error_out;

diff --cc tools/xc/lib/xc_netbsd_build.c
index 8260c75ea469746c17599b2d3e56c5ebdc7cc99b,8793a512f296905584fe342b08e7ac1fc0eb5d8d..7c67d57d71e94dd0ce0097f5256b1ae5025cef5d
--- 1/tools/xc/lib/xc_netbsd_build.c
--- 2/tools/xc/lib/xc_netbsd_build.c
+++ b/tools/xc/lib/xc_netbsd_build.c
@@@ -60,11 -59,10 +60,10 @@@ static int setup_guestos(int xc_handle
                           unsigned long tot_pages,
                           unsigned long *virt_startinfo_addr, 
                           unsigned long *virt_load_addr, 
 -                         dom0_builddomain_t *builddomain, 
 +                       full_execution_context_t *ctxt,
                           const char *cmdline,
                           unsigned long shared_info_frame,
-                          unsigned int control_evtchn,
-                          int io_priv)
+                          unsigned int control_evtchn)
  {
      l1_pgentry_t *vl1tab=NULL, *vl1e=NULL;
      l2_pgentry_t *vl2tab=NULL, *vl2e=NULL;
@@@ -269,9 -261,9 +267,9 @@@ int xc_netbsd_build(int xc_handle
  
      if ( setup_guestos(xc_handle, domid, kernel_gfd, tot_pages,
                         &virt_startinfo_addr,
 -                       &load_addr, &launch_op.u.builddomain, cmdline,
 +                       &load_addr, &st_ctxt, cmdline,
                         op.u.getdomaininfo.shared_info_frame,
-                        control_evtchn, io_priv) < 0 )
+                        control_evtchn) < 0 )
      {
          ERROR("Error constructing guest OS");
          goto error_out;

diff --cc xen/common/physdev.c
index 0cc2654e8a345ff1df0abc0a3c159fc580dbcf18,6375fd48f0b5df3c4dff5f45327338a9c76516ef..91322992db396cc2427e9231e726c58c000d750e
--- 1/xen/common/physdev.c
--- 2/xen/common/physdev.c
+++ b/xen/common/physdev.c
@@@ -646,8 -696,11 +695,10 @@@ void physdev_init_dom0(struct task_stru
          }
          else
          {
 -            printk("Hiding PCI device %s from DOM0\n",
 -                   dev->slot_name);
 +            printk("Hiding PCI device %s from DOM0\n", dev->slot_name);
          }
      }
+ 
+     set_bit(PF_PHYSDEV, &p->flags);
  }
  

diff --cc xen/include/xen/sched.h
Simple merge