From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: Re: [PATCH] qemu-kvm: Prepare IOAPIC for upstream merge Date: Mon, 14 Feb 2011 16:53:19 +0100 Message-ID: <4D594FEF.2090903@siemens.com> References: <4D4FDEA6.1010101@siemens.com> <20110214154345.GA32191@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Avi Kivity , kvm To: Marcelo Tosatti Return-path: Received: from thoth.sbs.de ([192.35.17.2]:32464 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754635Ab1BNPxc (ORCPT ); Mon, 14 Feb 2011 10:53:32 -0500 In-Reply-To: <20110214154345.GA32191@amt.cnet> Sender: kvm-owner@vger.kernel.org List-ID: On 2011-02-14 16:43, Marcelo Tosatti wrote: > On Mon, Feb 07, 2011 at 12:59:34PM +0100, Jan Kiszka wrote: >> Drop base_address from the vmstate, upstream decided against managing it >> at device level. Instead, fetch it from the sysbus device state when >> setting the in-kernel state. Moreover, merge ioapic_pre_load into >> ioapic_post_load as upstream does. >> >> Signed-off-by: Jan Kiszka >> --- >> hw/ioapic.c | 26 +++++++------------------- >> 1 files changed, 7 insertions(+), 19 deletions(-) > > Patch rejects due to last merge, please rebase. Already done [1]. Jan [1] http://article.gmane.org/gmane.comp.emulators.kvm.devel/67911 -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux