Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 14:54:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/xen: Have legacy Xen backend inherit from DYNAMIC_SYS_BUS_DEVICE

Browse Source 
Because the legacy Xen backend devices can optionally be plugged on the
TYPE_PLATFORM_BUS_DEVICE, have it inherit TYPE_DYNAMIC_SYS_BUS_DEVICE.
Remove the implicit TYPE_XENSYSDEV instance_size.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alexander Graf <graf@amazon.com>
Tested-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20250125181343.59151-10-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-25 14:52:12 +01:00
parent 83f0f363e4
commit 250e797cea
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xen/xen-legacy-backend.c
View File

@ -640,16 +640,14 @@ static void xendev_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
set_bit(DEVICE_CATEGORY_MISC, dc->categories); set_bit(DEVICE_CATEGORY_MISC, dc->categories);
/* xen-backend devices can be plugged/unplugged dynamically */
dc->user_creatable = true;
dc->bus_type = TYPE_XENSYSBUS; dc->bus_type = TYPE_XENSYSBUS;
} }
static const TypeInfo xendev_type_info = { static const TypeInfo xendev_type_info = {
.name = TYPE_XENBACKEND, .name = TYPE_XENBACKEND,
.parent = TYPE_DEVICE, .parent = TYPE_DYNAMIC_SYS_BUS_DEVICE,
.class_init = xendev_class_init, .class_init = xendev_class_init,
.instance_size = sizeof(struct XenLegacyDevice), .instance_size = sizeof(XenLegacyDevice),
}; };
static void xen_sysbus_class_init(ObjectClass *klass, void *data) static void xen_sysbus_class_init(ObjectClass *klass, void *data)
@ -672,7 +670,6 @@ static const TypeInfo xensysbus_info = {
static const TypeInfo xensysdev_info = { static const TypeInfo xensysdev_info = {
.name = TYPE_XENSYSDEV, .name = TYPE_XENSYSDEV,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysBusDevice),
}; };
static void xenbe_register_types(void) static void xenbe_register_types(void)

5
include/hw/xen/xen_pvdev.h
View File

@ -1,7 +1,7 @@
#ifndef QEMU_HW_XEN_PVDEV_H #ifndef QEMU_HW_XEN_PVDEV_H
#define QEMU_HW_XEN_PVDEV_H #define QEMU_HW_XEN_PVDEV_H
#include "hw/qdev-core.h" #include "hw/sysbus.h"
#include "hw/xen/xen_backend_ops.h" #include "hw/xen/xen_backend_ops.h"
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */
@ -32,7 +32,8 @@ struct XenDevOps {
}; };
struct XenLegacyDevice { struct XenLegacyDevice {
DeviceState qdev; SysBusDevice parent_obj;
const char *type; const char *type;
int dom; int dom;
int dev; int dev;