From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYZp-0006Gd-FA for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:39:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTYZj-0003KD-24 for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:38:53 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:53802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYZi-00038H-Sd for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:38:47 -0500 Received: by mail-iy0-f173.google.com with SMTP id k32so3301487iak.4 for ; Thu, 24 Nov 2011 04:38:46 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 24 Nov 2011 13:38:22 +0100 Message-Id: <1322138308-31040-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1322138308-31040-1-git-send-email-pbonzini@redhat.com> References: <1322138308-31040-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/9] virtio-serial: move property declarations to header file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Include also other properties than features. This adds the common virtio features to s390. Signed-off-by: Paolo Bonzini --- hw/s390-virtio-bus.c | 3 +-- hw/virtio-pci.c | 4 +--- hw/virtio-serial.h | 5 +++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 80b11e5..282688a 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -359,8 +359,7 @@ static VirtIOS390DeviceInfo s390_virtio_serial = { .qdev.alias = "virtio-serial", .qdev.size = sizeof(VirtIOS390Device), .qdev.props = (Property[]) { - DEFINE_PROP_UINT32("max_ports", VirtIOS390Device, - serial.max_virtserial_ports, 31), + DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOS390Device, host_features, serial), DEFINE_PROP_END_OF_LIST(), }, }; diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index b93477b..d5cdc04 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -836,9 +836,7 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, DEV_NVECTORS_UNSPECIFIED), DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), - DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), - DEFINE_PROP_UINT32("max_ports", VirtIOPCIProxy, - serial.max_virtserial_ports, 31), + DEFINE_VIRTIO_SERIAL_PROPERTIES(VirtIOPCIProxy, host_features, serial), DEFINE_PROP_END_OF_LIST(), }, .qdev.reset = virtio_pci_reset, diff --git a/hw/virtio-serial.h b/hw/virtio-serial.h index ab13803..2e1a428 100644 --- a/hw/virtio-serial.h +++ b/hw/virtio-serial.h @@ -204,4 +204,9 @@ size_t virtio_serial_guest_ready(VirtIOSerialPort *port); */ void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle); +#define DEFINE_VIRTIO_SERIAL_PROPERTIES(_state, _feature_field, _conf_field) \ + DEFINE_VIRTIO_COMMON_FEATURES(_state, _feature_field), \ + DEFINE_PROP_UINT32("max_ports", _state, \ + _conf_field.max_virtserial_ports, 31) + #endif -- 1.7.7.1