[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/34] redirect: remove bootindex property from qdev
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 22/34] redirect: remove bootindex property from qdev to qom |
Date: |
Wed, 15 Oct 2014 11:05:55 +0200 |
From: Gonglei <address@hidden>
Remove bootindex form qdev property to qom, things will
continue to work just fine, and we can use qom features
which are not supported by qdev property.
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/redirect.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index e2c9896..95f1aa2 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -2471,7 +2471,6 @@ static Property usbredir_properties[] = {
DEFINE_PROP_CHR("chardev", USBRedirDevice, cs),
DEFINE_PROP_UINT8("debug", USBRedirDevice, debug, usbredirparser_warning),
DEFINE_PROP_STRING("filter", USBRedirDevice, filter_str),
- DEFINE_PROP_INT32("bootindex", USBRedirDevice, bootindex, -1),
DEFINE_PROP_END_OF_LIST(),
};
@@ -2496,11 +2495,22 @@ static void usbredir_class_initfn(ObjectClass *klass,
void *data)
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
}
+static void usbredir_instance_init(Object *obj)
+{
+ USBDevice *udev = USB_DEVICE(obj);
+ USBRedirDevice *dev = DO_UPCAST(USBRedirDevice, dev, udev);
+
+ device_add_bootindex_property(obj, &dev->bootindex,
+ "bootindex", NULL,
+ &udev->qdev, NULL);
+}
+
static const TypeInfo usbredir_dev_info = {
.name = "usb-redir",
.parent = TYPE_USB_DEVICE,
.instance_size = sizeof(USBRedirDevice),
.class_init = usbredir_class_initfn,
+ .instance_init = usbredir_instance_init,
};
static void usbredir_register_types(void)
--
1.8.3.1
- [Qemu-devel] [PULL 08/34] virtio-net: add bootindex to qom property, (continued)
- [Qemu-devel] [PULL 08/34] virtio-net: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 11/34] ne2000: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 15/34] vmxnet3: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 31/34] ide: add calling add_boot_device_patch in bootindex setter function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 18/34] virtio-net: alias bootindex property explicitly for virt-net-pci/ccw/s390, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 14/34] spapr_lian: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 09/34] e1000: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 07/34] bootindex: add a setter/getter functions wrapper for bootindex property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 12/34] pcnet: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 04/34] fw_cfg: add fw_cfg_machine_reset function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 22/34] redirect: remove bootindex property from qdev to qom,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 30/34] nvma: ide: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 32/34] bootindex: move calling add_boot_device_patch to bootindex setter function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 34/34] bootindex: change fprintf to error_report, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 05/34] bootindex: rework add_boot_device_path function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 28/34] virtio-blk: alias bootindex property explicitly for virt-blk-pci/ccw/s390, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 10/34] eepro100: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 16/34] usb-net: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 20/34] pci-assign: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 19/34] host-libusb: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 27/34] block: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15