bad38726e9
This patch derives vhost-user-input from vhost-user-base class, so make the input stub as a simpler boilerplate wrapper. With the refactoring, vhost-user-input adds the property 'chardev', this leads to conflict with the vhost-user-input-pci adds the same property. To resolve the error, remove the duplicate property from vhost-user-input-pci. Signed-off-by: Leo Yan <leo.yan@linaro.org> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Message-Id: <20231120043721.50555-5-leo.yan@linaro.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20240104210945.1223134-12-alex.bennee@linaro.org> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
48 lines
1.3 KiB
C
48 lines
1.3 KiB
C
/*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2 or
|
|
* later. See the COPYING.LIB file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
|
|
#include "hw/virtio/virtio.h"
|
|
#include "hw/virtio/virtio-input.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/error-report.h"
|
|
#include "hw/virtio/virtio-pci.h"
|
|
#include "qom/object.h"
|
|
|
|
typedef struct VHostUserInputPCI VHostUserInputPCI;
|
|
|
|
#define TYPE_VHOST_USER_INPUT_PCI "vhost-user-input-pci"
|
|
|
|
DECLARE_INSTANCE_CHECKER(VHostUserInputPCI, VHOST_USER_INPUT_PCI,
|
|
TYPE_VHOST_USER_INPUT_PCI)
|
|
|
|
struct VHostUserInputPCI {
|
|
VirtIOPCIProxy parent_obj;
|
|
VHostUserInput vhi;
|
|
};
|
|
|
|
static void vhost_user_input_pci_instance_init(Object *obj)
|
|
{
|
|
VHostUserInputPCI *dev = VHOST_USER_INPUT_PCI(obj);
|
|
|
|
virtio_instance_init_common(obj, &dev->vhi, sizeof(dev->vhi),
|
|
TYPE_VHOST_USER_INPUT);
|
|
}
|
|
|
|
static const VirtioPCIDeviceTypeInfo vhost_user_input_pci_info = {
|
|
.generic_name = TYPE_VHOST_USER_INPUT_PCI,
|
|
.parent = TYPE_VIRTIO_INPUT_PCI,
|
|
.instance_size = sizeof(VHostUserInputPCI),
|
|
.instance_init = vhost_user_input_pci_instance_init,
|
|
};
|
|
|
|
static void vhost_user_input_pci_register(void)
|
|
{
|
|
virtio_pci_types_register(&vhost_user_input_pci_info);
|
|
}
|
|
|
|
type_init(vhost_user_input_pci_register)
|