From c8361aee7dd4dedc496c7fbe8be17c4fb5e7f31a Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 5 Jun 2009 11:47:31 +0000 Subject: [PATCH] * Fri Jun 5 2009 Mark McLoughlin - 0.6.2-12.fc11 - Use the correct QEMU machine type for ppc (bug #502862) - Fix crash with TLS connections (bug #503066) - Fix broken networking with newer qemu releases (bug #503275) - Remove the qemu BuildRequires --- ...id-broken-networking-with-newer-qemu.patch | 27 +++++++++ libvirt-0.6.2-libvirtd-double-free.patch | 54 ++++++++++++++++++ libvirt-0.6.2-qemu-ppc-machine-type.patch | 57 +++++++++++++++++++ libvirt.spec | 20 +++++-- 4 files changed, 154 insertions(+), 4 deletions(-) create mode 100644 libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch create mode 100644 libvirt-0.6.2-libvirtd-double-free.patch create mode 100644 libvirt-0.6.2-qemu-ppc-machine-type.patch diff --git a/libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch b/libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch new file mode 100644 index 0000000..bf94cca --- /dev/null +++ b/libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch @@ -0,0 +1,27 @@ +From 934b71abf1b908f720811a44ad5411cfc1a4ca37 Mon Sep 17 00:00:00 2001 +From: Daniel P. Berrange +Date: Thu, 28 May 2009 13:15:57 +0000 +Subject: [PATCH 1/1] Avoid broken networking with new QEMU/KVM >= 86 + +--- + src/qemu_conf.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qemu_conf.c b/src/qemu_conf.c +index 93dc0b7..a04d216 100644 +--- a/src/qemu_conf.c ++++ b/src/qemu_conf.c +@@ -658,8 +658,8 @@ qemudNetworkIfaceConnect(virConnectPtr conn, + } + + snprintf(tapfdstr, sizeof(tapfdstr), +- "tap,fd=%d,script=,vlan=%d,ifname=%s", +- tapfd, vlan, net->ifname); ++ "tap,fd=%d,vlan=%d", ++ tapfd, vlan); + + if (!(retval = strdup(tapfdstr))) + goto no_memory; +-- +1.6.0.6 + diff --git a/libvirt-0.6.2-libvirtd-double-free.patch b/libvirt-0.6.2-libvirtd-double-free.patch new file mode 100644 index 0000000..ec613a0 --- /dev/null +++ b/libvirt-0.6.2-libvirtd-double-free.patch @@ -0,0 +1,54 @@ +From c3b3f6005d45552d01823504925eb587889cf25a Mon Sep 17 00:00:00 2001 +From: Daniel P. Berrange +Date: Fri, 29 May 2009 14:34:35 +0000 +Subject: [PATCH 1/1] Avoid double-free in daemon client cleanup code + +--- + qemud/qemud.c | 22 +++++++++++++++++----- + 1 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/qemud/qemud.c b/qemud/qemud.c +index 1375560..783dc69 100644 +--- a/qemud/qemud.c ++++ b/qemud/qemud.c +@@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket + * jobs have finished, then clean it up elsehwere + */ + void qemudDispatchClientFailure(struct qemud_client *client) { +- virEventRemoveHandleImpl(client->watch); ++ if (client->watch != -1) { ++ virEventRemoveHandleImpl(client->watch); ++ client->watch = -1; ++ } + + /* Deregister event delivery callback */ + if(client->conn) { +@@ -1406,12 +1406,21 @@ void qemudDispatchClientFailure(struct qemud_client *client) { + } + + #if HAVE_SASL +- if (client->saslconn) sasl_dispose(&client->saslconn); ++ if (client->saslconn) { ++ sasl_dispose(&client->saslconn); ++ client->saslconn = NULL; ++ } + free(client->saslUsername); ++ client->saslUsername = NULL; + #endif +- if (client->tlssession) gnutls_deinit (client->tlssession); +- close(client->fd); +- client->fd = -1; ++ if (client->tlssession) { ++ gnutls_deinit (client->tlssession); ++ client->tlssession = NULL; ++ } ++ if (client->fd != -1) { ++ close(client->fd); ++ client->fd = -1; ++ } + } + + +-- +1.6.0.6 + diff --git a/libvirt-0.6.2-qemu-ppc-machine-type.patch b/libvirt-0.6.2-qemu-ppc-machine-type.patch new file mode 100644 index 0000000..726f434 --- /dev/null +++ b/libvirt-0.6.2-qemu-ppc-machine-type.patch @@ -0,0 +1,57 @@ +From daf3db93457427c25325781af684758c0341a6aa Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Fri, 29 May 2009 13:32:06 +0000 +Subject: [PATCH 1/1] PPC Qemu Machine Type update + * src/qemu_conf.c docs/schemas/domain.rng + tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type + changed from g3bw to g3beige some time ago, patch by Thomas Baker + Daniel + +--- + docs/schemas/domain.rng | 2 +- + src/qemu_conf.c | 2 +- + tests/capabilityschemadata/caps-qemu-kvm.xml | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng +index 204c633..11cf04a 100644 +--- a/docs/schemas/domain.rng ++++ b/docs/schemas/domain.rng +@@ -184,7 +184,7 @@ + + + +- g3bw ++ g3beige + mac99 + prep + +diff --git a/src/qemu_conf.c b/src/qemu_conf.c +index 18156cd..d54f2ca 100644 +--- a/src/qemu_conf.c ++++ b/src/qemu_conf.c +@@ -192,7 +192,7 @@ static const char *const arch_info_hvm_sparc_machines[] = { + "sun4m" + }; + static const char *const arch_info_hvm_ppc_machines[] = { +- "g3bw", "mac99", "prep" ++ "g3beige", "mac99", "prep" + }; + + static const char *const arch_info_xen_x86_machines[] = { +diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml +index fd8523e..893f9ed 100644 +--- a/tests/capabilityschemadata/caps-qemu-kvm.xml ++++ b/tests/capabilityschemadata/caps-qemu-kvm.xml +@@ -81,7 +81,7 @@ + + 32 + /usr/bin/qemu-system-ppc +- g3bw ++ g3beige + mac99 + prep + +-- +1.6.0.6 + diff --git a/libvirt.spec b/libvirt.spec index 29441a1..de6281f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -66,7 +66,7 @@ Summary: Library providing a simple API virtualization Name: libvirt Version: 0.6.2 -Release: 11%{?dist}%{?extra_release} +Release: 12%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: libvirt-%{version}.tar.gz @@ -94,6 +94,12 @@ Patch9: libvirt-0.6.2-event-handling-2.patch Patch10: libvirt-0.6.2-do-not-log-monitor-output.patch # Bring up the bridge, even if it doesn't have an IP address (bz 501912) Patch11: libvirt-0.6.2-bring-up-ipless-bridge.patch +# Use the correct QEMU machine type for ppc (bz 502862) +Patch12: libvirt-0.6.2-qemu-ppc-machine-type.patch +# Fix crash with TLS connections (bz 503066) +Patch13: libvirt-0.6.2-libvirtd-double-free.patch +# Fix broken networking with newer qemu releases (bz 503275) +Patch14: libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch # Not for upstream. Temporary hack till PulseAudio autostart # problems are sorted out when SELinux enforcing @@ -167,9 +173,6 @@ BuildRequires: avahi-devel BuildRequires: libselinux-devel BuildRequires: dnsmasq BuildRequires: bridge-utils -%if %{with_qemu} -BuildRequires: qemu -%endif %if %{with_sasl} BuildRequires: cyrus-sasl-devel %endif @@ -260,6 +263,9 @@ of recent versions of Linux (and other OSes). %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %patch200 -p0 @@ -583,6 +589,12 @@ fi %endif %changelog +* Fri Jun 5 2009 Mark McLoughlin - 0.6.2-12.fc11 +- Use the correct QEMU machine type for ppc (bug #502862) +- Fix crash with TLS connections (bug #503066) +- Fix broken networking with newer qemu releases (bug #503275) +- Remove the qemu BuildRequires + * Mon May 25 2009 Mark McLoughlin - 0.6.2-11.fc11 - Bring up the bridge, even if it doesn't have an IP address (bug #501912)