From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: Re: [PATCH] qemu-kvm: Prepare IOAPIC for upstream merge Date: Mon, 14 Feb 2011 13:43:45 -0200 Message-ID: <20110214154345.GA32191@amt.cnet> References: <4D4FDEA6.1010101@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Avi Kivity , kvm To: Jan Kiszka Return-path: Received: from mx1.redhat.com ([209.132.183.28]:33958 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755771Ab1BNPoA (ORCPT ); Mon, 14 Feb 2011 10:44:00 -0500 Content-Disposition: inline In-Reply-To: <4D4FDEA6.1010101@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: 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.