a58c0b5ccc
- Add support for AArch64 architecture
- Various improvements on test code and test driver
- Don't link virt-login-shell against libvirt.so
- Close all non-stdio FDs in virt-login-shell
- Only allow 'stderr' log output when running setuid
- Fix perms for virConnectDomainXML{To,From}Native
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Drop upstream patches: e7f400a1-CVE-2013-4296.patch,
2dba0323-CVE-2013-4297.patch, db7a5688-CVE-2013-4311.patch,
e65667c0-CVE-2013-4311.patch, 922b7fda-CVE-2013-4311.patch,
e4697b92-CVE-2013-4311.patch, 8294aa0c-CVE-2013-4399.patch,
484cc321-fix-spice-migration.patch,
79552754-libvirtd-chardev-crash.patch,
57687fd6-CVE-2013-4401.patch, ae53e5d1-CVE-2013-4400.patch,
8c3586ea-CVE-2013-4400.patch, b7fcc799a-CVE-2013-4400.patch,
3e2f27e1-CVE-2013-4400.patch, 5a0ea4b7-CVE-2013-4400.patch,
843bdb2f-CVE-2013-4400.patch,
bd773e74-lxc-terminate-machine.patch,
e350826c-python-fix-fd-passing.patch
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=329
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
Index: libvirt-1.1.4/src/libxl/libxl_conf.c
|
|
===================================================================
|
|
--- libvirt-1.1.4.orig/src/libxl/libxl_conf.c
|
|
+++ libvirt-1.1.4/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;
|
|
@@ -1176,6 +1200,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;
|