8547e28bd5
23233-hvm-cr-access.patch 23234-svm-decode-assist-base.patch 23235-svm-decode-assist-crs.patch 23236-svm-decode-assist-invlpg.patch 23238-svm-decode-assist-insn-fetch.patch 23303-cpufreq-misc.patch 23304-amd-oprofile-strings.patch 23305-amd-fam15-xenoprof.patch 23306-amd-fam15-vpmu.patch 23334-amd-fam12+14-vpmu.patch 23338-vtd-force-intremap.patch - fate#310957 - Update to Xen 4.1.1-rc1 c/s 23064 - xentrace: dynamic tracebuffer allocation xen-unstable.xentrace.dynamic_tbuf.patch xen-unstable.xentrace.empty_t_info_pages.patch xen-unstable.xentrace.verbose.patch xen-unstable.xentrace.no_gdprintk.patch xen-unstable.xentrace.comments.patch xen-unstable.xentrace.printk_prefix.patch xen-unstable.xentrace.remove_debug_printk.patch xen-unstable.xentrace.t_info_pages-formula.patch xen-unstable.xentrace.register_cpu_notifier-boot_time.patch xen-unstable.xentrace.t_info_page-overflow.patch xen-unstable.xentrace.t_info_first_offset.patch xen-unstable.xentrace.data_size__read_mostly.patch xen-unstable.xentrace.__insert_record-dst-type.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=124
73 lines
2.5 KiB
Diff
73 lines
2.5 KiB
Diff
Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/xenstore.c
|
|
===================================================================
|
|
--- xen-4.1.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
|
|
+++ xen-4.1.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;
|
|
@@ -714,8 +716,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
|
|
@@ -845,6 +872,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)
|