qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH V5 09/18] virtio-ccw: introduce ccw specific que


From: Jason Wang
Subject: Re: [Qemu-devel] [PATCH V5 09/18] virtio-ccw: introduce ccw specific queue limit
Date: Fri, 03 Apr 2015 16:53:06 +0800



On Thu, Apr 2, 2015 at 9:47 PM, Cornelia Huck <address@hidden> wrote:
On Wed,  1 Apr 2015 16:15:03 +0800
Jason Wang <address@hidden> wrote:

 Instead of depending on marco, using a bus specific limit. Also make
 it clear that the number of gsis per I/O adapter is not directly
 depending on the number of virtio queues, but rather the other way
 around.
Cc: Alexander Graf <address@hidden>
 Cc: Cornelia Huck <address@hidden>
 Cc: Christian Borntraeger <address@hidden>
 Cc: Richard Henderson <address@hidden>
 Signed-off-by: Jason Wang <address@hidden>
 ---
  hw/s390x/s390-virtio-ccw.c   |  7 +++++--
  hw/s390x/virtio-ccw.c        | 19 ++++++++++++-------
  include/hw/s390x/s390_flic.h |  4 +++-
  3 files changed, 20 insertions(+), 10 deletions(-)

 diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
 index dfe6ded..935b880 100644
 --- a/hw/s390x/virtio-ccw.c
 +++ b/hw/s390x/virtio-ccw.c

@@ -265,8 +267,9 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t addr, uint32_t align,
                                uint16_t index, uint16_t num)
  {
      VirtIODevice *vdev = virtio_ccw_get_vdev(sch);
 +    int queue_max = virtio_get_queue_max(vdev);
- if (index > VIRTIO_PCI_QUEUE_MAX) {
 +    if (index > queue_max) {

trivial conflict on master (>= instead of >)

Yes, because of 590fe5722b522e492a9c78adadae4def35b137dd.

          return -EINVAL;
      }

In master, there's also a new instance of VIRTIO_PCI_QUEUE_MAX (in
virtio_ccw_cb()) which needs a similar treatment.

But on the whole, looks good.

Thanks for the reminding, will address this in V6.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]