# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1175708502 -3600
# Node ID 10f06a7a05e90d0d0aad11112945815580520897
# Parent 171fba41a44e2f1f72e693b9539385da4bc4ba63
hvm: x86 ioemu-dm does not need a memory-size parameter on the command line.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
tools/ioemu/target-i386-dm/exec-dm.c | 10 ++--------
tools/ioemu/xenstore.c | 6 +++---
tools/python/xen/xend/image.py | 9 ++++++---
3 files changed, 11 insertions(+), 14 deletions(-)
diff -r 171fba41a44e -r 10f06a7a05e9 tools/ioemu/target-i386-dm/exec-dm.c
--- a/tools/ioemu/target-i386-dm/exec-dm.c Wed Apr 04 17:58:06 2007 +0100
+++ b/tools/ioemu/target-i386-dm/exec-dm.c Wed Apr 04 18:41:42 2007 +0100
@@ -431,14 +431,8 @@ static inline int paddr_is_ram(target_ph
{
/* Is this guest physical address RAM-backed? */
#if defined(CONFIG_DM) && (defined(__i386__) || defined(__x86_64__))
- if (ram_size <= HVM_BELOW_4G_RAM_END)
- /* RAM is contiguous */
- return (addr < ram_size);
- else
- /* There is RAM below and above the MMIO hole */
- return ((addr < HVM_BELOW_4G_MMIO_START) ||
- ((addr >= HVM_BELOW_4G_MMIO_START + HVM_BELOW_4G_MMIO_LENGTH)
- && (addr < ram_size + HVM_BELOW_4G_MMIO_LENGTH)));
+ return ((addr < HVM_BELOW_4G_MMIO_START) ||
+ (addr >= HVM_BELOW_4G_MMIO_START + HVM_BELOW_4G_MMIO_LENGTH));
#else
return (addr < ram_size);
#endif
diff -r 171fba41a44e -r 10f06a7a05e9 tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c Wed Apr 04 17:58:06 2007 +0100
+++ b/tools/ioemu/xenstore.c Wed Apr 04 18:41:42 2007 +0100
@@ -272,7 +272,7 @@ void xenstore_process_logdirty_event(voi
/* Double-check that the bitmaps are the size we expect */
if (logdirty_bitmap_size != *(uint32_t *)seg) {
- fprintf(logfile, "Log-dirty: got %lu, calc %lu\n",
+ fprintf(logfile, "Log-dirty: got %u, calc %lu\n",
*(uint32_t *)seg, logdirty_bitmap_size);
return;
}
@@ -304,7 +304,7 @@ void xenstore_process_logdirty_event(voi
fprintf(logfile, "Log-dirty: bad next-active entry: %s\n", act);
exit(1);
}
- logdirty_bitmap = seg + i * logdirty_bitmap_size;
+ logdirty_bitmap = (unsigned long *)(seg + i * logdirty_bitmap_size);
/* Ack that we've switched */
xs_write(xsh, XBT_NULL, active_path, act, len);
@@ -612,7 +612,7 @@ int xenstore_vm_write(int domid, char *k
path = xs_get_domain_path(xsh, domid);
if (path == NULL) {
- fprintf(logfile, "xs_get_domain_path(%d): error\n");
+ fprintf(logfile, "xs_get_domain_path: error\n");
goto out;
}
diff -r 171fba41a44e -r 10f06a7a05e9 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Wed Apr 04 17:58:06 2007 +0100
+++ b/tools/python/xen/xend/image.py Wed Apr 04 18:41:42 2007 +0100
@@ -426,11 +426,14 @@ class HVMImageHandler(ImageHandler):
# Execute device model.
#todo: Error handling
args = [self.device_model]
- args = args + ([ "-d", "%d" % self.vm.getDomid(),
- "-m", "%s" % (self.getRequiredInitialReservation() / 1024)])
+ args = args + ([ "-d", "%d" % self.vm.getDomid() ])
+ if arch.type == "ia64":
+ args = args + ([ "-m", "%s" %
+ (self.getRequiredInitialReservation() / 1024) ])
args = args + self.dmargs
if restore:
- args = args + ([ "-loadvm", "/tmp/xen.qemu-dm.%d" %
self.vm.getDomid() ])
+ args = args + ([ "-loadvm", "/tmp/xen.qemu-dm.%d" %
+ self.vm.getDomid() ])
env = dict(os.environ)
if self.display:
env['DISPLAY'] = self.display
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home