Message ID | 1534870966-9287-14-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ju5R3Abj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vy5B5ttrz9s8T for <incoming@patchwork.ozlabs.org>; Wed, 22 Aug 2018 03:16:30 +1000 (AEST) Received: from localhost ([::1]:55007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fsAGa-0004gc-7I for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 13:16:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA49-0001SV-85 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3z-0005yz-JS for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:31 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46454) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1fsA3s-0005ie-3h for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:03:21 -0400 Received: by mail-wr1-x433.google.com with SMTP id a108-v6so13814869wrc.13 for <qemu-devel@nongnu.org>; Tue, 21 Aug 2018 10:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+EiNerbP1pk7gA6CFNncAQS/IxgM5wfOMJfiv+7i/bU=; b=Ju5R3Abj55zL3xZproY3x065jTC1oxGvtKFE1HG1otor/bJYqzKblHwJE/TNNwHkDk hUkxrxqtDnMTSNWwWnpAM3pySbpeIazDoF9zbUoId8VdKUtu9g6WJWzB4Bue9xyXIqgh JOW9wtGpTe2YHcC7tz34hhfJYqUPpjP3OzLmLVfjam5BGks3wDC0Xt3oBkiPjZ83obkC BMXTMso1QLFTOcPajNB1diFu5AJxDWyNIT9C46/PKJeBXxQ/qjBxUktBqWRP72ElGdY2 oYkSwJ3xgurfb9xF4K2wCzNyS2Y7SAByLR+rhXNuSiMtyuSFJx3Tk72SC/XliIYyOyh0 m0eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+EiNerbP1pk7gA6CFNncAQS/IxgM5wfOMJfiv+7i/bU=; b=PwjV9G+XtlbNdxfywQ1tLmZqrQpiOP37vfSjXadMavyTp7nRY2tWuqPVst+pL7YKMU K3Wb3P2BVhEihGDAmN6CO3g+b6VHkFXSb/w0l8o4gU+iwWBPUfgo8+okoxW2UlWfSURl vkZYDHNDwxEBAux7zseA/l8Zbw1WfQBYlKERt5vtXID5VSt6QatS3JynAIVGo36FRbSd Ay4NYNoNdTiZohrIReQGZxCA1fAA0WUSYYqnleun4iigp/lmpBqOM/HU+K1VoiMwHyIY MmUdfV0ioVQWnzS3MfD/9Dyy1tp7hG+4K0srCa6VJ6ZNgjSDKcmzT0HAEo/9ErrTcxR2 DREQ== X-Gm-Message-State: AOUpUlH/D+Ah9mMe8arplz0TscKA5ngnHG8Uq2FwTOiDjSDSxMfb7xJn TlxNmwH/31gRDQfl9s18IsadX+PC X-Google-Smtp-Source: AA+uWPyYcTEGQ/ndTl2w/axZwJHzAnqwZqYap0oHMLkf5pxCJmWACy2r6odgLzkT6u/TYVJ4HUTJdQ== X-Received: by 2002:a5d:6550:: with SMTP id z16-v6mr31398761wrv.194.1534870997023; Tue, 21 Aug 2018 10:03:17 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.03.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:03:16 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:01:45 +0200 Message-Id: <1534870966-9287-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PULL 13/74] hw/timer/mc146818rtc: Fix introspection problem X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Thomas Huth <thuth@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/74] tests: virtio: separate ccw tests from libqos
|
expand
|
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 3401570..91a8f42 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -696,6 +696,9 @@ static int prep_set_cmos_checksum(DeviceState *dev, void *opaque) rtc_set_memory(rtc, 0x3e, checksum & 0xff); rtc_set_memory(rtc, 0x2f, checksum >> 8); rtc_set_memory(rtc, 0x3f, checksum >> 8); + + object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(rtc), + "date", NULL); } return 0; } diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 3a14075..a504f03 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -995,9 +995,6 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) object_property_add_tm(OBJECT(s), "date", rtc_get_date, NULL); - object_property_add_alias(qdev_get_machine(), "rtc-time", - OBJECT(s), "date", NULL); - qdev_init_gpio_out(dev, &s->irq, 1); } @@ -1019,6 +1016,9 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) } QLIST_INSERT_HEAD(&rtc_devices, s, link); + object_property_add_alias(qdev_get_machine(), "rtc-time", OBJECT(s), + "date", NULL); + return isadev; } @@ -1052,17 +1052,11 @@ static void rtc_class_initfn(ObjectClass *klass, void *data) dc->user_creatable = false; } -static void rtc_finalize(Object *obj) -{ - object_property_del(qdev_get_machine(), "rtc", NULL); -} - static const TypeInfo mc146818rtc_info = { .name = TYPE_MC146818_RTC, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(RTCState), .class_init = rtc_class_initfn, - .instance_finalize = rtc_finalize, }; static void mc146818rtc_register_types(void)