From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] block: Restore extboot functionality after mismerge Date: Mon, 05 Jul 2010 15:40:54 +0300 Message-ID: <4C31D2D6.40003@redhat.com> References: <1278331370-26353-1-git-send-email-stefanha@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Markus Armbruster To: Stefan Hajnoczi Return-path: Received: from mx1.redhat.com ([209.132.183.28]:20389 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755528Ab0GEMk5 (ORCPT ); Mon, 5 Jul 2010 08:40:57 -0400 In-Reply-To: <1278331370-26353-1-git-send-email-stefanha@linux.vnet.ibm.com> Sender: kvm-owner@vger.kernel.org List-ID: On 07/05/2010 03:02 PM, Stefan Hajnoczi wrote: > Extboot if=virtio,boot=on is broken due to a mismerge of: > > commit 666daa68234b5b1758652633cab07d5ca6046a5b > Author: Markus Armbruster > Date: Wed Jun 2 18:48:27 2010 +0200 > > blockdev: Collect block device code in new blockdev.c > > in: > > commit 55cbee9e738bfe7434081967f884209f1a9c994c > Merge: a854beb 666daa6 > Author: Avi Kivity > Date: Mon Jun 21 17:29:02 2010 +0300 > > Merge commit '666daa68234b5b1758652633cab07d5ca6046a5b' into > upstream-merge > > The extboot_drive global is no longer being initialized in drive_init(). > This patch restores the code to initialize extboot_drive. > Applied, thanks. -- error compiling committee.c: too many arguments to function