mirror of
				https://github.com/qemu/qemu.git
				synced 2025-10-31 20:44:16 +00:00 
			
		
		
		
	 adcf33a504
			
		
	
	
		adcf33a504
		
	
	
	
	
		
			
			Since the virtio-gpu-ccw device depends on the hw-display-virtio-gpu module, which provides the type virtio-gpu-device, packaging the hw-display-virtio-gpu module as a separate package that may or may not be installed along with the qemu package leads to problems. Namely if the hw-display-virtio-gpu is absent, qemu continues to advertise virtio-gpu-ccw, but it aborts not only when one attempts using virtio-gpu-ccw, but also when libvirtd's capability probing tries to instantiate the type to introspect it. Let us thus introduce a module named hw-s390x-virtio-gpu-ccw that is going to provide the virtio-gpu-ccw device. The hw-s390x prefix was chosen because it is not a portable device. With virtio-gpu-ccw built as a module, the correct way to package a modularized qemu is to require that hw-display-virtio-gpu must be installed whenever the module hw-s390x-virtio-gpu-ccw. Signed-off-by: Halil Pasic <pasic@linux.ibm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Halil Pasic <pasic@linux.ibm.com> Tested-by: Halil Pasic <pasic@linux.ibm.com> Message-Id: <20210317095622.2839895-4-kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
		
			
				
	
	
		
			71 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			71 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * virtio ccw gpu implementation
 | |
|  *
 | |
|  * Copyright 2012, 2015 IBM Corp.
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or (at
 | |
|  * your option) any later version. See the COPYING file in the top-level
 | |
|  * directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "hw/qdev-properties.h"
 | |
| #include "hw/virtio/virtio.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu/module.h"
 | |
| #include "virtio-ccw.h"
 | |
| 
 | |
| static void virtio_ccw_gpu_realize(VirtioCcwDevice *ccw_dev, Error **errp)
 | |
| {
 | |
|     VirtIOGPUCcw *dev = VIRTIO_GPU_CCW(ccw_dev);
 | |
|     DeviceState *vdev = DEVICE(&dev->vdev);
 | |
| 
 | |
|     qdev_realize(vdev, BUS(&ccw_dev->bus), errp);
 | |
| }
 | |
| 
 | |
| static void virtio_ccw_gpu_instance_init(Object *obj)
 | |
| {
 | |
|     VirtIOGPUCcw *dev = VIRTIO_GPU_CCW(obj);
 | |
|     VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);
 | |
| 
 | |
|     ccw_dev->force_revision_1 = true;
 | |
|     virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
 | |
|                                 TYPE_VIRTIO_GPU);
 | |
| }
 | |
| 
 | |
| static Property virtio_ccw_gpu_properties[] = {
 | |
|     DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
 | |
|                     VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
 | |
|     DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,
 | |
|                        VIRTIO_CCW_MAX_REV),
 | |
|     DEFINE_PROP_END_OF_LIST(),
 | |
| };
 | |
| 
 | |
| static void virtio_ccw_gpu_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
|     VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);
 | |
| 
 | |
|     k->realize = virtio_ccw_gpu_realize;
 | |
|     device_class_set_props(dc, virtio_ccw_gpu_properties);
 | |
|     dc->hotpluggable = false;
 | |
|     set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
 | |
| }
 | |
| 
 | |
| static const TypeInfo virtio_ccw_gpu = {
 | |
|     .name          = TYPE_VIRTIO_GPU_CCW,
 | |
|     .parent        = TYPE_VIRTIO_CCW_DEVICE,
 | |
|     .instance_size = sizeof(VirtIOGPUCcw),
 | |
|     .instance_init = virtio_ccw_gpu_instance_init,
 | |
|     .class_init    = virtio_ccw_gpu_class_init,
 | |
| };
 | |
| 
 | |
| static void virtio_ccw_gpu_register(void)
 | |
| {
 | |
|     if (have_virtio_ccw) {
 | |
|         type_register_static(&virtio_ccw_gpu);
 | |
|     }
 | |
| }
 | |
| 
 | |
| type_init(virtio_ccw_gpu_register)
 |