On Tue, Dec 23, 2008 at 04:05:14PM +0100, Markus Armbruster wrote:
Omit (type ioemu) on RHEL-5, because it breaks PV drivers on HVM there.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
....
+#ifdef WITH_RHEL5_API +#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 +#else +#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3 +#endif + /** * xend_connection_type: * @@ -5155,7 +5161,7 @@ xenDaemonFormatSxprNet(virConnectPtr conn, * apparently (type ioemu) breaks paravirt drivers on HVM so skip this * from Xen 3.1.0 */ - if ((hvm) && (xendConfigVersion < 4)) + if (hvm && xendConfigVersion < XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU)
For this to be a no-op if WITH_RHEL5_API is not defined, then I guess we need xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU
diff --git a/src/xm_internal.c b/src/xm_internal.c
like here:
- if (hvm && priv->xendConfigVersion < 4) + if (hvm && priv->xendConfigVersion <= XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU)
Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/