From 979495570321f185b5b3c16a5dc0f7aa792cffc4c2364cc7d6eb68dda1bcc9d9 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 1 Sep 2008 00:39:12 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=51

---
 32on64-extra-mem.patch            |   2 +-
 cdrom-removable.patch             |  97 ++++----
 cross-build-fix.diff              |   4 +-
 pv-driver-build.patch             |  28 ---
 qemu-img-snapshot.patch           | 113 ++++++++++
 rpmlint.diff                      |   2 +-
 snapshot-ioemu-delete.patch       |  24 ++
 snapshot-xend.patch               |  58 +++--
 tools-xc_kexec.diff               |  18 +-
 xen-3.3.0-testing-src.tar.bz2     |   4 +-
 xen-config.diff                   |   2 +-
 xen-generate-foreign-headers.diff |  22 --
 xen-xmexample-nbd.diff            |  13 --
 xen-xmexample-vti.diff            |  12 +
 xen.changes                       |  40 ++++
 xen.spec                          | 360 ++++++++++++++++--------------
 xend-domain-lock.patch            |   4 +-
 xend-vif-fix.patch                |  18 ++
 18 files changed, 512 insertions(+), 309 deletions(-)
 create mode 100644 qemu-img-snapshot.patch
 create mode 100644 snapshot-ioemu-delete.patch
 delete mode 100644 xen-generate-foreign-headers.diff
 delete mode 100644 xen-xmexample-nbd.diff
 create mode 100644 xen-xmexample-vti.diff
 create mode 100644 xend-vif-fix.patch

diff --git a/32on64-extra-mem.patch b/32on64-extra-mem.patch
index 643e1e7..ffea46b 100644
--- a/32on64-extra-mem.patch
+++ b/32on64-extra-mem.patch
@@ -2,7 +2,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
 ===================================================================
 --- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
 +++ xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -2251,7 +2251,7 @@ class XendDomainInfo:
+@@ -2255,7 +2255,7 @@ class XendDomainInfo:
              vtd_mem = ((vtd_mem + 1023) / 1024) * 1024
  
              # Make sure there's enough RAM available for the domain
diff --git a/cdrom-removable.patch b/cdrom-removable.patch
index 16ba5d4..2fdfcc6 100644
--- a/cdrom-removable.patch
+++ b/cdrom-removable.patch
@@ -1,8 +1,8 @@
 Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py	2008-08-12 07:36:39.000000000 -0600
-@@ -0,0 +1,238 @@
++++ xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py	2008-08-29 06:25:55.000000000 -0600
+@@ -0,0 +1,243 @@
 +#!/usr/bin/env python
 +#  -*- mode: python; -*-
 +#============================================================================
@@ -42,6 +42,8 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 +from xen.xend import XendLogging
 +from xen.xend.XendLogging import log
 +
++DEVICE_TYPES = ['vbd', 'tap']
++
 +class HalDaemon:
 +    """The Hald block device watcher for XEN
 +    """
@@ -52,6 +54,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 +    """Default level of information to be logged."""
 +    loglevel_default = 'INFO'
 +
++
 +    def __init__(self):
 +
 +        XendLogging.init(self.logfile_default, self.loglevel_default)
@@ -59,7 +62,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 +
 +        self.udi_dict = {}
 +        self.debug = 0
-+        self.dbpath = "/local/domain/0/backend/vbd"
++        self.dbpath = "/local/domain/0/backend"
 +        self.bus = dbus.SystemBus()
 +        self.hal_manager_obj = self.bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
 +        self.hal_manager = dbus.Interface( self.hal_manager_obj, 'org.freedesktop.Hal.Manager')
@@ -100,7 +103,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 +            device_names = self.hal_manager.GetAllDevices()
 +            i = 0;
 +            for name in device_names:
-+               #log.debug("device name, device=%s",name)
++                #log.debug("device name, device=%s",name)
 +               dev_obj = self.bus.get_object ('org.freedesktop.Hal', name)
 +               dev = dbus.Interface (dev_obj, 'org.freedesktop.Hal.Device')
 +               dev_properties = dev_obj.GetAllProperties(dbus_interface="org.freedesktop.Hal.Device")
@@ -182,43 +185,45 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 +    # Set or clear xenstore media-present depending on the action argument
 +    #  for every vbd that has this block device
 +    def change_xenstore(self,action, device, major, minor):
-+        domains = xstransact.List(self.dbpath)
-+        log.debug('domains: %s', domains)
-+        for domain in domains:   # for each domain
-+            devices = xstransact.List( self.dbpath + '/' + domain)
-+            log.debug('devices: %s',devices)
-+            for device in devices:  # for each vbd device
-+               str = device.split('/')
-+               vbd_type = None;
-+               vbd_physical_device = None
-+               vbd_media = None
-+               vbd_device_path = self.dbpath + '/' + domain + '/' + device
-+               listing = xstransact.List(vbd_device_path)
-+               for entry in listing: # for each entry
-+                   item = self.dbpath + '/' + entry
-+                   value = xstransact.Read( vbd_device_path + '/' + entry)
-+                   log.debug('%s=%s',item,value)
-+                   if item.find('media-present') != -1:
-+                       vbd_media = item;
-+                       vbd_media_path = item
-+                   if item.find('physical-device') != -1:
-+                       vbd_physical_device = value;
-+                   if item.find('type') != -1:
-+                       vbd_type = value;
-+               if vbd_type is not None and vbd_physical_device is not None and vbd_media is not None :
-+                   inode = vbd_physical_device.split(':')
-+                   imajor = parse_hex(inode[0])
-+                   iminor = parse_hex(inode[1])
-+                   log.debug("action:%s major:%s- minor:%s- imajor:%s- iminor:%s- inode: %s",
-+                           action,major,minor, imajor, iminor, inode)
-+                   if int(imajor) == int(major) and int(iminor) == int(minor):
-+                       if action == "add":
-+                           xs_dict = {'media': "1"}
-+                           xstransact.Write(vbd_device_path, 'media-present', "1" )
-+                           log.debug("wrote xenstore media-present 1 path:%s",vbd_media_path)
-+                       else:
-+                           xstransact.Write(vbd_device_path, 'media-present', "0" )
-+                           log.debug("wrote xenstore media 0 path:%s",vbd_media_path)
++        for type in DEVICE_TYPES:
++            path = self.dbpath + '/' + type
++            domains = xstransact.List(path)
++            log.debug('domains: %s', domains)
++            for domain in domains:   # for each domain
++                devices = xstransact.List( path + '/' + domain)
++                log.debug('devices: %s',devices)
++                for device in devices:  # for each vbd device
++                   str = device.split('/')
++                   vbd_type = None;
++                   vbd_physical_device = None
++                   vbd_media = None
++                   vbd_device_path = path + '/' + domain + '/' + device
++                   listing = xstransact.List(vbd_device_path)
++                   for entry in listing: # for each entry
++                       item = path + '/' + entry
++                       value = xstransact.Read( vbd_device_path + '/' + entry)
++                       log.debug('%s=%s',item,value)
++                       if item.find('media-present') != -1:
++                           vbd_media = item;
++                           vbd_media_path = item
++                       if item.find('physical-device') != -1:
++                           vbd_physical_device = value;
++                       if item.find('type') != -1:
++                           vbd_type = value;
++                   if vbd_type is not None and vbd_physical_device is not None and vbd_media is not None :
++                       inode = vbd_physical_device.split(':')
++                       imajor = parse_hex(inode[0])
++                       iminor = parse_hex(inode[1])
++                       log.debug("action:%s major:%s- minor:%s- imajor:%s- iminor:%s- inode: %s",
++                               action,major,minor, imajor, iminor, inode)
++                       if int(imajor) == int(major) and int(iminor) == int(minor):
++                           if action == "add":
++                               xs_dict = {'media': "1"}
++                               xstransact.Write(vbd_device_path, 'media-present', "1" )
++                               log.debug("wrote xenstore media-present 1 path:%s",vbd_media_path)
++                           else:
++                               xstransact.Write(vbd_device_path, 'media-present', "0" )
++                               log.debug("wrote xenstore media 0 path:%s",vbd_media_path)
 +
 +def mylog( fmt, *args):
 +    f = open('/tmp/haldaemon.log', 'a')
@@ -244,7 +249,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py
 Index: xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py	2008-08-12 07:36:39.000000000 -0600
++++ xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py	2008-08-29 06:11:48.000000000 -0600
 @@ -0,0 +1,125 @@
 +#============================================================================
 +# This library is free software; you can redistribute it and/or
@@ -373,8 +378,8 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py
 +    watcher.shutdown()
 Index: xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py
 ===================================================================
---- xen-3.3.0-testing.orig/tools/python/xen/xend/server/SrvServer.py	2008-08-11 12:44:35.000000000 -0600
-+++ xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py	2008-08-12 07:36:39.000000000 -0600
+--- xen-3.3.0-testing.orig/tools/python/xen/xend/server/SrvServer.py	2008-08-22 08:34:00.000000000 -0600
++++ xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py	2008-08-29 06:11:48.000000000 -0600
 @@ -56,6 +56,7 @@
  
  from SrvRoot import SrvRoot
@@ -394,8 +399,8 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py
      root = SrvDir()
 Index: xen-3.3.0-testing/tools/ioemu-remote/xenstore.c
 ===================================================================
---- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c	2008-08-11 12:36:15.000000000 -0600
-+++ xen-3.3.0-testing/tools/ioemu-remote/xenstore.c	2008-08-12 07:48:22.000000000 -0600
+--- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c	2008-08-22 08:35:31.000000000 -0600
++++ xen-3.3.0-testing/tools/ioemu-remote/xenstore.c	2008-08-29 06:11:48.000000000 -0600
 @@ -297,6 +297,16 @@
              bdrv_set_type_hint(bs, BDRV_TYPE_CDROM);
              if (pasprintf(&buf, "%s/params", bpath) != -1)
diff --git a/cross-build-fix.diff b/cross-build-fix.diff
index 398a57e..23b9f8d 100644
--- a/cross-build-fix.diff
+++ b/cross-build-fix.diff
@@ -33,9 +33,9 @@ Index: xen-3.3.0-testing/tools/Makefile
 ===================================================================
 --- xen-3.3.0-testing.orig/tools/Makefile
 +++ xen-3.3.0-testing/tools/Makefile
-@@ -23,7 +23,7 @@ SUBDIRS-y += blktap
- SUBDIRS-y += libfsimage
+@@ -24,7 +24,7 @@ SUBDIRS-y += libfsimage
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
+ SUBDIRS-y += fs-back
  
 -ifeq (ioemu,$(CONFIG_QEMU))
 +ifeq ($(XEN_COMPILE_ARCH)$(CONFIG_IOEMU),$(XEN_TARGET_ARCH)y)
diff --git a/pv-driver-build.patch b/pv-driver-build.patch
index da2d6c4..6f5f0e5 100644
--- a/pv-driver-build.patch
+++ b/pv-driver-build.patch
@@ -11,31 +11,3 @@ Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/mkbuildtree
  
  # Need to be quite careful here: we don't want the files we link in to
  # risk overriding the native Linux ones (in particular, system.h must
-Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
-===================================================================
---- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
-+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
-@@ -151,7 +151,7 @@ typedef irqreturn_t (*irq_handler_t)(int
- #endif
- #endif
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && CONFIG_SLE_VERSION < 10
- #define setup_xen_features xen_setup_features
- #endif
- 
-Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
-===================================================================
---- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
-+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
-@@ -119,7 +119,9 @@ void *kzalloc(size_t size, int flags)
- EXPORT_SYMBOL(kzalloc);
- #endif
- 
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
-+#if defined(CONFIG_SUSE_KERNEL) \
-+    ? LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) \
-+    : LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
- /* Simplified asprintf. */
- char *kasprintf(gfp_t gfp, const char *fmt, ...)
- {
diff --git a/qemu-img-snapshot.patch b/qemu-img-snapshot.patch
new file mode 100644
index 0000000..7f49521
--- /dev/null
+++ b/qemu-img-snapshot.patch
@@ -0,0 +1,113 @@
+Index: xen-3.3.0-testing/tools/ioemu-remote/qemu-img.c
+===================================================================
+--- xen-3.3.0-testing.orig/tools/ioemu-remote/qemu-img.c
++++ xen-3.3.0-testing/tools/ioemu-remote/qemu-img.c
+@@ -57,6 +57,7 @@ static void help(void)
+            "  commit [-f fmt] filename\n"
+            "  convert [-c] [-e] [-6] [-f fmt] [-O output_fmt] filename [filename2 [...]] output_filename\n"
+            "  info [-f fmt] filename\n"
++           "  snapshot [-l|-a snapshot|-d snapshot] filename\n"
+            "\n"
+            "Command parameters:\n"
+            "  'filename' is a disk image filename\n"
+@@ -694,6 +695,91 @@ static int img_info(int argc, char **arg
+     return 0;
+ }
+ 
++#define SNAPSHOT_LIST   1
++#define SNAPSHOT_APPLY  2
++#define SNAPSHOT_DELETE 3
++
++static void img_snapshot(int argc, char **argv)
++{
++    BlockDriverState *bs;
++    char *filename, *snapshot_name = NULL;
++    char c;
++    int ret;
++    int action = 0;
++
++    /* Parse commandline parameters */
++    for(;;) {
++        c = getopt(argc, argv, "la:d:h");
++        if (c == -1)
++            break;
++        switch(c) {
++        case 'h':
++            help();
++            return;
++        case 'l':
++            if (action) {
++                help();
++                return;
++            }
++            action = SNAPSHOT_LIST;
++            break;
++        case 'a':
++            if (action) {
++                help();
++                return;
++            }
++            action = SNAPSHOT_APPLY;
++            snapshot_name = optarg;
++            break;
++        case 'd':
++            if (action) {
++                help();
++                return;
++            }
++            action = SNAPSHOT_DELETE;
++            snapshot_name = optarg;
++            break;
++        }
++    }
++
++    if (optind >= argc)
++        help();
++    filename = argv[optind++];
++
++    /* Open the image */
++    bs = bdrv_new("");
++    if (!bs)
++        error("Not enough memory");
++
++    if (bdrv_open2(bs, filename, 0, NULL) < 0) {
++        error("Could not open '%s'", filename);
++    }
++
++    /* Perform the requested action */
++    switch(action) {
++    case SNAPSHOT_LIST:
++        dump_snapshots(bs);
++        break;
++
++    case SNAPSHOT_APPLY:
++        ret = bdrv_snapshot_goto(bs, snapshot_name);
++        if (ret)
++            error("Could not apply snapshot '%s': %d (%s)",
++                snapshot_name, strerror(ret), ret);
++        break;
++
++    case SNAPSHOT_DELETE:
++        ret = bdrv_snapshot_delete(bs, snapshot_name);
++        if (ret)
++            error("Could not delete snapshot '%s': %d (%s)",
++                snapshot_name, strerror(ret), ret);
++        break;
++    }
++
++    /* Cleanup */
++    bdrv_delete(bs);
++}
++
+ int main(int argc, char **argv)
+ {
+     const char *cmd;
+@@ -711,6 +797,8 @@ int main(int argc, char **argv)
+         img_convert(argc, argv);
+     } else if (!strcmp(cmd, "info")) {
+         img_info(argc, argv);
++    } else if (!strcmp(cmd, "snapshot")) {
++        img_snapshot(argc, argv);
+     } else {
+         help();
+     }
diff --git a/rpmlint.diff b/rpmlint.diff
index ab43a4c..0507954 100644
--- a/rpmlint.diff
+++ b/rpmlint.diff
@@ -2,7 +2,7 @@ Index: xen-3.3.0-testing/tools/examples/Makefile
 ===================================================================
 --- xen-3.3.0-testing.orig/tools/examples/Makefile
 +++ xen-3.3.0-testing/tools/examples/Makefile
-@@ -71,7 +71,7 @@ install-initd:
+@@ -70,7 +70,7 @@ install-initd:
  	[ -d $(DESTDIR)/var/adm/fillup-templates ] || $(INSTALL_DIR) $(DESTDIR)/var/adm/fillup-templates/
  	$(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
  	$(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
diff --git a/snapshot-ioemu-delete.patch b/snapshot-ioemu-delete.patch
new file mode 100644
index 0000000..76cb3ac
--- /dev/null
+++ b/snapshot-ioemu-delete.patch
@@ -0,0 +1,24 @@
+Index: xen-3.3.0-testing/tools/ioemu-remote/xenstore.c
+===================================================================
+--- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c
++++ xen-3.3.0-testing/tools/ioemu-remote/xenstore.c
+@@ -652,6 +652,19 @@ static void xenstore_process_dm_command_
+         }
+ 
+         snapshot_name = xs_read(xsh, XBT_NULL, path, &len);
++    } else if (!strncmp(command, "snapshot-delete", len)) {
++
++        if (pasprintf(&path,
++                "/local/domain/0/device-model/%u/parameter", domid) == -1) {
++            fprintf(logfile, "out of memory reading dm command parameter\n");
++            goto out;
++        }
++        par = xs_read(xsh, XBT_NULL, path, &len);
++        if (!par)
++            goto out;
++        // TODO Error handling
++        do_delvm(par);
++        xenstore_record_dm_state("snapshot-deleted");
+     } else if (!strncmp(command, "continue", len)) {
+         fprintf(logfile, "dm-command: continue after state save\n");
+         xen_pause_requested = 0;
diff --git a/snapshot-xend.patch b/snapshot-xend.patch
index febb96e..2bee0a3 100644
--- a/snapshot-xend.patch
+++ b/snapshot-xend.patch
@@ -295,7 +295,15 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py
 ===================================================================
 --- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomain.py
 +++ xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py
-@@ -1396,6 +1396,148 @@ class XendDomain:
+@@ -52,6 +52,7 @@ from xen.xend.xenstore.xstransact import
+ from xen.xend.xenstore.xswatch import xswatch
+ from xen.util import mkdir
+ from xen.xend import uuid
++from xen.xend import sxp
+ 
+ xc = xen.lowlevel.xc.xc()
+ xoptions = XendOptions.instance() 
+@@ -1396,6 +1397,164 @@ class XendDomain:
              raise XendError("can't write guest state file %s: %s" %
                              (dst, ex[1]))
  
@@ -324,6 +332,10 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py
 +                                 POWER_STATE_NAMES[DOM_STATE_RUNNING],
 +                                 POWER_STATE_NAMES[dominfo._stateGet()])
 +
++            if not os.path.exists(self._managed_config_path(dominfo.get_uuid())):
++                raise XendError("Domain is not managed by Xend lifecycle " +
++                                "support.")
++
 +            snap_path = os.path.join(xoptions.get_xend_domains_path(),
 +                                    dominfo.get_uuid(), "snapshots")
 +            mkdir.parents(snap_path, stat.S_IRWXU)
@@ -421,25 +433,37 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py
 +        @rtype: None
 +        @raise XendInvalidDomain: Domain is not valid        
 +        """
-+        try:
-+            dominfo = self.domain_lookup_nr(domid)
-+            if not dominfo:
-+                raise XendInvalidDomain(str(domid))
++        dominfo = self.domain_lookup_nr(domid)
++        if not dominfo:
++            raise XendInvalidDomain(str(domid))
 +
-+            snap_file = os.path.join(xoptions.get_xend_domains_path(),
-+                                     dominfo.get_uuid(), "snapshots", name)
-+            
-+            if not os.access(snap_file, os.F_OK):
-+                raise XendError("Snapshot %s does not exist for domain %s" %
-+                                (name, str(domid)))
++        snap_file = os.path.join(xoptions.get_xend_domains_path(),
++                                 dominfo.get_uuid(), "snapshots", name)
 +
-+            # Warning!
-+            # Need to "remove" snapshot from qcow2 image file.  How
-+            # should we do this?
-+            os.unlink(snap_file)
++        if not os.access(snap_file, os.F_OK):
++            raise XendError("Snapshot %s does not exist for domain %s" %
++                            (name, str(domid)))
 +
-+        except:
-+            return
++        # Need to "remove" snapshot from qcow2 image file.
++        # For running domains, this is left to ioemu. For stopped domains
++        # we must invoke qemu-img for all devices ourselves
++        if dominfo._stateGet() != DOM_STATE_HALTED:
++            dominfo.image.signalDeviceModel("snapshot-delete",
++                "snapshot-deleted", name)
++        else:
++            for dev_type, dev_info in dominfo.info.all_devices_sxpr():
++                if dev_type != 'tap':
++                    continue
++
++                # Fetch the filename and strip off tap:xyz:
++                image_file = sxp.child_value(dev_info, 'uname')
++                image_file = image_file.split(':')[2]
++
++                os.system("qemu-img-xen snapshot -d %s %s" %
++                    (name, image_file));
++
++
++        os.unlink(snap_file)
 +
      def domain_pincpu(self, domid, vcpu, cpumap):
          """Set which cpus vcpu can use
diff --git a/tools-xc_kexec.diff b/tools-xc_kexec.diff
index 7ecbbe2..8922041 100644
--- a/tools-xc_kexec.diff
+++ b/tools-xc_kexec.diff
@@ -67,7 +67,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/Makefile
 +OBJS	:= $(XEN_TARGET_ARCH)/entry.o
 +OBJS	+= main.o console.o vsprintf.o string.o ctype.o
 +
-+CFLAGS	+= -g -I$(XEN_ROOT)/tools/libxc -I$(XEN_TARGET_ARCH)
++CFLAGS	+= -g -I$(XEN_ROOT)/tools/libxc -I$(XEN_TARGET_ARCH) -I$(XEN_INCLUDE)
 +
 +ifeq ($(XEN_TARGET_ARCH),x86_32)
 +HLP_LDFLAGS := -melf_i386
@@ -132,12 +132,12 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/console.c
 +
 +	cons = intf->out_cons;
 +	prod = intf->out_prod;
-+	mb();
++	xen_mb();
 +
 +	while ((sent < len) && ((prod - cons) < sizeof(intf->out)))
 +		intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++];
 +
-+	wmb();
++	xen_wmb();
 +	intf->out_prod = prod;
 +
 +	if (0 != notify_remote_via_evtchn(console_evtchn))
@@ -456,7 +456,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
 +		return;
 +
 +	memset(xenstore_page, 0, PAGE_SIZE);
-+	wmb();
++	xen_wmb();
 +	printk("xs: debug fixup [zero page] done\r\n");
 +}
 +#endif
@@ -541,7 +541,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
 +static void fillup_memory_p2m(void)
 +{
 +	struct xen_memory_reservation reservation = {
-+		.address_bits = 0,
++		.mem_flags = 0,
 +		.extent_order = 0,
 +		.nr_extents   = 1,
 +		.domid        = DOMID_SELF,
@@ -696,7 +696,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
 +	else
 +		map_page_32(page, mfn, flags);
 +	xen_tlb_flush();
-+	wmb();
++	xen_wmb();
 +}
 +
 +static void map_virt_base(void)
@@ -706,7 +706,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
 +	else
 +		map_virt_base_32();
 +	xen_tlb_flush();
-+	wmb();
++	xen_wmb();
 +}
 +
 +static void fixup_pagetables_32(void)
@@ -822,7 +822,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
 +	pte[pte_off] = (mfn << PAGE_SHIFT) | flags;
 +
 +	xen_tlb_flush();
-+	wmb();
++	xen_wmb();
 +}
 +
 +static void map_virt_base(void)
@@ -857,7 +857,7 @@ Index: xen-3.3.0-testing/tools/xcutils/helper/main.c
 +		pgd_low++;
 +	}
 +	xen_tlb_flush();
-+	wmb();
++	xen_wmb();
 +}
 +
 +static void fixup_pagetables(void)
diff --git a/xen-3.3.0-testing-src.tar.bz2 b/xen-3.3.0-testing-src.tar.bz2
index 788af01..3f1654b 100644
--- a/xen-3.3.0-testing-src.tar.bz2
+++ b/xen-3.3.0-testing-src.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e63df7fa5cc4d603cf44b7562d2f03f0784f2951389eb44b752897f67b1ed24e
-size 9818013
+oid sha256:c53af8d91df0454b584aa771232a715bd068467c2841a3d44812fd9e70cb497e
+size 9822192
diff --git a/xen-config.diff b/xen-config.diff
index 9dbeace..5641512 100644
--- a/xen-config.diff
+++ b/xen-config.diff
@@ -2,7 +2,7 @@ Index: xen-3.3.0-testing/Config.mk
 ===================================================================
 --- xen-3.3.0-testing.orig/Config.mk
 +++ xen-3.3.0-testing/Config.mk
-@@ -84,20 +84,20 @@ QEMU_REMOTE=http://xenbits.xensource.com
+@@ -85,20 +85,20 @@ QEMU_REMOTE=http://xenbits.xensource.com
  
  # Specify which qemu-dm to use. This may be `ioemu' to use the old
  # Mercurial in-tree version, or a local directory, or a git URL.
diff --git a/xen-generate-foreign-headers.diff b/xen-generate-foreign-headers.diff
deleted file mode 100644
index 3479e44..0000000
--- a/xen-generate-foreign-headers.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xen-unstable/xen/include/public/foreign/Makefile
-===================================================================
---- xen-unstable.orig/xen/include/public/foreign/Makefile
-+++ xen-unstable/xen/include/public/foreign/Makefile
-@@ -17,8 +17,6 @@ ifeq ($(CROSS_COMPILE),)
- check-headers: checker
- 	./checker > $(XEN_TARGET_ARCH).size
- 	diff -u reference.size $(XEN_TARGET_ARCH).size
--checker: checker.c $(headers)
--	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
- else
- check-headers:
- 	@echo "cross build: skipping check"
-@@ -33,5 +31,8 @@ x86_64.h: ../arch-x86/xen-x86_64.h ../ar
- ia64.h: ../arch-ia64.h ../xen.h $(scripts)
- 	python mkheader.py $* $@ $(filter %.h,$^)
- 
-+checker: checker.c $(headers)
-+	$(HOSTCC) $(HOSTCFLAGS) -o $@ $<
-+
- checker.c: $(scripts)
- 	python mkchecker.py $(XEN_TARGET_ARCH) $@ $(architectures)
diff --git a/xen-xmexample-nbd.diff b/xen-xmexample-nbd.diff
deleted file mode 100644
index e844999..0000000
--- a/xen-xmexample-nbd.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xen-4.0.0-testing/tools/examples/Makefile
-===================================================================
---- xen-4.0.0-testing.orig/tools/examples/Makefile
-+++ xen-4.0.0-testing/tools/examples/Makefile
-@@ -13,7 +13,7 @@ XEN_CONFIGS += xm-config.xml
- XEN_CONFIGS += xmexample1 
- XEN_CONFIGS += xmexample2
- XEN_CONFIGS += xmexample.hvm
--XEN_CONFIGS += xmexample.vti
-+XEN_CONFIGS += xmexample.nbd
- XEN_CONFIGS += xend-pci-quirks.sxp
- XEN_CONFIGS += xend-pci-permissive.sxp
- 
diff --git a/xen-xmexample-vti.diff b/xen-xmexample-vti.diff
new file mode 100644
index 0000000..4f78f39
--- /dev/null
+++ b/xen-xmexample-vti.diff
@@ -0,0 +1,12 @@
+Index: xen-3.3.0-testing/tools/examples/Makefile
+===================================================================
+--- xen-3.3.0-testing.orig/tools/examples/Makefile
++++ xen-3.3.0-testing/tools/examples/Makefile
+@@ -20,7 +20,6 @@ XEN_CONFIGS += xmexample.hvm-stubdom
+ XEN_CONFIGS += xmexample.hvm-dm
+ XEN_CONFIGS += xmexample.pv-grub
+ XEN_CONFIGS += xmexample.nbd
+-XEN_CONFIGS += xmexample.vti
+ XEN_CONFIGS += xend-pci-quirks.sxp
+ XEN_CONFIGS += xend-pci-permissive.sxp
+ 
diff --git a/xen.changes b/xen.changes
index f46c3fd..80a6c03 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,43 @@
+-------------------------------------------------------------------
+Fri Aug 29 06:39:21 MDT 2008 - plc@novell.com
+
+- Added 'tap' to the type of devices for HalDaemon.py to
+  scan for change of xenstore attribute media-present.
+
+-------------------------------------------------------------------
+Wed Aug 27 12:21:19 MDT 2008 - jfehlig@novell.com
+
+- Don't create pv vif device if emulated network device is
+  explicitly specified in guest config.
+
+-------------------------------------------------------------------
+Fri Aug 22 08:37:49 MDT 2008 - carnold@novell.com
+
+- Updated to xen-unstable changeset 18358 Xen 3.3.0 FCS.
+
+-------------------------------------------------------------------
+Wed Aug 20 13:59:45 MDT 2008 - carnold@novell.com
+
+- Updated to xen-unstable changeset 18353 RC7.
+
+-------------------------------------------------------------------
+Wed Aug 20 15:08:19 CEST 2008 - kwolf@suse.de
+
+- Implementation of xm snapshot-delete
+  snapshot-ioemu-delete.patch, snapshot-xend.patch
+- Add snapshot options to qemu-img-xen
+  qemu-img-snapshot.patch
+
+-------------------------------------------------------------------
+Tue Aug 19 10:27:05 MDT 2008 - carnold@novell.com
+
+- Enable kboot and kexec patches.
+
+-------------------------------------------------------------------
+Mon Aug 18 11:13:55 MDT 2008 - carnold@novell.com
+
+- Updated to xen-unstable changeset 18335 RC5.
+
 -------------------------------------------------------------------
 Mon Aug 18 17:17:25 CEST 2008 - carnold@suse.de
 
diff --git a/xen.spec b/xen.spec
index 2a3bf10..acec5c3 100644
--- a/xen.spec
+++ b/xen.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xen (Version 3.3.0_18314_02)
+# spec file for package xen (Version 3.3.0_18358_02)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,12 +21,12 @@
 Name:           xen
 %define xvers 3.3
 %define xvermaj 3
-%define changeset 18314
+%define changeset 18358
 %define xen_build_dir xen-3.3.0-testing
 %if %sles_version
 %define with_kmp 1
 %else
-%define with_kmp 0
+%define with_kmp 1
 %endif
 BuildRequires:  LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel transfig
 %if %suse_version >= 1030
@@ -40,8 +40,8 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 %if %{?with_kmp}0
 BuildRequires:  kernel-source kernel-syms module-init-tools xorg-x11
 %endif
-Version:        3.3.0_18314_02
-Release:        3
+Version:        3.3.0_18358_02
+Release:        1
 License:        GPL v2 only
 Group:          System/Kernel
 AutoReqProv:    on
@@ -76,7 +76,7 @@ Patch104:       xen-warnings.diff
 Patch106:       xen-changeset.diff
 Patch107:       xen-paths.diff
 Patch108:       xen-xmexample.diff
-Patch109:       xen-xmexample-nbd.diff
+Patch109:       xen-xmexample-vti.diff
 Patch110:       xen-fixme-doc.diff
 Patch111:       xen-domUloader.diff
 Patch112:       xen-no-dummy-nfs-ip.diff
@@ -92,15 +92,14 @@ Patch124:       xen-hvm-default-bridge.diff
 Patch125:       xen-hvm-default-pae.diff
 Patch126:       xm-test-cleanup.diff
 Patch127:       cross-build-fix.diff
-Patch130:       xen-generate-foreign-headers.diff
-Patch131:       tools-xc_kexec.diff
-Patch132:       tools-kboot.diff
-Patch133:       libxen_permissive.patch
-Patch134:       xenapi-console-protocol.patch
-Patch135:       xen-disable-qemu-monitor.diff
-Patch136:       supported_module.diff
-Patch137:       qemu-security-etch1.diff
-Patch138:       rpmlint.diff
+Patch130:       tools-xc_kexec.diff
+Patch131:       tools-kboot.diff
+Patch132:       libxen_permissive.patch
+Patch133:       xenapi-console-protocol.patch
+Patch134:       xen-disable-qemu-monitor.diff
+Patch135:       supported_module.diff
+Patch136:       qemu-security-etch1.diff
+Patch137:       rpmlint.diff
 Patch140:       cdrom-removable.patch
 Patch150:       bridge-opensuse.patch
 Patch151:       bridge-vlan.diff
@@ -111,16 +110,19 @@ Patch155:       xend-core-dump-loc.diff
 Patch156:       blktap.patch
 Patch157:       xen-api-auth.patch
 Patch158:       xen-qemu-iscsi-fix.patch
+Patch159:       xend-vif-fix.patch
 # Patches for snapshot support
-Patch169:       ioemu-blktap-fix-open.patch
-Patch170:       snapshot-ioemu-save.patch
-Patch171:       snapshot-ioemu-restore.patch
-Patch172:       snapshot-xend.patch
-Patch173:       ioemu-qcow2-multiblock-aio.patch
-Patch174:       ioemu-blktap-image-format.patch
-Patch175:       build-tapdisk-ioemu.patch
-Patch176:       blktapctrl-default-to-ioemu.patch
-Patch177:       ioemu-blktap-barriers.patch
+Patch170:       qemu-img-snapshot.patch
+Patch171:       ioemu-blktap-fix-open.patch
+Patch172:       snapshot-ioemu-save.patch
+Patch173:       snapshot-ioemu-restore.patch
+Patch174:       snapshot-ioemu-delete.patch
+Patch175:       snapshot-xend.patch
+Patch180:       ioemu-qcow2-multiblock-aio.patch
+Patch181:       ioemu-blktap-image-format.patch
+Patch182:       build-tapdisk-ioemu.patch
+Patch183:       blktapctrl-default-to-ioemu.patch
+Patch184:       ioemu-blktap-barriers.patch
 # Jim's domain lock patch
 Patch190:       xend-domain-lock.patch
 # Patches from Jan
@@ -381,6 +383,7 @@ Authors:
 License:        GPL v2 or later
 Group:          System/Kernel
 Summary:        Xen para-virtual device drivers for fully virtualized guests
+Conflicts:      xen
 
 %description KMP
 Xen para-virtual device drivers for fully virtualized guests
@@ -474,7 +477,7 @@ Authors:
 %patch106 -p1
 %patch107 -p1
 %patch108 -p1
-#%patch109 -p1 Not Needed
+%patch109 -p1
 %patch110 -p1
 %patch111 -p1
 %patch112 -p1
@@ -489,16 +492,15 @@ Authors:
 %patch124 -p1
 %patch125 -p1
 %patch126 -p1
-#%patch127 -p1 Not needed anymore?
-#%patch130 -p1 xen/include/public/foreign/ directory no longer exists
-#%patch131 -p1
-#%patch132 -p1
+#%patch127 -p1
+%patch130 -p1
+%patch131 -p1
+%patch132 -p1
 %patch133 -p1
 %patch134 -p1
 %patch135 -p1
 %patch136 -p1
 %patch137 -p1
-%patch138 -p1
 %patch140 -p1
 %patch150 -p1
 %patch151 -p1
@@ -509,15 +511,18 @@ Authors:
 %patch156 -p1
 %patch157 -p1
 %patch158 -p1
-%patch169 -p1
+%patch159 -p1
 %patch170 -p1
 %patch171 -p1
 %patch172 -p1
 %patch173 -p1
 %patch174 -p1
 %patch175 -p1
-%patch176 -p1
-%patch177 -p1
+%patch180 -p1
+%patch181 -p1
+%patch182 -p1
+%patch183 -p1
+%patch184 -p1
 %patch190 -p1
 %patch240 -p1
 %patch241 -p1
@@ -545,13 +550,17 @@ make -C tools/include/xen-foreign
 make tools docs
 %if %{?with_kmp}0
 # pv driver modules
+export XL=/usr/src/linux
+export XEN=/usr/src/linux/include/xen
 mkdir -p obj
 for flavor in %flavors_to_build; do
     rm -rf obj/$flavor
     cp -r unmodified_drivers/linux-2.6 obj/$flavor
-    obj/$flavor/mkbuildtree
+    cd obj/$flavor
+    ./mkbuildtree
     make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
-        M=$PWD/obj/$flavor
+        M=$PWD
+    cd ../..
 done
 %endif
 
@@ -669,6 +678,7 @@ mv $RPM_BUILD_ROOT/etc/udev/rules.d/xen-backend.rules $RPM_BUILD_ROOT/etc/udev/r
 #%find_lang xen-vm  # po files are misnamed upstream
 # Clean up unpackaged files
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xen/qemu/
+rm -f  $RPM_BUILD_ROOT/%{_datadir}/doc/qemu/qemu-*
 rm -rf $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/ps
 rm -rf $RPM_BUILD_ROOT/usr/share/xen/man/man1/qemu/qemu*
 rm -f  $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-sparc32
@@ -677,6 +687,7 @@ rm -f  $RPM_BUILD_ROOT/usr/sbin/netfix
 rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 rm -rf $RPM_BUILD_ROOT/html
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
+rm -f  $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug
 
 %files
 %defattr(-,root,root)
@@ -791,9 +802,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 %{_libdir}/xen/bin/qemu-dm
 %ifarch x86_64
 /usr/lib/xen/bin/qemu-dm
-#/usr/lib64/xen/bin/xc_kexec
+/usr/lib64/xen/bin/xc_kexec
 %else
-#/usr/lib/xen/bin/xc_kexec
+/usr/lib/xen/bin/xc_kexec
 %endif
 /usr/lib/xen/boot/hvmloader
 %pysite/xen/*
@@ -854,22 +865,41 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 /sbin/ldconfig
 
 %changelog
+* Fri Aug 29 2008 plc@novell.com
+- Added 'tap' to the type of devices for HalDaemon.py to
+  scan for change of xenstore attribute media-present.
+* Wed Aug 27 2008 jfehlig@novell.com
+- Don't create pv vif device if emulated network device is
+  explicitly specified in guest config.
+* Fri Aug 22 2008 carnold@novell.com
+- Updated to xen-unstable changeset 18358 Xen 3.3.0 FCS.
+* Wed Aug 20 2008 carnold@novell.com
+- Updated to xen-unstable changeset 18353 RC7.
+* Wed Aug 20 2008 kwolf@suse.de
+- Implementation of xm snapshot-delete
+  snapshot-ioemu-delete.patch, snapshot-xend.patch
+- Add snapshot options to qemu-img-xen
+  qemu-img-snapshot.patch
+* Tue Aug 19 2008 carnold@novell.com
+- Enable kboot and kexec patches.
+* Mon Aug 18 2008 carnold@novell.com
+- Updated to xen-unstable changeset 18335 RC5.
 * Mon Aug 18 2008 carnold@suse.de
 - Removed git dependency.  Instead use a static version of
   ioemu-remote.
-* Fri Aug 15 2008 jfehlig@novell.com
+* Thu Aug 14 2008 jfehlig@novell.com
 - Added patch to prevent starting same domU from multiple hosts.
   Feature is disabled by default - see /etc/xen/xend-config.sxp.
   fate#305062
-* Tue Aug 12 2008 jfehlig@novell.com
+* Mon Aug 11 2008 jfehlig@novell.com
 - Added python-openssl to Requires list for xen-tools.  This
   package is required if SSL relocation is enabled by user.
-* Tue Aug 12 2008 carnold@novell.com
+* Mon Aug 11 2008 carnold@novell.com
 - Updated to xen-unstable changeset 18309. Pre 3.3.0-rc4.
 * Sat Aug 09 2008 jfehlig@novell.com
 - Disabled xend-relocation-ssl-server for now.  Certificates must
   be created and feature needs testing.
-* Sat Aug 09 2008 carnold@novell.com
+* Fri Aug 08 2008 carnold@novell.com
 - Update to xen-unstable changeset 18269 post RC3.  Reverse
   version back to 3.3.0 from 4.0.0.
 * Wed Aug 06 2008 carnold@novell.com
@@ -877,9 +907,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   3.3.0 to 4.0.0
 * Mon Aug 04 2008 carnold@novell.com
 - Updated to xen-unstable changeset 18210. Post 3.3.0-rc2.
-* Wed Jul 09 2008 carnold@novell.com
+* Tue Jul 08 2008 carnold@novell.com
 - Updated to xen-unstable changeset 17990.
-* Wed Jul 09 2008 kwolf@suse.de
+* Tue Jul 08 2008 kwolf@suse.de
 - ioemu: Write barriers for blktap devices
   ioemu-blktap-barriers.patch
 * Thu Jul 03 2008 kwolf@suse.de
@@ -893,7 +923,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - qcow2: Read/Write multiple sectors at once if possible to
   improve performance.
   ioemu-qcow2-multiblock-aio.patch
-* Fri Jun 13 2008 kwolf@novell.com
+* Thu Jun 12 2008 kwolf@novell.com
 - Add snapshot support to ioemu and blktapctrl
   snapshot-ioemu-save.patch
   snapshot-ioemu-restore.patch
@@ -911,7 +941,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   ifup-bridge in sysconfig has been fixed so patch is no longer
   needed.  Calling ifdown on bridge now removes ports and deletes
   bridge, so network-bridge no longer needs to do these tasks.
-* Sat May 17 2008 carnold@novell.com
+* Fri May 16 2008 carnold@novell.com
 - bnc#390985 - xm man page needs FIXME sections to be fixed
   xen-fixme-doc.diff
 * Wed May 14 2008 carnold@novell.com
@@ -930,9 +960,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Update to Xen 3.2.1 FCS changeset 16881.
 * Fri Apr 11 2008 carnold@novell.com
 - Update to Xen 3.2.1 RC5 changeset 16864.
-* Fri Apr 11 2008 jfehlig@novell.com
+* Thu Apr 10 2008 jfehlig@novell.com
 - bnc#378595 - Do not use ifup/ifdown in network-bridge for now.
-* Tue Mar 25 2008 carnold@novell.com
+* Mon Mar 24 2008 carnold@novell.com
 - bnc#373194 - The xen module and the kernel for Dom0 don't match.
 - Add ncurses-devel build dependency
 * Mon Mar 24 2008 carnold@novell.com
@@ -947,12 +977,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Wed Mar 12 2008 jfehlig@novell.com
 - Increased dom0-min-mem value to 512Mb in xend-config.sxp
   bnc#370007
-* Tue Mar 11 2008 jfehlig@novell.com
+* Mon Mar 10 2008 jfehlig@novell.com
 - Fixed initialization of default VM config values when creating
   VMs through Xen API.  bnc#368273
 * Mon Mar 10 2008 jfehlig@novell.com
 - Removed unused/untested xend-relocation script.
-* Sat Mar 08 2008 jfehlig@novell.com
+* Fri Mar 07 2008 jfehlig@novell.com
 - Set device model when creating pvfb consoles via XenAPI.
   bnc#367851
 * Fri Mar 07 2008 jfehlig@novell.com
@@ -963,11 +993,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Fri Feb 29 2008 plc@novell.com
 - Send UNIT_ATTENTION when CD drive has newly inserted media and
   becomes ready.  bnc#365386
-* Fri Feb 29 2008 jfehlig@novell.com
+* Thu Feb 28 2008 jfehlig@novell.com
 - Updated block-iscsi script and xen-domUloader patch, bnc #365385
 * Thu Feb 28 2008 carnold@novell.com
 - Add support for Intel EPT / VPID.
-* Wed Feb 27 2008 carnold@novell.com
+* Tue Feb 26 2008 carnold@novell.com
 - bnc#362415 - SLE-based installs 32-bit fully-virtualized have
   network problems during installs.
 - bnc#358244 - Time remaining does not change properly for FV SLES10
@@ -979,18 +1009,18 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Tranlate colors from 32 bit to 16 bit when viewing a 32 bit PV
   VM from a 16 bit client.  bnc#351470
   Also includes upstream mouse queue patch.
-* Sat Feb 23 2008 jfehlig@novell.com
+* Fri Feb 22 2008 jfehlig@novell.com
 - Added PAM configuration files for remote authentication via
   Xen API.  bnc #353464
 * Tue Feb 19 2008 carnold@novell.com
 - Fix PV drivers for HVM guests.
-* Sat Feb 16 2008 carnold@novell.com
+* Fri Feb 15 2008 carnold@novell.com
 - Support for pxe booting fully virtualized guests in vm-install is
   complete.
 * Thu Feb 14 2008 carnold@novell.com
 - Added upstream changesets that fix various bugs.
   16859 16929 16930 16945 16947 16962 16976 16980 16995 16998 17036
-* Thu Feb 14 2008 jfehlig@novell.com
+* Wed Feb 13 2008 jfehlig@novell.com
 - Updated network-multinet
   - Simplify bridge creation
   - Create traditional bridge and hostonly networks by default
@@ -998,15 +1028,15 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Added upstream changesets 16932, 16965, 16977, and 16988 to fix
   various bugs in tool stack
 - Also added upstream changeset 16989 to complete fate #302941.
-* Tue Feb 05 2008 plc@novell.com
+* Mon Feb 04 2008 plc@novell.com
 - Replaced xen-blktab-subtype-strip.patch with official upstream
   changeset for bnc#353065.
-* Sat Feb 02 2008 carnold@novell.com
+* Fri Feb 01 2008 carnold@novell.com
 - Update to xen 3.2 FCS.  Changeset 16718
 - Merge xen-tools and xen-tools-ioemu into xen-tools.
-* Thu Dec 20 2007 carnold@novell.com
+* Wed Dec 19 2007 carnold@novell.com
 - Update to xen 3.2 RC2.  Changeset 16646
-* Fri Dec 14 2007 carnold@novell.com
+* Thu Dec 13 2007 carnold@novell.com
 - Added agent support for HP Proliant hardware.
 * Wed Dec 05 2007 carnold@novell.com
 - #338108 - VUL-0: Xen security issues in SLE10
@@ -1021,29 +1051,29 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - #334445: xenbaked: Fix security vulnerability CVE-2007-3919.
 * Thu Nov 01 2007 carnold@novell.com
 - #310279: Kernel Panic while booting Xen
-* Wed Oct 03 2007 ccoffing@novell.com
+* Tue Oct 02 2007 ccoffing@novell.com
 - #286859: Fix booting from SAN
 * Thu Sep 13 2007 ccoffing@novell.com
 - #310338: Fix "No such file or directory" in network-multinet
-* Thu Sep 13 2007 jfehlig@novell.com
+* Wed Sep 12 2007 jfehlig@novell.com
 - #309940: Fix 'xm reboot'
 - Moved hvm_vnc.diff and xend_mem_leak.diff to 'Upstream patches'
   section of spec file since both have been accepted upstream now.
 * Mon Sep 10 2007 jfehlig@novell.com
 - #289283: Fix memory leak in xend
-* Sat Sep 08 2007 jfehlig@novell.com
+* Fri Sep 07 2007 jfehlig@novell.com
 - #297125: Expose 'type vnc' in vfb device sexp for HVM guests.
-* Fri Sep 07 2007 ccoffing@novell.com
+* Thu Sep 06 2007 ccoffing@novell.com
 - #302106: Update network-multinet
 * Wed Sep 05 2007 carnold@novell.com
 - #307458: AMD-V CR8 intercept reduction for HVM windows 64b guests
-* Thu Aug 30 2007 ccoffing@novell.com
+* Wed Aug 29 2007 ccoffing@novell.com
 - Update block-iscsi to match changes to open-iscsi.
-* Tue Aug 28 2007 carnold@novell.com
+* Mon Aug 27 2007 carnold@novell.com
 - #289275 - domu will not reboot if pci= is passed in at boot time.
 * Fri Aug 24 2007 carnold@novell.com
 - #297345: Added several upstream patches for hvm migration.
-* Sat Aug 18 2007 jfehlig@novell.com
+* Fri Aug 17 2007 jfehlig@novell.com
 - Added upstream c/s 15128, 15153, 15477, and 15716.  These patches
   provide foundation for bug #238986
 - Renamed xend_dev_destroy_cleanup.patch to reflect the upstream
@@ -1051,7 +1081,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   file.
 * Mon Aug 13 2007 carnold@novell.com
 - hvm svm: Log into 'xm dmesg' that SVM NPT is enabled.
-* Sat Aug 11 2007 ccoffing@novell.com
+* Fri Aug 10 2007 ccoffing@novell.com
 - Honor RPM_OPT_FLAGS better
 * Thu Aug 09 2007 ccoffing@novell.com
 - #298176: Do not enable NX if CPU/BIOS does not support it
@@ -1097,23 +1127,23 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Xen fails to create VM due to "out of memory" errors. (#280637)
 * Tue Jul 17 2007 plc@novell.com
 - Added CDROM removable media patch from 3.0.4
-* Sat Jul 07 2007 ccoffing@novell.com
+* Fri Jul 06 2007 ccoffing@novell.com
 - xensource bug #858: Disable strict aliasing for xenstore, to
   avoid domU hangs.
-* Wed Jul 04 2007 ccoffing@novell.com
+* Tue Jul 03 2007 ccoffing@novell.com
 - #285929: Bad "xendomains status" output w/ empty XENDOMAINS_SAVE
 * Tue Jul 03 2007 carnold@novell.com
 - Changes necessary to support EDD and EDID from Jan.
-* Thu Jun 21 2007 jfehlig@novell.com
+* Wed Jun 20 2007 jfehlig@novell.com
 - Added upstream changesets 15273, 15274, and 15275.
 - Removed the modified 15157 patch.  This patch was actually a
   consolidation of changesets 15157 and 15250.  These changesets
   are now discrete patches to ease subsequent updates of Xen.
-* Thu Jun 21 2007 ccoffing@novell.com
+* Wed Jun 20 2007 ccoffing@novell.com
 - Split vm-install off as a separate package.
 - Update man page.
 - Update Ron Terry's network-multi script.
-* Tue Jun 19 2007 ccoffing@novell.com
+* Mon Jun 18 2007 ccoffing@novell.com
 - Fix compiler warnings.
 - Update block-npiv.
 * Mon Jun 11 2007 ccoffing@novell.com
@@ -1137,7 +1167,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   'xm block-detach dom dev_name'.  Modified version fixes bug 262805
   without introducing regression.  Patch fixing c/s 15157 has been
   submitted upstream.
-* Thu May 24 2007 ccoffing@novell.com
+* Wed May 23 2007 ccoffing@novell.com
 - Drop xen-messages.diff; Xen now supports HVM save/restore.
 * Tue May 22 2007 ccoffing@novell.com
 - Update Ron Terry's network-multi script.
@@ -1151,7 +1181,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + #259994: disk size would reset when editing path
   + #247073: handle autoyast URLs
   + #254311: physical disks were showing as 0.0 GB
-* Thu May 17 2007 ccoffing@novell.com
+* Wed May 16 2007 ccoffing@novell.com
 - Properly quote pathnames in domUloader to fix EVMS.  (#274484)
 - Allow user to specify a default 'keymap' in xend's configuration
   file. (#258818 and 241149)
@@ -1175,10 +1205,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Added security fixes for problems found Travis Orandy (#270621)
   CVE-2007-1320, CVE-2007-1321, CVE-2007-1322, CVE-2007-1323,
   CVE-2007-1366
-* Fri May 04 2007 ccoffing@novell.com
+* Thu May 03 2007 ccoffing@novell.com
 - Update to xen-3.1-testing rc7 (changeset 15020).
 - Fix identification of virt-manager windows.  (#264162)
-* Wed May 02 2007 jfehlig@novell.com
+* Tue May 01 2007 jfehlig@novell.com
 - Integrated domUloader with 3.0.5.  Updated xen-domUloader.diff.
 * Mon Apr 30 2007 ccoffing@novell.com
 - Update to xen-3.0.5-testing rc4 (changeset 14993).
@@ -1194,29 +1224,29 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Fri Apr 20 2007 ccoffing@novell.com
 - Updated README. (#250705)
 - Fix vm-install's detection of PV RHEL4/5 kernels. (#260983)
-* Fri Apr 20 2007 ccoffing@novell.com
+* Thu Apr 19 2007 ccoffing@novell.com
 - Place xenstore-* tools in new xen-tools-domU package, to be used
   by suse_register.  (#249157)
 * Tue Apr 17 2007 ccoffing@novell.com
 - Update translations.
-* Fri Apr 13 2007 ccoffing@novell.com
+* Thu Apr 12 2007 ccoffing@novell.com
 - Combine two xenstore reads into one transaction, which causes
   xenstored to not thrash so badly, and makes virt-manager more
   responsive and less likely to time out or lock up.  Partial fix
   for #237406.
 - If disk is read-only, pass -r to losetup.  (#264158)
-* Fri Apr 06 2007 ccoffing@novell.com
+* Thu Apr 05 2007 ccoffing@novell.com
 - Update vm-install:
   + #260510: do not delete xml settings file
   + #260579: write correct vif line for PV NIC in FV VM
   + #261288: re-enable add disk buttons after deleting a disk
   + #192272, #222765, #250618:  Update OS list and their defaults
-* Wed Apr 04 2007 ccoffing@novell.com
+* Tue Apr 03 2007 ccoffing@novell.com
 - Could not do simultaneous installs via virt-manager. (#259917)
-* Tue Apr 03 2007 jfehlig@novell.com
+* Mon Apr 02 2007 jfehlig@novell.com
 - Fix improper handling of guest kernel arguments in domUloader.
   Bug #259810
-* Tue Apr 03 2007 ccoffing@novell.com
+* Mon Apr 02 2007 ccoffing@novell.com
 - Update vm-install:
   + #259420: refresh available memory more often
   + #259972: cannot enter autoyast url
@@ -1239,11 +1269,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Mon Mar 19 2007 ccoffing@novell.com
 - Update to xen-unstable changeset 14444.
 - Include Ron Terry's network-multi_bridge
-* Sat Mar 10 2007 jfehlig@novell.com
+* Fri Mar 09 2007 jfehlig@novell.com
 - Added lame patch to handle showing suspended state via Xen API.
   The patch only affects Xen API and is thus low risk.
   Bug #237859
-* Sat Mar 10 2007 carnold@novell.com
+* Fri Mar 09 2007 carnold@novell.com
 - Added AMD support for Vista 64 installation and boot.
 * Fri Mar 09 2007 ccoffing@novell.com
 - Make vm-install support NFS for SUSE (#241251).
@@ -1260,19 +1290,19 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   PV installation disk)
   + #252437: Allow virtual CDROM to be added (via ISO) even if
   physical CDROM doesn't exist
-* Thu Mar 08 2007 jfehlig@novell.com
+* Wed Mar 07 2007 jfehlig@novell.com
 - Fixed bug #252396
   + Added upstream c/s 14021.  Applies to Xen API c-bindings -
   low risk.
   + Added local patch to correctly set Xen API Console.protocol
   property
-* Thu Mar 08 2007 jfehlig@novell.com
+* Wed Mar 07 2007 jfehlig@novell.com
 - Added upstream patch that fixes save/restore on 32pae guests.
   Upstream c/s 14150.  Bug #237859
-* Wed Mar 07 2007 carnold@novell.com
+* Tue Mar 06 2007 carnold@novell.com
 - Remove a debug message which is spamming the logs during live
   migration.
-* Tue Mar 06 2007 jfehlig@novell.com
+* Mon Mar 05 2007 jfehlig@novell.com
 - Fixed handling of vbd type in Xen API <-> sexpr integration.
   Bug #250351
   + Updated an existing patch (xend_disk_decorate_rm.patch) and
@@ -1280,7 +1310,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   purpose of patch.
 * Mon Mar 05 2007 ccoffing@novell.com
 - Default apic=0 for SLES 8 and 9, for performance.  (#228133)
-* Sat Mar 03 2007 carnold@novell.com
+* Fri Mar 02 2007 carnold@novell.com
 - Xen kernel crashes at domain creation time. Bug #248183.
   Fix mouse for win2k hvm guest.
 * Fri Mar 02 2007 jfehlig@novell.com
@@ -1295,15 +1325,15 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Fri Mar 02 2007 jfehlig@novell.com
 - Add check for HVM domain in domain_save.  The check is
   performed in domain_suspend and should be included here as well.
-* Fri Mar 02 2007 ccoffing@novell.com
+* Thu Mar 01 2007 ccoffing@novell.com
 - Update vm-install:
   + #250201: for linux PVFB, pass xencons=tty if graphics=none
   + #250016: honor non-sparse flag
-* Fri Mar 02 2007 jfehlig@novell.com
+* Thu Mar 01 2007 jfehlig@novell.com
 - Fix exception caused by incorrect method name in xen-messages.diff.
   This is one of perhaps several problems with save/restore,
   bug #237859
-* Fri Mar 02 2007 dpmerrill@novell.com
+* Thu Mar 01 2007 dpmerrill@novell.com
 - Add xen-ioemu-hvm-pv-support.diff
   This patch allows for shutting down the IDE drive.
 * Thu Mar 01 2007 jfehlig@novell.com
@@ -1311,7 +1341,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + Updated domUloader to accept '--args' parameter.  The args
   provided as an option to --args are simply added to the sexpr
   returned by domUloader.  pygrub has similar behavior.
-* Thu Mar 01 2007 ccoffing@novell.com
+* Wed Feb 28 2007 ccoffing@novell.com
 - Update vm-install:
   + #249013, #228113: default to realtek instead of pcnet
   + #249124: write os-type to config files
@@ -1320,7 +1350,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   model exceptions
   + Add "Add" button to Operating System Installation page, based
   on usability feedback
-* Thu Mar 01 2007 jfehlig@novell.com
+* Wed Feb 28 2007 jfehlig@novell.com
 - Added changeset 13786 and 14022 from xen-unstable.  These
   changesets affect the Xen API C bindings only and are low risk.
   This is a continuation of support for FATE feature 110320.  ECO
@@ -1330,7 +1360,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + #244772: display error message in GUI if xen isn't running
   + #246049: better error message when OS==SUSE but ISO looks wrong
   + Fix printing of jobid when run with --background
-* Thu Feb 22 2007 ccoffing@novell.com
+* Wed Feb 21 2007 ccoffing@novell.com
 - Don't allow "xm create" of running VM.  (#245253)
 - Update vm-install:
   + Fix inability to use already-extracted SUSE kernel/initrds
@@ -1342,7 +1372,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Tue Feb 20 2007 ccoffing@novell.com
 - Fix typo in xendomains.  (#246107)
 - Fix order in which vm-install processes command-line arguments.
-* Sat Feb 17 2007 jfehlig@novell.com
+* Fri Feb 16 2007 jfehlig@novell.com
 - Added changeset 13775 from xen-unstable.  This patch fixes
   the last known issue with the Xen API patchset backported
   from xen-unstable.
@@ -1350,7 +1380,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Added c/s 13226 from xen-unstable.  It affects Xen API only.
 - Added patch to remove ':disk' and 'tap:qcow' from stored domain
   config.  Fixes bug #237414 and helps with bug #242953.
-* Fri Feb 16 2007 jfehlig@novell.com
+* Thu Feb 15 2007 jfehlig@novell.com
 - Backported Xen API functionality from xen-unstable to support
   hosting CIM providers.  This functionality is required for
   FATE feature 110320.  ECO has been approved.
@@ -1365,7 +1395,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   Dom0. (#244055) Patches 13630-domctl.patch,
   13903-domctl.patch and 13908-domctl.patch
 - Updated patch pae-guest-linear-pgtable.patch
-* Tue Feb 13 2007 ccoffing@novell.com
+* Mon Feb 12 2007 ccoffing@novell.com
 - Load xenblk at dom0 start to support bootstrapping from
   non-loopback devices.  (#242963, #186696)
 - Update vm-install:
@@ -1375,9 +1405,9 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + #240984: properly detach vncviewer
   + #240387: default to absolute coordinate mouse for Windows
 - Drop logging patch.  (#245150)
-* Mon Feb 12 2007 ro@suse.de
+* Sun Feb 11 2007 ro@suse.de
 - remove -fstack-protector from RPM_OPT_FLAGS for now
-* Fri Feb 09 2007 ccoffing@novell.com
+* Thu Feb 08 2007 ccoffing@novell.com
 - Update vm-install:
   + Allow specifing disk (and disk size) vs. cdrom from CLI
   + Add missing -M/--max-memory parameter to CLI to match GUI
@@ -1428,18 +1458,18 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Sat Jan 20 2007 brogers@novell.com
 - Fix handling of localtime config file parameter for PV guests
   (#234376)
-* Sat Jan 20 2007 ccoffing@novell.com
+* Fri Jan 19 2007 ccoffing@novell.com
 - Update xen-vm-install (NIC UI work; do not require tcp port bz
   [#236517]; integrate with virt-manager)
-* Thu Jan 18 2007 ccoffing@novell.com
+* Wed Jan 17 2007 ccoffing@novell.com
 - Update xen-vm-install (more disk UI work; support NetWare
   response files and licenses)
-* Wed Jan 17 2007 ccoffing@novell.com
+* Tue Jan 16 2007 ccoffing@novell.com
 - Major fixes to xen-vm-install (adding disks in the UI now works,
   and fixed several CLI exceptions)
 - Microcode does not need to be exactly 2048 bytes (changeset
   13079; Kurt)
-* Sat Jan 13 2007 ccoffing@novell.com
+* Fri Jan 12 2007 ccoffing@novell.com
 - Include script to clone SLES 10 domU, from coolsolutions (fate
   [#301742])
 - Updated patches from Gerd and Jan, including PAE > 4 gig fix,
@@ -1449,7 +1479,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Include xen-unstable patches for HVM save/restore and 32-on-64
   HVM.
 - Update to xen-3.0.4-1 (changeset 13132).
-* Thu Jan 11 2007 ccoffing@novell.com
+* Wed Jan 10 2007 ccoffing@novell.com
 - Update xen-vm-install and domUloader to support NetWare.
 - Include AMD's nested page table patches.
 * Mon Jan 08 2007 ccoffing@novell.com
@@ -1466,13 +1496,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Update to xen-3.0.4 (changeset 13100).
 - Update xen-vm-install tools.
 - Include Jim's 2 xen-tools patches for CIM provider issues.
-* Tue Dec 19 2006 ccoffing@novell.com
+* Mon Dec 18 2006 ccoffing@novell.com
 - Update to xen-3.0.4-rc3 (changeset 13087).
 - Fix line terminators in block-iscsi (#228864)
 - Make domUloader work with blktap support in xend.
 * Fri Dec 15 2006 ccoffing@novell.com
 - Update to xen-3.0.4-rc2 (changeset 13067).
-* Fri Dec 15 2006 ccoffing@novell.com
+* Thu Dec 14 2006 ccoffing@novell.com
 - Update to xen-3.0.4-rc1 (changeset 12901).
 * Wed Dec 13 2006 brogers@novell.com
 - Patch for loading bimodal PAE kernel to suuport NetWare
@@ -1480,11 +1510,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Update to xen-unstable (changeset 12757).
 - Enable LIBXENAPI_BINDINGS and XENFB_TOOLS.
 - Enable unix domain socket for xend; needed by tools.
-* Wed Dec 06 2006 ccoffing@novell.com
+* Tue Dec 05 2006 ccoffing@novell.com
 - Update to xen-unstable (changeset 12734; feature freeze for
   3.0.4)
 - Make /etc/xen mode 0700 to protect vnc passwords.
-* Tue Nov 28 2006 ccoffing@novell.com
+* Mon Nov 27 2006 ccoffing@novell.com
 - Fix how bootloader is called by the xend during restarts.
   (#223850)
 * Wed Nov 22 2006 ccoffing@novell.com
@@ -1498,7 +1528,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Fix some problems in the xen-hvm-default-bridge patch. (#219092)
 - xmlrpc isn't 64-bit clean, causing xend to get exceptions when
   PFN is > 2 GB. (#220418)
-* Tue Nov 14 2006 kallan@novell.com
+* Mon Nov 13 2006 kallan@novell.com
 - Backport changesets 11847, 11888, 1189[6-9], 119[00-18], 11974,
   1203[0-2], and 12205 from xen-unstable so that the PV drivers
   can compile on older kernels such as sles9 and rhel4
@@ -1521,7 +1551,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Tue Oct 31 2006 ccoffing@novell.com
 - Backport xen-unstable changesets 1184[1-3] to address SVM
   interrupt injection issues.  Replaces earlier (broken) patches.
-* Tue Oct 31 2006 ccoffing@novell.com
+* Mon Oct 30 2006 ccoffing@novell.com
 - /var/lib/xen/images should not be world readable. (#214638)
 - Update to xen-3.0.3-0 (changeset 11774; no code changes).
 * Mon Oct 16 2006 ccoffing@novell.com
@@ -1562,7 +1592,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Build debug version of xen-pae.
 * Mon Sep 25 2006 ccoffing@novell.com
 - Update to xen-unstable changeset 11616.
-* Wed Sep 13 2006 ccoffing@novell.com
+* Tue Sep 12 2006 ccoffing@novell.com
 - Update check_python script to identify Python 2.5 RCs as valid.
 * Mon Sep 11 2006 ccoffing@novell.com
 - Update to xen-unstable changeset 11440.
@@ -1570,17 +1600,17 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   (#204758)
 - Include Jan's updated patch for #192150 (to preserve register
   context when doing IO).
-* Wed Sep 06 2006 ccoffing@novell.com
+* Tue Sep 05 2006 ccoffing@novell.com
 - Update block-nbd and xmexample.nbd, and add block-iscsi and
   xmexample.iscsi (from Kurt).
 * Thu Aug 31 2006 ccoffing@novell.com
 - Automatically create/destroy virtual frame buffer viewer.  Add
   "sdl=1" to config file of a paravirtualized VM to get the viewer.
 - Log files have moved to /var/log/xen.
-* Wed Aug 30 2006 ccoffing@novell.com
+* Tue Aug 29 2006 ccoffing@novell.com
 - xendomains does not actually save domains.  (#201349)
 - Update to xen-unstable changeset 11299.
-* Tue Aug 29 2006 ccoffing@novell.com
+* Mon Aug 28 2006 ccoffing@novell.com
 - Fix incorrect path on x86_64 for vncfb and sdlfb.
 * Thu Aug 17 2006 ccoffing@novell.com
 - Improve xendomains init script, to handle unset sysconfig vars.
@@ -1589,12 +1619,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Wed Aug 16 2006 ccoffing@novell.com
 - Update to xen-unstable changeset 11134.
 - Drop xen-reverse-10064.diff now that kernel is updated.
-* Wed Aug 09 2006 ccoffing@novell.com
+* Tue Aug 08 2006 ccoffing@novell.com
 - Re-enabled patch for #184175.
 - Update to xen-unstable changeset 10986.
 - Include Jan's patch to preserve register context when doing
   IO.  (#192150)
-* Sat Jul 29 2006 ccoffing@novell.com
+* Fri Jul 28 2006 ccoffing@novell.com
 - Add support to domUloader for "xm create --dry-run".  Based on
   patch from HP.
 * Thu Jul 27 2006 ccoffing@novell.com
@@ -1616,13 +1646,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Added for loop to retry the losetup -d in /etc/xen/scripts/block.
   It is possible for the losetup -d to fail if another process is
   examining the loopback devices e.g. losetup -a.  (#151105)
-* Thu Jul 13 2006 ccoffing@novell.com
+* Wed Jul 12 2006 ccoffing@novell.com
 - Corrected and updated README.
 * Mon Jul 10 2006 ccoffing@novell.com
 - Add Jeff Mahoney's block-sync.diff, to give control of
   "losetup -y" to the user (and potentially yast).  Defaults to
   old async behavior.  (#190869)
-* Fri Jul 07 2006 ccoffing@novell.com
+* Thu Jul 06 2006 ccoffing@novell.com
 - Update to xen-unstable tree.  Revert changeset 10064, to maintain
   backwards compatibility with SLES 10.
 * Wed Jul 05 2006 ccoffing@novell.com
@@ -1650,13 +1680,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Fri Jun 23 2006 kallan@novell.com
 - Updated xen-bonding.diff to enable bonding again after the latest
   patches to network-bridge etc. (#161888)
-* Thu Jun 22 2006 ccoffing@novell.com
+* Wed Jun 21 2006 ccoffing@novell.com
 - Clean up the useless "Nothing to flush" messages, from 'ip addr
   flush', in /var/log/xen-hotplug.log
 - Fix race condition in domUloader.py, when another process did
   losetup -d while domUloader was running.  This would result in
   the mount failing, and so the VM would fail to start.
-* Wed Jun 21 2006 ccoffing@novell.com
+* Tue Jun 20 2006 ccoffing@novell.com
 - Revamp balloon.py to account for pages currently being
   scrubbed.  (#185135)
 * Mon Jun 19 2006 ccoffing@novell.com
@@ -1752,11 +1782,11 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   ballooning timeout with the amount of memory being requested
   (necessary for large memory machines).  This is a more proper fix
   for Novell bug #175805, and addresses XenSource bug #650.
-* Fri Jun 02 2006 ccoffing@novell.com
+* Thu Jun 01 2006 ccoffing@novell.com
 - Update the README, regarding how to make the mouse work properly
   with VNC in HVM.
 - Update help text in mk-xen-rescue-img.
-* Thu Jun 01 2006 ccoffing@novell.com
+* Wed May 31 2006 ccoffing@novell.com
 - Jan's backport of xen-unstable changesets 9517, 9518, and 9529.
   This allows Xen to boot on 4-node configurations without
   crashing.  (#150114)
@@ -1826,7 +1856,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + 9685,9686: This patch only affects full virtualization on
   Intel.  Fixes VM's segment base address, to avoid vmentry
   failure.  Also remove 32/64 differences in vmx reg store/load.
-* Thu May 18 2006 ccoffing@novell.com
+* Wed May 17 2006 ccoffing@novell.com
 - When auto-ballooning domain 0's memory for a new HVM domain,
   all memory (including memory intended for overhead) was given
   to the VM itself.  So increasing the memory size calculations
@@ -1863,18 +1893,18 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Handle memory failure when staring fully virtualized
   guests to prevent reboot of the box (AMD) or
   hanging the box (VT) (#149179).
-* Wed May 10 2006 ccoffing@novell.com
+* Tue May 09 2006 ccoffing@novell.com
 - Include select patches from xen-3.0-testing:
   + 9665: Fix pciif parsing for compatibility variable.
   + 9666: Fix HVM hang; was broken due to previous "hda lost
   interrupt" patch. (#169146)
   + 9667: Do not set GP fault in VMCS for VMX (no bug#; from Intel)
-* Fri May 05 2006 cgriffin@novell.com
+* Thu May 04 2006 cgriffin@novell.com
 - Update xen-3.0-testing tree, changeset 9664:
   + Changesets 9663 and 9664 fix AMD fully virtualized
   guests causing the system to reboot when
   first starting up.  (#169855)
-* Fri May 05 2006 cgriffin@novell.com
+* Thu May 04 2006 cgriffin@novell.com
 - With a Xen domain set up with a loop-mountable file as rootfs,
   the "xm start " invocation fails. The cause is a bug
   domUloader.py (#172586)
@@ -1906,7 +1936,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + Fix reboot on large SMP machines (IBM, no bug #).
 - Integrate Jan's patches:
   + Spurious interrupt roundup (#152892).
-* Tue Apr 25 2006 ccoffing@novell.com
+* Mon Apr 24 2006 ccoffing@novell.com
 - Integrate Jan's patches:
   + FXSR patch (#135677).
   + APIC option patch (work-around #150114).
@@ -1940,7 +1970,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Wed Apr 19 2006 agruen@suse.de
 - Create /boot symlinks in the %%install section instead of in
   %%post so that they will end up in the package file list.
-* Wed Apr 19 2006 ccoffing@novell.com
+* Tue Apr 18 2006 ccoffing@novell.com
 - Add /etc/xen/vm to vm config file search path (#167208).
 * Fri Apr 14 2006 kallan@novell.com
 - Add support for bonding in network-bridge. (#161678).
@@ -1957,7 +1987,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
   + Fixes xmlrpc issues.
   + Fixes several emulated instructions for HVM.
   + Fixes for x86_64 inline assembly.
-* Wed Apr 12 2006 ccoffing@novell.com
+* Tue Apr 11 2006 ccoffing@novell.com
 - Fix "jitter" and race in dom0's memory target calculation, which
   could cause auto-ballooning to fail (#164714).
 * Tue Apr 11 2006 brogers@novell.com
@@ -1983,7 +2013,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Fix default localtime for full (Bruce Rogers).
 - Fix path in mk-xen-resue-img.sh (#163622).
 - Update README (pathnames, yast2-vm descriptions, terminology).
-* Tue Apr 04 2006 garloff@suse.de
+* Mon Apr 03 2006 garloff@suse.de
 - init script: Test for control_d in capabilities to determine dom0
   rather than privcmd.
 - init script: Try loading netloop and backend modules.
@@ -1992,7 +2022,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Mon Apr 03 2006 ccoffing@novell.com
 - Update to hg 9514 (xen-unstable tree; 3.0.2-rc).
 - Fix for rebooting (Jan Beulich; #160064).
-* Sat Apr 01 2006 ccoffing@novell.com
+* Fri Mar 31 2006 ccoffing@novell.com
 - Update to hg 9502 (xen-unstable tree; 3.0.2-rc).
 - Update man page (#162402).
 - xen-tools requires python-xml (#161712).
@@ -2002,13 +2032,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Correctly default XAUTHORITY if it is not set.  This allows the
   GUI to come up for fully virtualized guests (was especially
   problematic when VM was started from YaST).  (#142472)
-* Thu Mar 30 2006 ccoffing@novell.com
+* Wed Mar 29 2006 ccoffing@novell.com
 - Fixed reversed "Do I have enough memory?" test when creating
   new VMs (#156448).
 * Tue Mar 28 2006 ccoffing@novell.com
 - Pick up two critical fixes for AMD to fix full virtualization:
   c/s 9453 & c/s 9456.
-* Fri Mar 24 2006 ccoffing@novell.com
+* Thu Mar 23 2006 ccoffing@novell.com
 - Update to hg 9434 (xen-unstable tree; 3.0.2-rc).
 - Fix /etc/xen/scripts/block to properly check if devices can be
   shared.
@@ -2027,7 +2057,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Removed the intermediate sym-link between xen.gz and
   xen-<version>-<release>.gz.  Grub 0.97 XFS can not handle a
   double indirect to a file.  (#151792)
-* Tue Mar 14 2006 garloff@suse.de
+* Mon Mar 13 2006 garloff@suse.de
 - Update README.SuSE: Document limits (mem, cpu hotplug, max_loop),
   more network troubleshooting, update security info.
 - Be more tolerant against errors in ifdown/ifup to better coexist
@@ -2058,7 +2088,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Fix build of hvmloader and vmxassist by removing external
   CFLAGS (XS changeset #9110).
 - Fix build by forcing --prefix during installation of *.py.
-* Thu Mar 02 2006 ccoffing@novell.com
+* Wed Mar 01 2006 ccoffing@novell.com
 - Update to hg 9029 (xen-unstable tree).  Adds support for HVM on
   64 bit hardware.
 - Update vncmouse diff to 20060301 from Intel; compensates for lack
@@ -2081,7 +2111,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Remove unnecessary x86_64 patch.
 - Fix auto-ballooning of dom0 memory for HVM domUs (XenSource bug
   521).
-* Wed Feb 22 2006 ccoffing@novell.com
+* Tue Feb 21 2006 ccoffing@novell.com
 - Update to hg 8920 (xen-unstable tree).  Fixes instruction decode
   for fully virtualized guests, fixing booting from CDs.
 - Integrate 3 patches from Intel, to improve VNC performance.
@@ -2093,7 +2123,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Update to hg 8870 (xen-unstable tree).  More HVM fixes.
 - Remove duplicate balloon.free call.
 - Add patch from Intel to fix dom0 crash on 64 bit SMP HVM.
-* Fri Feb 17 2006 carnold@novell.com
+* Thu Feb 16 2006 carnold@novell.com
 - Update to hg 8858 (xen-unstable tree).
 * Wed Feb 15 2006 ccoffing@novell.com
 - Update to hg 8857 (xen-unstable tree).  Syncs hypervisor core
@@ -2127,13 +2157,13 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Revamp mk-xen-rescue-img.sh (#118566).
 - Revamp rcxendomains:  improved output, error checking, return
   values (#143754, #105677).
-* Wed Jan 25 2006 ccoffing@novell.com
-- Update to hg 8659 (xen-unstable tree).
 * Tue Jan 24 2006 ccoffing@novell.com
+- Update to hg 8659 (xen-unstable tree).
+* Mon Jan 23 2006 ccoffing@novell.com
 - Correct return values and improve messages of init scripts.
-* Sat Jan 21 2006 ccoffing@novell.com
+* Fri Jan 20 2006 ccoffing@novell.com
 - Use domUloader instead of pygrub.
-* Fri Jan 20 2006 carnold@novell.com
+* Thu Jan 19 2006 carnold@novell.com
 - Build based on the xen-unstable.hg 8628
 * Wed Jan 18 2006 carnold@novell.com
 - Update to hg 8646 xen-unstable-hvm.hg tree.
@@ -2141,7 +2171,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Allow version string "XEN_VER=3.0" instead of just
   "XEN_VER=xen-3.0" for backwards compatibility.
 - Correctly set changeset in compile.h.
-* Fri Jan 13 2006 carnold@novell.com
+* Thu Jan 12 2006 carnold@novell.com
 - Added two patches from AMD that apply to the 8513 changeset.
 * Thu Jan 12 2006 kukuk@suse.de
 - Add libreiserfs-devel to nfb.
@@ -2157,7 +2187,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Fix gcc 4.1 warnings.
 * Wed Dec 07 2005 ccoffing@novell.com
 - Update to hg 8241 (xen-3.0-testing).
-* Tue Nov 29 2005 ccoffing@novell.com
+* Mon Nov 28 2005 ccoffing@novell.com
 - Update to hg 8073.
 - Rationalize command names (eg, setsize -> xentrace-setsize).
 - Fix gcc 4.1 warnings.
@@ -2167,7 +2197,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Include a few simple, obvious fixes from upstream.
 - Build xm-test package.
 - Update udev scripts.
-* Tue Nov 15 2005 ccoffing@novell.com
+* Mon Nov 14 2005 ccoffing@novell.com
 - Includes upstream fixes to fix i586 save/restore.
 * Thu Nov 10 2005 ccoffing@novell.com
 - Include a few simple, obvious fixes: 7609, 7618, 7636, 7689,
@@ -2186,12 +2216,12 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Wed Oct 19 2005 garloff@suse.de
 - Avoid race in watchdog functionality.
 - Improve network-bridge script.
-* Wed Oct 19 2005 garloff@suse.de
+* Tue Oct 18 2005 garloff@suse.de
 - Ignore zombies in the xendomains shutdown procedure and have a
   configurable timeout for the commands. Make xendomains status
   report something useful.
 - Make xendomains script comaptible to non-SUSE distros.
-* Tue Oct 18 2005 garloff@suse.de
+* Mon Oct 17 2005 garloff@suse.de
 - Update to hg 7398.
 * Mon Oct 17 2005 garloff@suse.de
 - Create useful xendomains init script and sysconfig file.
@@ -2224,15 +2254,15 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Sat Sep 10 2005 garloff@suse.de
 - Update to hg 6715.
 - Fix network-bridge down.
-* Thu Sep 08 2005 garloff@suse.de
-- Build PAE version along non-PAE version of Hypervisor.
 * Wed Sep 07 2005 garloff@suse.de
+- Build PAE version along non-PAE version of Hypervisor.
+* Tue Sep 06 2005 garloff@suse.de
 - Try to fix network bridge down issue.
 - Document netowrking and firewalling caveats in README.SUSE.
 - Enable PAE.
-* Wed Sep 07 2005 garloff@suse.de
+* Tue Sep 06 2005 garloff@suse.de
 - Update to hg 6644.
-* Mon Sep 05 2005 garloff@suse.de
+* Sun Sep 04 2005 garloff@suse.de
 - Update to hg 6610.
 - Rename default name of xen-br0 to xenbr0.
 - Fix pygrub installation.
@@ -2253,14 +2283,14 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 * Mon Aug 22 2005 garloff@suse.de
 - Update to hg 6315.
 - Include linux-public headers in xen-devel package.
-* Mon Aug 22 2005 garloff@suse.de
-- Update to hg 6305.
 * Sun Aug 21 2005 garloff@suse.de
+- Update to hg 6305.
+* Sat Aug 20 2005 garloff@suse.de
 - Update to hg 6299.
 - Enable VNC support (depending on LibVNCServer).
-* Sun Aug 21 2005 garloff@suse.de
-- Split off xen-tools-ioemu for supporting unmodified guests.
 * Sat Aug 20 2005 garloff@suse.de
+- Split off xen-tools-ioemu for supporting unmodified guests.
+* Fri Aug 19 2005 garloff@suse.de
 - Enable pygrub (at the cost of depending on e2fsprogs-devel)
 - Enable VMX ioemu SDL support (at the cost of many dependencies)
 * Fri Aug 19 2005 garloff@suse.de
@@ -2288,23 +2318,23 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Fix version-check in NetWare loader (0x336ec577 -> 0x326ec578).
 * Fri Jun 17 2005 ccoffing@novell.com
 - Backport NetWare-friendly loader from Xen 3.0.
-* Fri Jun 17 2005 ccoffing@novell.com
+* Thu Jun 16 2005 ccoffing@novell.com
 - Destroy domains that failed to be fully created.
 * Fri Jun 10 2005 garloff@suse.de
 - Update to latest 2.0-testing snapshot.
 - Use RPM version and release no as xen version.
-* Wed Jun 08 2005 garloff@suse.de
+* Tue Jun 07 2005 garloff@suse.de
 - Update mk-xen-rescue-img.sh script: Handle SLES9 better.
 - Export PYTHONOPTIMIZE in xend start script.
-* Tue Jun 07 2005 garloff@suse.de
+* Mon Jun 06 2005 garloff@suse.de
 - Merge _perform_err fixes.
 * Mon May 23 2005 ccoffing@novell.com
 - update to 2.0.6
-* Thu Apr 14 2005 garloff@suse.de
+* Wed Apr 13 2005 garloff@suse.de
 - More gcc4 and binutils related fixes.
 * Wed Apr 13 2005 garloff@suse.de
 - Build fixes for gcc4.
-* Mon Apr 04 2005 garloff@suse.de
+* Sun Apr 03 2005 garloff@suse.de
 - Update xen: Various fixes (scheduling, memset, domain crash
   handling) and enhancements (bg page scrubbing).
 * Thu Mar 24 2005 garloff@suse.de
@@ -2318,7 +2348,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Require ports < 1024 to allow controlling VMs.
 * Mon Mar 21 2005 garloff@suse.de
 - Update xen.
-* Thu Mar 17 2005 garloff@suse.de
+* Wed Mar 16 2005 garloff@suse.de
 - Update xen.
 - Add /var/lib/xen/xen-db/ subdirs.
 * Sun Mar 13 2005 garloff@suse.de
@@ -2346,16 +2376,16 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Add bridge-utils dependency.
 - Update config file and README.
 - Activate xend init script on installation.
-* Thu Feb 10 2005 ro@suse.de
+* Wed Feb 09 2005 ro@suse.de
 - remove te_etex and te_pdf from neededforbuild.
-* Thu Feb 10 2005 garloff@suse.de
+* Wed Feb 09 2005 garloff@suse.de
 - Update README about IDE dma.
 - Default to dhcp.
-* Thu Feb 10 2005 garloff@suse.de
+* Wed Feb 09 2005 garloff@suse.de
 - Update to xen post-2.0.4.
 - Little bugfix for xen rescue install script.
 - Update README.SUSE: Better explanation of root FS creation.
-* Mon Jan 24 2005 garloff@suse.de
+* Sun Jan 23 2005 garloff@suse.de
 - Change some defaults to be more secure (xend only binds to
   localhost, ip spoof protection on).
 - Avoid ipv6 issue with xend network script.
@@ -2365,7 +2395,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.*
 - Put boot.local script in root img to parse ip boot par.
 * Thu Jan 20 2005 garloff@suse.de
 - Update to newer snapshot.
-* Thu Jan 20 2005 garloff@suse.de
+* Wed Jan 19 2005 garloff@suse.de
 - Update to xen-2.0-unstable (post 2.0.3).
 * Thu Dec 09 2004 garloff@suse.de
 - Initial creation of package xen, xen-doc-*.
diff --git a/xend-domain-lock.patch b/xend-domain-lock.patch
index dd0d3d6..c62c4c7 100644
--- a/xend-domain-lock.patch
+++ b/xend-domain-lock.patch
@@ -264,7 +264,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py
 ===================================================================
 --- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomain.py
 +++ xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py
-@@ -1294,6 +1294,7 @@ class XendDomain:
+@@ -1295,6 +1295,7 @@ class XendDomain:
                               POWER_STATE_NAMES[DOM_STATE_RUNNING],
                               POWER_STATE_NAMES[dominfo._stateGet()])
  
@@ -318,7 +318,7 @@ Index: xen-3.3.0-testing/tools/examples/Makefile
 ===================================================================
 --- xen-3.3.0-testing.orig/tools/examples/Makefile
 +++ xen-3.3.0-testing/tools/examples/Makefile
-@@ -36,6 +36,7 @@ XEN_SCRIPTS += vtpm vtpm-delete
+@@ -35,6 +35,7 @@ XEN_SCRIPTS += vtpm vtpm-delete
  XEN_SCRIPTS += xen-hotplug-cleanup
  XEN_SCRIPTS += external-device-migrate
  XEN_SCRIPTS += vscsi
diff --git a/xend-vif-fix.patch b/xend-vif-fix.patch
new file mode 100644
index 0000000..b5a588d
--- /dev/null
+++ b/xend-vif-fix.patch
@@ -0,0 +1,18 @@
+Index: xen-3.3.0-testing/tools/python/xen/xend/server/netif.py
+===================================================================
+--- xen-3.3.0-testing.orig/tools/python/xen/xend/server/netif.py
++++ xen-3.3.0-testing/tools/python/xen/xend/server/netif.py
+@@ -101,6 +101,13 @@ class NetifController(DevController):
+     def __init__(self, vm):
+         DevController.__init__(self, vm)
+ 
++    def createDevice(self, config):
++        typ = config.get('type', '')
++        if typ == 'ioemu':
++            return 0
++
++        DevController.createDevice(self, config)
++
+     def getDeviceDetails(self, config):
+         """@see DevController.getDeviceDetails"""
+