From 00b829acdf83904e5fbae21130853247b36f2348 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 5 Aug 2013 16:42:43 +0100 Subject: [PATCH] launch: libvirt: Enable . This may still cause problems on some CPUs because of a bug in libvirt. See: https://bugzilla.redhat.com/show_bug.cgi?id=870071 (cherry picked from commit 6f76fdb41eb6bd124fbc3d084f5c2a3371b37d9b) --- src/launch-libvirt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 6fcb880..e6f6b0b 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -820,13 +820,10 @@ construct_libvirt_xml_cpu (guestfs_h *g, XMLERROR (-1, xmlTextWriterWriteFormatString (xo, "%d", g->memsize)); XMLERROR (-1, xmlTextWriterEndElement (xo)); - /* It would be faster to pass the CPU host model to the appliance, + /* It is faster to pass the CPU host model to the appliance, * allowing maximum speed for things like checksums, encryption. - * However this doesn't work because KVM doesn't emulate all of the - * required guest insns (RHBZ#870071). This is why the following - * section is commented out. + * Note this may cause problems on some CPUs. See: RHBZ#870071. */ -#if 0 XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "cpu")); XMLERROR (-1, xmlTextWriterWriteAttribute (xo, BAD_CAST "mode", @@ -837,7 +834,6 @@ construct_libvirt_xml_cpu (guestfs_h *g, BAD_CAST "allow")); XMLERROR (-1, xmlTextWriterEndElement (xo)); XMLERROR (-1, xmlTextWriterEndElement (xo)); -#endif XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "vcpu")); XMLERROR (-1, xmlTextWriterWriteFormatString (xo, "%d", g->smp)); -- 1.8.3.1