From patchwork Thu Jun 11 12:01:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 49763 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E64E120C81 for ; Thu, 11 Jun 2015 12:20:12 +0000 (UTC) Received: by wibdt2 with SMTP id dt2sf2401289wib.3 for ; Thu, 11 Jun 2015 05:20:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:references :mime-version:content-type:content-disposition:in-reply-to:cc :subject:precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=Tn3yUWMoyYulx0apolaf7Xy4aug1CHnGirgOKDMvAm8=; b=dG7NjRrCwheC0A0ZWOXozpVoHtJ5DRfEBqD0Fj2fN92XDZideaeazaSDDTE2FLEiz3 pxYn3KkvciE9xRMgc80D3gqb7axPPHe7fomANq7ThBXoPdULF/ALTR9FuLcCO4pIzUJH Srr8aQNvi9iXicGH4QOC7qVmCqVTu2l/AVgzmtYPN0aBCTtHz7HRifMk+SOe2Un/Axp/ DcyN9+RzRa5N0/XyR7wnp1QmYiAicQ58hb8DZPxz45gp4bkU5e0+C/Hdgixhu09mbwvY 0oQ7KRzfWl7053CwbUXMOO6FPuOfICrS03S2lQLvolbwFjH/W1ogtUjArsyqCdgHO/ph GlEw== X-Gm-Message-State: ALoCoQm0kUuNpMb/TcwkApIWd1Sm0jvZoDKk0zKWHmxmD+zF9QRporddm5XA8S5fcuZZ+h1P3rHh X-Received: by 10.180.83.72 with SMTP id o8mr27232156wiy.3.1434025212193; Thu, 11 Jun 2015 05:20:12 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.133 with SMTP id kq5ls371571lac.102.gmail; Thu, 11 Jun 2015 05:20:12 -0700 (PDT) X-Received: by 10.112.52.1 with SMTP id p1mr9617940lbo.8.1434025211990; Thu, 11 Jun 2015 05:20:11 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id lu5si476944lac.6.2015.06.11.05.20.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 05:20:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laew7 with SMTP id w7so3489416lae.1 for ; Thu, 11 Jun 2015 05:20:11 -0700 (PDT) X-Received: by 10.112.93.37 with SMTP id cr5mr9698514lbb.106.1434025211865; Thu, 11 Jun 2015 05:20:11 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp4002117lbb; Thu, 11 Jun 2015 05:20:11 -0700 (PDT) X-Received: by 10.55.27.78 with SMTP id b75mr18268393qkb.7.1434025210634; Thu, 11 Jun 2015 05:20:10 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l136si383174qhl.122.2015.06.11.05.20.10 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Jun 2015 05:20:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:45900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z31Sr-0005Mr-K8 for patch@linaro.org; Thu, 11 Jun 2015 08:20:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z31As-0002SL-I9 for qemu-devel@nongnu.org; Thu, 11 Jun 2015 08:01:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z31An-0008L8-IK for qemu-devel@nongnu.org; Thu, 11 Jun 2015 08:01:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z31An-0008Ku-CW for qemu-devel@nongnu.org; Thu, 11 Jun 2015 08:01:29 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id EB3F3365054; Thu, 11 Jun 2015 12:01:28 +0000 (UTC) Received: from redhat.com (ovpn-116-92.ams2.redhat.com [10.36.116.92]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t5BC1PP7014509; Thu, 11 Jun 2015 08:01:26 -0400 Date: Thu, 11 Jun 2015 14:01:25 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1434023714-30366-39-git-send-email-mst@redhat.com> References: <1434023714-30366-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1434023714-30366-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Amit Shah , Shannon Zhao , Shannon Zhao , Cornelia Huck , Paolo Bonzini Subject: [Qemu-devel] [PULL 38/42] virtio-serial-bus: move qdev properties into virtio-serial-bus.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mst@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Shannon Zhao As only one place in virtio-serial-bus.c uses DEFINE_VIRTIO_SERIAL_PROPERTIES, there is no need to expose it. Inline it into virtio-serial-bus.c to avoid wrongly use. Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Reviewed-by: Paolo Bonzini Acked-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/virtio/virtio-serial.h | 3 --- hw/char/virtio-serial-bus.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h index 18d1bcc..527d0bf 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -221,7 +221,4 @@ void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle); #define VIRTIO_SERIAL(obj) \ OBJECT_CHECK(VirtIOSerial, (obj), TYPE_VIRTIO_SERIAL) -#define DEFINE_VIRTIO_SERIAL_PROPERTIES(_state, _field) \ - DEFINE_PROP_UINT32("max_ports", _state, _field.max_virtserial_ports, 31) - #endif diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index f893523..d451b22 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1083,7 +1083,8 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp) } static Property virtio_serial_properties[] = { - DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOSerial, serial), + DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports, + 31), DEFINE_PROP_END_OF_LIST(), };