From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 870C2CA9EB9 for ; Wed, 23 Oct 2019 20:31:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AD6920659 for ; Wed, 23 Oct 2019 20:31:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="d4P9W9cd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AD6920659 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNNID-0006uZ-60 for qemu-devel@archiver.kernel.org; Wed, 23 Oct 2019 16:31:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59158) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNKW2-0004My-0G for qemu-devel@nongnu.org; Wed, 23 Oct 2019 13:33:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNKW0-0001tf-Lb for qemu-devel@nongnu.org; Wed, 23 Oct 2019 13:33:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52407 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNKW0-0001tb-I4 for qemu-devel@nongnu.org; Wed, 23 Oct 2019 13:33:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571852024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6G1W/gcTdSdJBPvC06njrUzLllHI1z0Td5dkT4z2N08=; b=d4P9W9cdHhY/Gbr7pfvmoHz0cA/4UJaSGMj+8nCMVU8lHRRNhE8VUJ27MBNxnx26QKvvVh gCFCFRMu/oOXQo5nCILGXJZTYRA9gMnTqytzHSm6FmJWE/z+y2JNLl1nS0OQGorUwVPo0q PlOzlFqz7rKa3cZ0MqkWoW57539CWq4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-_wYXFdBBPxuytS25F1J4TQ-1; Wed, 23 Oct 2019 13:33:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 143D6801E70; Wed, 23 Oct 2019 17:33:40 +0000 (UTC) Received: from localhost (ovpn-112-21.ams2.redhat.com [10.36.112.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA73460629; Wed, 23 Oct 2019 17:33:33 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH v3 10/33] serial: add "instance-id" property Date: Wed, 23 Oct 2019 19:31:31 +0200 Message-Id: <20191023173154.30051-11-marcandre.lureau@redhat.com> In-Reply-To: <20191023173154.30051-1-marcandre.lureau@redhat.com> References: <20191023173154.30051-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: _wYXFdBBPxuytS25F1J4TQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , Peter Maydell , "Michael S. Tsirkin" , Jason Wang , Mark Cave-Ayland , KONRAD Frederic , "Edgar E. Iglesias" , Paul Burton , Aleksandar Rikalo , Magnus Damm , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Artyom Tarasenko , Eduardo Habkost , Fabien Chouteau , qemu-arm@nongnu.org, Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-ppc@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This property will be used to move common vmstate registration to device realize in following patch. Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/char/serial.c | 3 +++ include/hw/char/serial.h | 1 + 2 files changed, 4 insertions(+) diff --git a/hw/char/serial.c b/hw/char/serial.c index 069d8715d0..0b61a71e4e 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -990,6 +990,7 @@ SerialState *serial_init(int base, qemu_irq irq, int ba= udbase, s->irq =3D irq; qdev_prop_set_uint32(dev, "baudbase", baudbase); qdev_prop_set_chr(dev, "chardev", chr); + qdev_prop_set_int32(dev, "instance-id", base); serial_realize_core(s, &error_fatal); qdev_set_legacy_instance_id(dev, base, 2); qdev_init_nofail(dev); @@ -1003,6 +1004,7 @@ SerialState *serial_init(int base, qemu_irq irq, int = baudbase, static Property serial_properties[] =3D { DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), + DEFINE_PROP_INT32("instance-id", SerialState, instance_id, 0), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -1073,6 +1075,7 @@ SerialState *serial_mm_init(MemoryRegion *address_spa= ce, s->irq =3D irq; qdev_prop_set_uint32(dev, "baudbase", baudbase); qdev_prop_set_chr(dev, "chardev", chr); + qdev_prop_set_int32(dev, "instance-id", base); =20 serial_realize_core(s, &error_fatal); qdev_set_legacy_instance_id(dev, base, 2); diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 3dc618598e..b472c7cd57 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -78,6 +78,7 @@ typedef struct SerialState { =20 QEMUTimer *modem_status_poll; MemoryRegion io; + int instance_id; } SerialState; =20 extern const VMStateDescription vmstate_serial; --=20 2.23.0.606.g08da6496b6