64f5943c90
to chkdsk snapshot-xend.patch snapshot-ioemu-restore.patch - bnc#651957 - Xen: vm-install failed to start xenpaging.enabled.patch - fate#310510 - fix xenpaging xenpaging.signal_handling.patch - unlink pagefile in signal handler OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=84
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
|
|
===================================================================
|
|
--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
|
|
+++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
|
|
@@ -103,6 +103,8 @@ int xenstore_watch_new_callback(const ch
|
|
}
|
|
|
|
|
|
+char* get_snapshot_name(int devid);
|
|
+
|
|
static int pasprintf(char **buf, const char *fmt, ...)
|
|
{
|
|
va_list ap;
|
|
@@ -666,8 +668,33 @@ void xenstore_parse_domain_config(int hv
|
|
|
|
fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write");
|
|
|
|
- if (bdrv_open2(bs, params, flags, format) < 0)
|
|
+ if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) {
|
|
fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0");
|
|
+ } else {
|
|
+ char* snapshot = get_snapshot_name(atoi(e_danger[i]));
|
|
+ if (snapshot) {
|
|
+ fprintf(stderr, "Using snapshot %s\n", snapshot);
|
|
+ ret = bdrv_snapshot_goto(bs, snapshot);
|
|
+ switch (ret) {
|
|
+ case 0:
|
|
+ /* Success */
|
|
+ break;
|
|
+ case -ENOTSUP:
|
|
+ /* Don't abort here (could be read-only ISO) */
|
|
+ fprintf(stderr, "Snapshots are not supported for "
|
|
+ "this image file format\n");
|
|
+ break;
|
|
+ case -ENOENT:
|
|
+ fprintf(stderr, "No such snapshot, skipping this "
|
|
+ "image file\n");
|
|
+ continue;
|
|
+ default:
|
|
+ fprintf(stderr, "Could not load snapshot, skipping"
|
|
+ " this image file\n");
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
#endif
|
|
@@ -802,6 +829,23 @@ int xenstore_parse_disable_pf_config ()
|
|
return disable_pf;
|
|
}
|
|
|
|
+
|
|
+char* get_snapshot_name(int devid)
|
|
+{
|
|
+ char* path = NULL;
|
|
+ char* name = NULL;
|
|
+ unsigned int len;
|
|
+
|
|
+ if (pasprintf(&path,
|
|
+ "/local/domain/0/backend/tap/%u/%u/snapshot", domid, devid) == -1)
|
|
+ return NULL;
|
|
+ name = xs_read(xsh, XBT_NULL, path, &len);
|
|
+
|
|
+ free(path);
|
|
+ return name;
|
|
+}
|
|
+
|
|
+
|
|
int xenstore_fd(void)
|
|
{
|
|
if (xsh)
|