From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIdPX-00060T-Dx for qemu-devel@nongnu.org; Thu, 30 Jun 2016 10:57:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIdPQ-00082c-Vb for qemu-devel@nongnu.org; Thu, 30 Jun 2016 10:57:46 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIdPQ-000829-PM for qemu-devel@nongnu.org; Thu, 30 Jun 2016 10:57:40 -0400 Received: by mail-wm0-x243.google.com with SMTP id r201so23566187wme.0 for ; Thu, 30 Jun 2016 07:57:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 30 Jun 2016 16:57:37 +0200 Message-Id: <1467298657-6588-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2] pcspk: fix KVM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, real@ispras.ru, pl@kamp.de The link property that was added to the pcspk device has the wrong type: it is only correct for TCG and for KVM's userspace or split irqchip options. The default KVM option (fully in-kernel irqchip) breaks because it uses a PIT whose type is a sibling of TYPE_I8254. Fixes: 873b4d3f0571a1e415cf089a67a230ea8a12d059 Tested-by: Peter Lieven Signed-off-by: Paolo Bonzini --- hw/audio/pcspk.c | 2 +- include/hw/timer/i8254.h | 8 ++++++++ include/hw/timer/i8254_internal.h | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index a7aa4e9..42a6f48 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -171,7 +171,7 @@ static void pcspk_initfn(Object *obj) memory_region_init_io(&s->ioport, OBJECT(s), &pcspk_io_ops, s, "pcspk", 1); - object_property_add_link(obj, "pit", TYPE_I8254, + object_property_add_link(obj, "pit", TYPE_PIT_COMMON, (Object **)&s->pit, qdev_prop_allow_set_link_before_realize, 0, &error_abort); diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 4349033..27a0fb6 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -37,6 +37,14 @@ typedef struct PITChannelInfo { int out; } PITChannelInfo; +#define TYPE_PIT_COMMON "pit-common" +#define PIT_COMMON(obj) \ + OBJECT_CHECK(PITCommonState, (obj), TYPE_PIT_COMMON) +#define PIT_COMMON_CLASS(klass) \ + OBJECT_CLASS_CHECK(PITCommonClass, (klass), TYPE_PIT_COMMON) +#define PIT_COMMON_GET_CLASS(obj) \ + OBJECT_GET_CLASS(PITCommonClass, (obj), TYPE_PIT_COMMON) + #define TYPE_I8254 "isa-pit" #define TYPE_KVM_I8254 "kvm-pit" diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_internal.h index 61a1bfb..e7cb757 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -57,14 +57,6 @@ typedef struct PITCommonState { PITChannelState channels[3]; } PITCommonState; -#define TYPE_PIT_COMMON "pit-common" -#define PIT_COMMON(obj) \ - OBJECT_CHECK(PITCommonState, (obj), TYPE_PIT_COMMON) -#define PIT_COMMON_CLASS(klass) \ - OBJECT_CLASS_CHECK(PITCommonClass, (klass), TYPE_PIT_COMMON) -#define PIT_COMMON_GET_CLASS(obj) \ - OBJECT_GET_CLASS(PITCommonClass, (obj), TYPE_PIT_COMMON) - typedef struct PITCommonClass { ISADeviceClass parent_class; -- 1.8.3.1