[libvirt] [PATCH] xen config: No vfb in HVM guest configuration

[Stefan Bader]

2012/4/6 Daniel Veillard <veillard at redhat.com>:
> On Fri, Apr 06, 2012 at 08:33:28AM +0200, Stefan Bader wrote:
>> 2012/4/6 Daniel Veillard <veillard at redhat.com>:
>> > On Thu, Apr 05, 2012 at 06:44:35PM +0200, Stefan Bader wrote:
>> >> This causes an implicit vkbd device to be added which takes
>> >> 6min to finally fail being initialized in the guest.
>> >>
>> >> http://lists.xen.org/archives/html/xen-devel/2012-04/msg00409.html
>> >>
>> >> Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
>> >> ---
>> >>  src/xenxs/xen_sxpr.c |   11 ++++-------
>> >>  src/xenxs/xen_xm.c   |    2 +-
>> >>  2 files changed, 5 insertions(+), 8 deletions(-)
>> >>
>> >> diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
>> >> index b26b2bc..b2f98f6 100644
>> >> --- a/src/xenxs/xen_sxpr.c
>> >> +++ b/src/xenxs/xen_sxpr.c
>> >> @@ -2464,9 +2464,8 @@ xenFormatSxpr(virConnectPtr conn,
>> >>              }
>> >>          }
>> >>
>> >> -        /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */
>> >> -        if ((!hvm && xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF) ||
>> >> -            (hvm && xendConfigVersion < XEND_CONFIG_VERSION_3_1_0)) {
>> >> +        /* PV graphics for xen <= 3.0.4, or HVM graphics */
>> >> +        if (hvm || (xendConfigVersion < XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
>> >>              if ((def->ngraphics == 1) &&
>> >>                  xenFormatSxprGraphicsOld(def->graphics[0],
>> >>                                           &buf, xendConfigVersion) < 0)
>> >> @@ -2578,10 +2577,8 @@ xenFormatSxpr(virConnectPtr conn,
>> >>      if (xenFormatSxprAllPCI(def, &buf) < 0)
>> >>          goto error;
>> >>
>> >> -    /* New style PV graphics config xen >= 3.0.4,
>> >> -     * or HVM graphics config xen >= 3.0.5 */
>> >> -    if ((xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF && !hvm) ||
>> >> -        (xendConfigVersion >= XEND_CONFIG_VERSION_3_1_0 && hvm)) {
>> >> +    /* New style PV graphics config xen >= 3.0.4 */
>> >> +    if (!hmv && (xendConfigVersion >= XEND_CONFIG_MIN_VERS_PVFB_NEWCONF)) {
>> >
>> >            ^^^ typo, it's hvm
>> >    did you really compiled with the patch applied ?
>>
>> No, but no, too. Sorry, just saw this. I must admit I did not compile
>> this again. I tried but it would have required a bit more fiddling to
>> get over the autogen stage. And it was getting later the day, so I
>> just ported what I got for our package and sent it.
>> But the !hvm would be correct here. This is emitting the vfb part in
>> sxpr which comes later with the devices sections. It should only be
>> done for PVM not HVM. The patch basically removes the lower part of
>> the if (so I probably should have left the order of config version
>> test and then looking at hvm or not untouched, but I thought it be
>> clearer to have all tests in the same pattern).
>
>  yeah, please double check upstream git:
>
> http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=fb98da005071f7f9a5d222b3829901682732900c
>
> it's still better if you could compile locally to make sure,
> the hardest part of autogem.sh is making sure you have the needed
> local dependencies to build, but it should not be that hard !
>

Thanks, glancing over the git commit, it looks right. I normally would
spend the time to at least compile test things. Just as it was the
evening before Good Friday (which is a public holiday in these parts
of the world) I felt a bit less motivated to find out what parts of
what version of libnl the system complains about and how that package
would be called in Debian/Ubuntu terms. Apologizes for that.

Stefan

> Daniel
>
> --
> Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
> daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
> http://veillard.com/ | virtualization library  http://libvirt.org/
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list