SHA256
1
0
forked from pool/xen
OBS User unknown
2009-05-04 16:38:09 +00:00
committed by Git OBS Bridge
parent 4790095364
commit 0bb51565d6
187 changed files with 2454 additions and 20791 deletions

View File

@@ -1,13 +1,12 @@
Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
===================================================================
--- xen-3.3.1-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
@@ -671,6 +671,18 @@ static void xenstore_process_dm_command_
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
@@ -919,6 +919,18 @@ 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");
@@ -18,23 +17,15 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
+ goto out;
+ if (delete_disk_snapshots(par) == 0)
+ xenstore_record_dm_state("snapshot-deleted");
+ free(par);
} else if (!strncmp(command, "continue", len)) {
fprintf(logfile, "dm-command: continue after state save\n");
xen_pause_requested = 0;
Index: xen-3.3.1-testing/tools/ioemu-remote/xen-vl-extra.c
Index: xen-3.4.0-testing/tools/ioemu-remote/savevm.c
===================================================================
--- xen-3.3.1-testing.orig/tools/ioemu-remote/xen-vl-extra.c
+++ xen-3.3.1-testing/tools/ioemu-remote/xen-vl-extra.c
@@ -16,6 +16,8 @@ static int qemu_savevm_state(QEMUFile *f
static int qemu_loadvm_state(QEMUFile *f);
static int bdrv_can_snapshot(BlockDriverState *bs);
+static int bdrv_has_snapshot(BlockDriverState *bs);
+static BlockDriverState *get_bs_snapshots(void);
static int bdrv_snapshot_find(BlockDriverState *bs, QEMUSnapshotInfo *sn_info,
const char *name);
@@ -166,6 +168,35 @@ the_end:
--- xen-3.4.0-testing.orig/tools/ioemu-remote/savevm.c
+++ xen-3.4.0-testing/tools/ioemu-remote/savevm.c
@@ -1096,6 +1096,35 @@ the_end:
return ret;
}
@@ -67,14 +58,14 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/xen-vl-extra.c
+ return 0;
+}
+
struct qemu_alarm_timer;
static int unix_start_timer(struct qemu_alarm_timer *t) { return 0; }
static void unix_stop_timer(struct qemu_alarm_timer *t) { }
Index: xen-3.3.1-testing/tools/ioemu-remote/qemu-xen.h
#ifndef CONFIG_DM
void do_savevm(const char *name)
Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h
===================================================================
--- xen-3.3.1-testing.orig/tools/ioemu-remote/qemu-xen.h
+++ xen-3.3.1-testing/tools/ioemu-remote/qemu-xen.h
@@ -22,6 +22,7 @@ enum {
--- xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-xen.h
+++ xen-3.4.0-testing/tools/ioemu-remote/qemu-xen.h
@@ -42,6 +42,7 @@ enum {
/* xen-vl-extra.c */
int save_disk_snapshots(const char* name);