From bf51b0a9c041164b91d6f1bb46872315ac70130f Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Fri, 1 May 2020 02:45:35 -0700 Subject: [PATCH] xbox: Set properties with device_class_set_props Applying change 4f67d30b5e74e060b8dbe10528829b47345cd6e8 to Xbox hardware. --- hw/xbox/nvnet.c | 2 +- hw/xbox/xid-sdl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xbox/nvnet.c b/hw/xbox/nvnet.c index d107aa4cd4..8316dfda1d 100644 --- a/hw/xbox/nvnet.c +++ b/hw/xbox/nvnet.c @@ -997,7 +997,7 @@ static void nvnet_class_init(ObjectClass *klass, void *data) dc->desc = "nForce Ethernet Controller"; dc->reset = qdev_nvnet_reset; - dc->props = nvnet_properties; + device_class_set_props(dc, nvnet_properties); } static Property nvnet_properties[] = { diff --git a/hw/xbox/xid-sdl.c b/hw/xbox/xid-sdl.c index 1ba18a4d0e..d725c18ccc 100644 --- a/hw/xbox/xid-sdl.c +++ b/hw/xbox/xid-sdl.c @@ -618,7 +618,7 @@ static void usb_xbox_gamepad_class_initfn(ObjectClass *klass, void *data) usb_xid_class_initfn(klass, data); set_bit(DEVICE_CATEGORY_INPUT, dc->categories); dc->vmsd = &vmstate_usb_xbox; - dc->props = xid_sdl_properties; + device_class_set_props(dc, xid_sdl_properties); dc->desc = "Microsoft Xbox Controller"; }