From 6cc2de8c8b6d265299459d9988f747a2f679d5a891fa6e9db67063ac101be7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Fri, 4 Apr 2014 13:07:17 +0000 Subject: [PATCH] Accepting request 229020 from home:cbosdonnat:branches:Virtualization cleanup after upgrade to 1.2.3 OBS-URL: https://build.opensuse.org/request/show/229020 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=363 --- libvirt.changes | 5 +++++ libvirt.spec | 19 +++++++++-------- libvirtd-defaults.patch | 13 ++++++++++++ libxl-hvm-vnc.patch | 45 ----------------------------------------- 4 files changed, 27 insertions(+), 55 deletions(-) delete mode 100644 libxl-hvm-vnc.patch diff --git a/libvirt.changes b/libvirt.changes index 009b571..db80cf9 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 2 13:38:50 UTC 2014 - cbosdonnat@suse.com + +- Removed libxl-hvm-vnc.patch: went upstream in another form + ------------------------------------------------------------------- Wed Apr 2 12:06:04 UTC 2014 - cbosdonnat@suse.com diff --git a/libvirt.spec b/libvirt.spec index 4302648..7665f5d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -432,7 +432,6 @@ Source99: baselibs.conf Patch100: xen-name-for-devid.patch Patch101: ia64-clone.patch Patch102: xen-pv-cdrom.patch -Patch103: libxl-hvm-vnc.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: libvirtd-init-script.patch @@ -947,7 +946,6 @@ namespaces. %patch100 -p1 %patch101 -p1 %patch102 -p1 -%patch103 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 @@ -1211,10 +1209,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "//d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -cat > $RPM_BUILD_ROOT%{_docdir}/libvirt/libvirt-daemon-config-network.README << 'EOF' -Any empty package containing only a post install scriptlet that ensures -a default network is defined. -EOF %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml @@ -1483,8 +1477,10 @@ fi %config %{_fwdefdir}/libvirtd-relocation-server %if ! %{with_driver_modules} -%if %{with_network} +%if %{with_network} || %{with_qemu} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ +%endif +%if %{with_network} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ @@ -1492,6 +1488,9 @@ fi %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml %endif +%if %{with_nwfilter} +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ +%endif %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf @@ -1531,7 +1530,8 @@ fi %files daemon-config-network %defattr(-, root, root) -%doc %{_docdir}/%{name}/libvirt-daemon-config-network.README +%dir %{_datadir}/libvirt/networks/ +%{_datadir}/libvirt/networks/default.xml %endif %if %{with_nwfilter} @@ -1558,8 +1558,6 @@ fi %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %dir %{_libdir}/%{name}/connection-driver @@ -1578,6 +1576,7 @@ fi %files daemon-driver-nwfilter %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %dir %{_libdir}/%{name}/connection-driver %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %endif diff --git a/libvirtd-defaults.patch b/libvirtd-defaults.patch index c9e414b..8c6fc8f 100644 --- a/libvirtd-defaults.patch +++ b/libvirtd-defaults.patch @@ -26,3 +26,16 @@ Index: libvirt-1.2.2/daemon/libvirtd-config.c data->listen_tcp = 0; if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 || +Index: libvirt-1.2.3/daemon/test_libvirtd.aug.in +=================================================================== +--- libvirt-1.2.3.orig/daemon/test_libvirtd.aug.in ++++ libvirt-1.2.3/daemon/test_libvirtd.aug.in +@@ -2,7 +2,7 @@ module Test_libvirtd = + ::CONFIG:: + + test Libvirtd.lns get conf = +- { "listen_tls" = "0" } ++ { "listen_tls" = "1" } + { "listen_tcp" = "1" } + { "tls_port" = "16514" } + { "tcp_port" = "16509" } diff --git a/libxl-hvm-vnc.patch b/libxl-hvm-vnc.patch deleted file mode 100644 index e18c7f9..0000000 --- a/libxl-hvm-vnc.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: libvirt-1.2.3/src/libxl/libxl_conf.c -=================================================================== ---- libvirt-1.2.3.orig/src/libxl/libxl_conf.c -+++ libvirt-1.2.3/src/libxl/libxl_conf.c -@@ -567,6 +567,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; -@@ -1322,6 +1346,9 @@ libxlBuildDomainConfig(libxlDriverPrivat - if (libxlMakePciList(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;