* Re: [PATCH v2 2/2] virtio: fix vq # for balloon
[not found] <3d655be73ce220f176b2c163839d83699f8faf43.1720611677.git.mst@redhat.com>
@ 2024-07-11 13:23 ` kernel test robot
0 siblings, 0 replies; only message in thread
From: kernel test robot @ 2024-07-11 13:23 UTC (permalink / raw)
To: Michael S. Tsirkin, linux-kernel
Cc: llvm, oe-kbuild-all, Alexander Duyck, Xuan Zhuo, Andrew Morton,
Linux Memory Management List, David Hildenbrand,
Richard Weinberger, Anton Ivanov, Johannes Berg, Bjorn Andersson,
Mathieu Poirier, Cornelia Huck, Halil Pasic, Eric Farman,
Heiko Carstens, Vasily Gorbik, Alexander Gordeev,
Christian Borntraeger, Sven Schnelle, Jason Wang,
Eugenio Pérez, linux-um, linux-remoteproc, linux-s390,
virtualization, kvm
Hi Michael,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20240710]
[cannot apply to uml/next remoteproc/rproc-next s390/features linus/master uml/fixes v6.10-rc7 v6.10-rc6 v6.10-rc5 v6.10-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Michael-S-Tsirkin/virtio_balloon-add-work-around-for-out-of-spec-QEMU/20240711-004346
base: next-20240710
patch link: https://lore.kernel.org/r/3d655be73ce220f176b2c163839d83699f8faf43.1720611677.git.mst%40redhat.com
patch subject: [PATCH v2 2/2] virtio: fix vq # for balloon
config: i386-randconfig-014-20240711 (https://download.01.org/0day-ci/archive/20240711/202407112113.SzSpdDLK-lkp@intel.com/config)
compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240711/202407112113.SzSpdDLK-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202407112113.SzSpdDLK-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/virtio/virtio_pci_common.c:391:1: error: version control conflict marker in file
391 | <<<<<<< HEAD
| ^
>> drivers/virtio/virtio_pci_common.c:392:30: error: use of undeclared identifier 'queue_idx'
392 | vqs[i] = vp_setup_vq(vdev, queue_idx++, vqi->callback,
| ^
2 errors generated.
vim +391 drivers/virtio/virtio_pci_common.c
365
366 static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,
367 struct virtqueue *vqs[],
368 struct virtqueue_info vqs_info[])
369 {
370 struct virtio_pci_device *vp_dev = to_vp_device(vdev);
371 int i, err;
372
373 vp_dev->vqs = kcalloc(nvqs, sizeof(*vp_dev->vqs), GFP_KERNEL);
374 if (!vp_dev->vqs)
375 return -ENOMEM;
376
377 err = request_irq(vp_dev->pci_dev->irq, vp_interrupt, IRQF_SHARED,
378 dev_name(&vdev->dev), vp_dev);
379 if (err)
380 goto out_del_vqs;
381
382 vp_dev->intx_enabled = 1;
383 vp_dev->per_vq_vectors = false;
384 for (i = 0; i < nvqs; ++i) {
385 struct virtqueue_info *vqi = &vqs_info[i];
386
387 if (!vqi->name) {
388 vqs[i] = NULL;
389 continue;
390 }
> 391 <<<<<<< HEAD
> 392 vqs[i] = vp_setup_vq(vdev, queue_idx++, vqi->callback,
393 vqi->name, vqi->ctx,
394 =======
395 vqs[i] = vp_setup_vq(vdev, i, callbacks[i], names[i],
396 ctx ? ctx[i] : false,
397 >>>>>>> f814759f80b7... virtio: fix vq # for balloon
398 VIRTIO_MSI_NO_VECTOR);
399 if (IS_ERR(vqs[i])) {
400 err = PTR_ERR(vqs[i]);
401 goto out_del_vqs;
402 }
403 }
404
405 return 0;
406 out_del_vqs:
407 vp_del_vqs(vdev);
408 return err;
409 }
410
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] only message in thread