ia64/xen-unstable

changeset 14723:10f06a7a05e9

hvm: x86 ioemu-dm does not need a memory-size parameter on the command line.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Wed Apr 04 18:41:42 2007 +0100 (2007-04-04)
parents 171fba41a44e
children b3c75956303b
files tools/ioemu/target-i386-dm/exec-dm.c tools/ioemu/xenstore.c tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/ioemu/target-i386-dm/exec-dm.c	Wed Apr 04 17:58:06 2007 +0100
     1.2 +++ b/tools/ioemu/target-i386-dm/exec-dm.c	Wed Apr 04 18:41:42 2007 +0100
     1.3 @@ -431,14 +431,8 @@ static inline int paddr_is_ram(target_ph
     1.4  {
     1.5      /* Is this guest physical address RAM-backed? */
     1.6  #if defined(CONFIG_DM) && (defined(__i386__) || defined(__x86_64__))
     1.7 -    if (ram_size <= HVM_BELOW_4G_RAM_END)
     1.8 -        /* RAM is contiguous */
     1.9 -        return (addr < ram_size);
    1.10 -    else
    1.11 -        /* There is RAM below and above the MMIO hole */
    1.12 -        return ((addr < HVM_BELOW_4G_MMIO_START) ||
    1.13 -                ((addr >= HVM_BELOW_4G_MMIO_START + HVM_BELOW_4G_MMIO_LENGTH)
    1.14 -                 && (addr < ram_size + HVM_BELOW_4G_MMIO_LENGTH)));
    1.15 +    return ((addr < HVM_BELOW_4G_MMIO_START) ||
    1.16 +            (addr >= HVM_BELOW_4G_MMIO_START + HVM_BELOW_4G_MMIO_LENGTH));
    1.17  #else
    1.18      return (addr < ram_size);
    1.19  #endif
     2.1 --- a/tools/ioemu/xenstore.c	Wed Apr 04 17:58:06 2007 +0100
     2.2 +++ b/tools/ioemu/xenstore.c	Wed Apr 04 18:41:42 2007 +0100
     2.3 @@ -272,7 +272,7 @@ void xenstore_process_logdirty_event(voi
     2.4  
     2.5          /* Double-check that the bitmaps are the size we expect */
     2.6          if (logdirty_bitmap_size != *(uint32_t *)seg) {
     2.7 -            fprintf(logfile, "Log-dirty: got %lu, calc %lu\n", 
     2.8 +            fprintf(logfile, "Log-dirty: got %u, calc %lu\n", 
     2.9                      *(uint32_t *)seg, logdirty_bitmap_size);
    2.10              return;
    2.11          }
    2.12 @@ -304,7 +304,7 @@ void xenstore_process_logdirty_event(voi
    2.13          fprintf(logfile, "Log-dirty: bad next-active entry: %s\n", act);
    2.14          exit(1);
    2.15      }
    2.16 -    logdirty_bitmap = seg + i * logdirty_bitmap_size;
    2.17 +    logdirty_bitmap = (unsigned long *)(seg + i * logdirty_bitmap_size);
    2.18  
    2.19      /* Ack that we've switched */
    2.20      xs_write(xsh, XBT_NULL, active_path, act, len);
    2.21 @@ -612,7 +612,7 @@ int xenstore_vm_write(int domid, char *k
    2.22  
    2.23      path = xs_get_domain_path(xsh, domid);
    2.24      if (path == NULL) {
    2.25 -	fprintf(logfile, "xs_get_domain_path(%d): error\n");
    2.26 +	fprintf(logfile, "xs_get_domain_path: error\n");
    2.27  	goto out;
    2.28      }
    2.29  
     3.1 --- a/tools/python/xen/xend/image.py	Wed Apr 04 17:58:06 2007 +0100
     3.2 +++ b/tools/python/xen/xend/image.py	Wed Apr 04 18:41:42 2007 +0100
     3.3 @@ -426,11 +426,14 @@ class HVMImageHandler(ImageHandler):
     3.4          # Execute device model.
     3.5          #todo: Error handling
     3.6          args = [self.device_model]
     3.7 -        args = args + ([ "-d",  "%d" % self.vm.getDomid(),
     3.8 -                  "-m", "%s" % (self.getRequiredInitialReservation() / 1024)])
     3.9 +        args = args + ([ "-d",  "%d" % self.vm.getDomid() ])
    3.10 +        if arch.type == "ia64":
    3.11 +            args = args + ([ "-m", "%s" %
    3.12 +                             (self.getRequiredInitialReservation() / 1024) ])
    3.13          args = args + self.dmargs
    3.14          if restore:
    3.15 -            args = args + ([ "-loadvm", "/tmp/xen.qemu-dm.%d" % self.vm.getDomid() ])
    3.16 +            args = args + ([ "-loadvm", "/tmp/xen.qemu-dm.%d" %
    3.17 +                             self.vm.getDomid() ])
    3.18          env = dict(os.environ)
    3.19          if self.display:
    3.20              env['DISPLAY'] = self.display