From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCRv7-0003pP-54 for qemu-devel@nongnu.org; Wed, 30 Jul 2014 07:19:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCRv2-0003aq-B4 for qemu-devel@nongnu.org; Wed, 30 Jul 2014 07:19:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCRv2-0003aW-4E for qemu-devel@nongnu.org; Wed, 30 Jul 2014 07:19:40 -0400 From: Markus Armbruster References: <592b4a2a2b00e21470bec1a2ecf259a64eb285b2.1406703720.git.jan.kiszka@siemens.com> <20140730085732.GA14263@redhat.com> <53D8B6B4.5070302@redhat.com> Date: Wed, 30 Jul 2014 13:19:36 +0200 In-Reply-To: <53D8B6B4.5070302@redhat.com> (Paolo Bonzini's message of "Wed, 30 Jul 2014 11:11:16 +0200") Message-ID: <87a97rnlfb.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/3] pc: Fix disabling of vapic for compat PC models List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Jan Kiszka , qemu-devel , "Michael S. Tsirkin" Paolo Bonzini writes: > Il 30/07/2014 10:57, Michael S. Tsirkin ha scritto: >> On Wed, Jul 30, 2014 at 09:01:59AM +0200, Jan Kiszka wrote: >>> We used to be able to address both the QEMU and the KVM APIC via "apic". >>> This doesn't work anymore. So we need to use their parent class to turn >>> off the vapic on machines that should not expose them. >>> >>> Signed-off-by: Jan Kiszka >> >> >> >> OK so this is intended for 2.2? If yes, we should cc: qemu-stable. >> In that case, how about creating a macro with type name, >> and using that? This way things don't break if we rename >> something again. > > Don't we have warnings for that now? Warnings don't help much in cases like this: "apic" still exists and has the property, it's just not the device we want. Macros aren't foolproof, either. >>> --- >>> hw/i386/pc_piix.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c >>> index 9694f88..73ba77d 100644 >>> --- a/hw/i386/pc_piix.c >>> +++ b/hw/i386/pc_piix.c >>> @@ -645,7 +645,7 @@ static QEMUMachine pc_machine_v1_1 = { >>> .property = "class",\ >>> .value = stringify(PCI_CLASS_MEMORY_RAM),\ >>> },{\ >>> - .driver = "apic",\ >>> + .driver = "apic-common",\ >>> .property = "vapic",\ >>> .value = "off",\ >>> },{\ >>> -- >>> 1.8.1.1.298.ge7eed54 You could use TYPE_APIC_COMMON here. Including "hw/i386/apic_internal.h" for it would be not so nice, though.