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=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 3FDB4C433DF for ; Thu, 30 Jul 2020 17:00:37 +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 0ACAF20838 for ; Thu, 30 Jul 2020 17:00:37 +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="VlGEQUKN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0ACAF20838 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]:43888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1Bv2-0002r7-Ac for qemu-devel@archiver.kernel.org; Thu, 30 Jul 2020 13:00:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1Btn-0001oO-6r for qemu-devel@nongnu.org; Thu, 30 Jul 2020 12:59:19 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:45777 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1Btl-0007Na-D0 for qemu-devel@nongnu.org; Thu, 30 Jul 2020 12:59:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596128356; 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=xsvkRs6YLJaQIptiQqmufvIaiTahLTrG2br/J1zshaU=; b=VlGEQUKNxAKwvnv3HHVyCfKoblEcbQjs3RSVCDG53hxvwd/pdJfrzj9S3EjqhBvL2C36nR 8gkW1pTpW2Q4Ntv4bvhcKJpo2LoH+zitd1jTOgelaNNhoiQWFm+524hN3ZMnHi3xzvZnZE EDFfvZfsDDHdsvIZrUC8Y0QQZ9bpTmA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-pCCIoYVQNH--NHuWfjHoeA-1; Thu, 30 Jul 2020 12:59:15 -0400 X-MC-Unique: pCCIoYVQNH--NHuWfjHoeA-1 Received: by mail-wr1-f72.google.com with SMTP id f14so8111613wrm.22 for ; Thu, 30 Jul 2020 09:59:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xsvkRs6YLJaQIptiQqmufvIaiTahLTrG2br/J1zshaU=; b=MoqeK6iYkixWS/XElp/51oQCT19L8peBst9pxTc/nUUEqSjOicyzrkJllIEcIhpQOh QgPcXuaB8oyYWFTNiKLl/cvjC/+SShnX6t9EwSs+NDkEsxcQrX8kNI8ovobc6B9PbdIw qa7eDFTGABT8yFzrwn6rcpBhukzb+k22XmHdlKl4tPAeVeEd+++DxGldtftaoSG96+eA QVpVoOeZ55yjr6V9514pFmMvrjhpzjXJMdYPwM/DhwN5CUfXukouw88gYON9lpSLNDUx tHIoNfP/R0CYVeC2ZzOnwzYUoxLU3NFCuyG90NVS3DeV2H/wWodXak3784L6XmtdfHdK h1LQ== X-Gm-Message-State: AOAM5331luaNYT8SWgbXWNYoAFvC1pEsGsThmZG5KFb3WABt8lFX2w8t sX3bNHFOhYEkvJp+ngX9Pkqo2MiWj3EAyDYildOfuf4ijxl4xZPuvk8N4U/qg8wNJPb3YL0D33S vQkaRYp1UitS9sA0= X-Received: by 2002:a1c:9650:: with SMTP id y77mr158534wmd.101.1596128352621; Thu, 30 Jul 2020 09:59:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxnn3eF39ADajYONkpgFtSa8OUABS1r/WxeKeEQ9uKSNkOSRklLGIB/dZc/SDd3lUmZsRsnYA== X-Received: by 2002:a1c:9650:: with SMTP id y77mr158510wmd.101.1596128352344; Thu, 30 Jul 2020 09:59:12 -0700 (PDT) Received: from localhost.localdomain (214.red-88-21-68.staticip.rima-tde.net. [88.21.68.214]) by smtp.gmail.com with ESMTPSA id g18sm11198388wru.27.2020.07.30.09.59.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2020 09:59:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 2/2] hw/char/serial: Remove TYPE_SERIAL_IO (superset of TYPE_SERIAL_MM) Date: Thu, 30 Jul 2020 18:59:00 +0200 Message-Id: <20200730165900.7030-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200730165900.7030-1-philmd@redhat.com> References: <20200730165900.7030-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8; text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 03:41:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Aleksandar Rikalo , "Michael S. Tsirkin" , Aleksandar Markovic , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" TYPE_SERIAL_IO is a superset of TYPE_SERIAL_MM, and it is not used anymore. Remove it. Suggested-by: Paolo Bonzini Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- include/hw/char/serial.h | 9 --------- hw/char/serial.c | 41 ---------------------------------------- 2 files changed, 50 deletions(-) diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 535fa23a2b..81d7ba1917 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -88,12 +88,6 @@ typedef struct SerialMM { uint8_t endianness; } SerialMM; -typedef struct SerialIO { - SysBusDevice parent; - - SerialState serial; -} SerialIO; - extern const VMStateDescription vmstate_serial; extern const MemoryRegionOps serial_io_ops; @@ -105,9 +99,6 @@ void serial_set_frequency(SerialState *s, uint32_t frequency); #define TYPE_SERIAL_MM "serial-mm" #define SERIAL_MM(s) OBJECT_CHECK(SerialMM, (s), TYPE_SERIAL_MM) -#define TYPE_SERIAL_IO "serial-io" -#define SERIAL_IO(s) OBJECT_CHECK(SerialIO, (s), TYPE_SERIAL_IO) - SerialMM *serial_mm_init(MemoryRegion *address_space, hwaddr base, int regshift, qemu_irq irq, int baudbase, diff --git a/hw/char/serial.c b/hw/char/serial.c index 2386479492..fd80ae5592 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -985,46 +985,6 @@ const MemoryRegionOps serial_io_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static void serial_io_realize(DeviceState *dev, Error **errp) -{ - SerialIO *sio = SERIAL_IO(dev); - SerialState *s = &sio->serial; - - if (!qdev_realize(DEVICE(s), NULL, errp)) { - return; - } - - memory_region_init_io(&s->io, OBJECT(dev), &serial_io_ops, s, "serial", 8); - sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io); - sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq); -} - -static void serial_io_class_init(ObjectClass *klass, void* data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - - dc->realize = serial_io_realize; - /* No dc->vmsd: class has no migratable state */ -} - -static void serial_io_instance_init(Object *o) -{ - SerialIO *sio = SERIAL_IO(o); - - object_initialize_child(o, "serial", &sio->serial, TYPE_SERIAL); - - qdev_alias_all_properties(DEVICE(&sio->serial), o); -} - - -static const TypeInfo serial_io_info = { - .name = TYPE_SERIAL_IO, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(SerialIO), - .instance_init = serial_io_instance_init, - .class_init = serial_io_class_init, -}; - static Property serial_properties[] = { DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), @@ -1178,7 +1138,6 @@ static const TypeInfo serial_mm_info = { static void serial_register_types(void) { type_register_static(&serial_info); - type_register_static(&serial_io_info); type_register_static(&serial_mm_info); } -- 2.21.3