forked from pool/libvirt
0e53c763a0
- CVE-2014-0028, CVE-2014-1447, CVE-2013-6458, CVE-2013-6457,
CVE-2013-6436
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped upstream patches: 5e397d9c-test-fix-dbus-crash.patch,
78af457e-fix-virnettlscontexttest.patch,
9faf3f29-LXC-memtune.patch, f8c1cb90-CVE-2013-6436.patch,
libxl-hvm-nic.patch
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=342
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
Index: libvirt-1.2.1/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-1.2.1.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-1.2.1/src/libxl/libxl_conf.c
|
|
@@ -561,6 +561,30 @@ libxlMakeChrdevStr(virDomainChrDefPtr de
|
|
}
|
|
|
|
static int
|
|
+libxlFixupDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config)
|
|
+{
|
|
+ libxl_domain_build_info *b_info = &d_config->b_info;
|
|
+ int hvm = STREQ(def->os.type, "hvm");
|
|
+ libxl_device_vfb vfb;
|
|
+
|
|
+ if (!hvm)
|
|
+ return 0;
|
|
+
|
|
+ if (d_config->num_vfbs) {
|
|
+ vfb = d_config->vfbs[0];
|
|
+ if (libxl_defbool_val(vfb.vnc.enable))
|
|
+ memcpy(&b_info->u.hvm.vnc, &vfb.vnc, sizeof(libxl_vnc_info));
|
|
+ else if (libxl_defbool_val(vfb.sdl.enable))
|
|
+ memcpy(&b_info->u.hvm.sdl, &vfb.sdl, sizeof(libxl_sdl_info));
|
|
+ else
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+
|
|
+static int
|
|
libxlMakeDomBuildInfo(virDomainObjPtr vm, libxl_domain_config *d_config)
|
|
{
|
|
virDomainDefPtr def = vm->def;
|
|
@@ -1189,6 +1213,9 @@ libxlBuildDomainConfig(libxlDriverPrivat
|
|
if (libxlMakeVfbList(driver, def, d_config) < 0)
|
|
return -1;
|
|
|
|
+ if (libxlFixupDomBuildInfo(def, d_config) < 0)
|
|
+ return -1;
|
|
+
|
|
d_config->on_reboot = def->onReboot;
|
|
d_config->on_poweroff = def->onPoweroff;
|
|
d_config->on_crash = def->onCrash;
|