From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53269) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeKXr-0006eA-JS for qemu-devel@nongnu.org; Wed, 15 Oct 2014 05:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeKXl-00075n-PL for qemu-devel@nongnu.org; Wed, 15 Oct 2014 05:06:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeKXl-00075A-8l for qemu-devel@nongnu.org; Wed, 15 Oct 2014 05:06:53 -0400 From: Gerd Hoffmann Date: Wed, 15 Oct 2014 11:05:49 +0200 Message-Id: <1413363967-2489-17-git-send-email-kraxel@redhat.com> In-Reply-To: <1413363967-2489-1-git-send-email-kraxel@redhat.com> References: <1413363967-2489-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 16/34] usb-net: add bootindex to qom property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei Add a qom property with the same name 'bootindex', when we remove it form qdev property, things will continue to work just fine, and we can use qom features which are not supported by qdev property. Signed-off-by: Gonglei Reviewed-by: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/usb/dev-network.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 23e3c45..f341b33 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1375,6 +1375,16 @@ static void usb_net_realize(USBDevice *dev, Error **errrp) add_boot_device_path(s->conf.bootindex, &dev->qdev, "/ethernet@0"); } +static void usb_net_instance_init(Object *obj) +{ + USBDevice *dev = USB_DEVICE(obj); + USBNetState *s = DO_UPCAST(USBNetState, dev, dev); + + device_add_bootindex_property(obj, &s->conf.bootindex, + "bootindex", "/ethernet-phy@0", + &dev->qdev, NULL); +} + static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) { Error *local_err = NULL; @@ -1438,6 +1448,7 @@ static const TypeInfo net_info = { .parent = TYPE_USB_DEVICE, .instance_size = sizeof(USBNetState), .class_init = usb_net_class_initfn, + .instance_init = usb_net_instance_init, }; static void usb_net_register_types(void) -- 1.8.3.1