From nobody Wed May 1 02:56:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516872138826814.7870092388164; Thu, 25 Jan 2018 01:22:18 -0800 (PST) Received: from localhost ([::1]:55767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedjd-0007v6-QO for importer@patchew.org; Thu, 25 Jan 2018 04:22:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedeQ-0004OU-Nf for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eedeL-0008Ei-VE for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41484) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eedeL-0008Ca-Mq for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:49 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A6ED9C04AC4A; Thu, 25 Jan 2018 09:16:48 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CEF460E39; Thu, 25 Jan 2018 09:16:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9A0EB11ABC; Thu, 25 Jan 2018 10:16:43 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 10:16:41 +0100 Message-Id: <20180125091643.26195-2-kraxel@redhat.com> In-Reply-To: <20180125091643.26195-1-kraxel@redhat.com> References: <20180125091643.26195-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 25 Jan 2018 09:16:48 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/3] usb: Remove legacy -usbdevice options (host, serial, disk and net) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Thomas Huth , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The option have been marked as deprecated since QEMU 2.10, and so far nobody complained that the host, serial, disk and net options are urgently required anymore. So let's now get rid at least of this legacy pile, to simplify the usb code quite a bit. This patch removes the usbdevices host, serial, disk and net. These devices use their own complicated parameter parsing mechanisms, so they are just ugly to maintain, without real benefit for the users (the users can use the corresponding "-device" parameters instead which have the same complexity as the "-usbdevice" devices here). Note that the other rather simple -usbdevice options (mouse, tablet, etc.) are not removed yet (the code is really simple here, so it does not hurt much to keep it), as well as the two devices "braille" and "bt" which are easier to use with -usbdevice than with -device. Signed-off-by: Thomas Huth Message-id: 1515519171-20315-1-git-send-email-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- hw/usb/dev-network.c | 26 ---------- hw/usb/dev-serial.c | 30 ----------- hw/usb/dev-storage.c | 58 --------------------- hw/usb/host-legacy.c | 144 -----------------------------------------------= ---- hw/usb/Makefile.objs | 2 +- qemu-options.hx | 19 ------- 6 files changed, 1 insertion(+), 278 deletions(-) delete mode 100644 hw/usb/host-legacy.c diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 85fc81bf43..aea7edcf31 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1382,31 +1382,6 @@ static void usb_net_instance_init(Object *obj) &dev->qdev, NULL); } =20 -static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) -{ - Error *local_err =3D NULL; - USBDevice *dev; - QemuOpts *opts; - int idx; - - opts =3D qemu_opts_parse_noisily(qemu_find_opts("net"), cmdline, false= ); - if (!opts) { - return NULL; - } - qemu_opt_set(opts, "type", "nic", &error_abort); - qemu_opt_set(opts, "model", "usb", &error_abort); - - idx =3D net_client_init(opts, false, &local_err); - if (local_err) { - error_report_err(local_err); - return NULL; - } - - dev =3D usb_create(bus, "usb-net"); - qdev_set_nic_properties(&dev->qdev, &nd_table[idx]); - return dev; -} - static const VMStateDescription vmstate_usb_net =3D { .name =3D "usb-net", .unmigratable =3D 1, @@ -1446,7 +1421,6 @@ static const TypeInfo net_info =3D { static void usb_net_register_types(void) { type_register_static(&net_info); - usb_legacy_register(TYPE_USB_NET, "net", usb_net_init); } =20 type_init(usb_net_register_types) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 94b5c34afe..2829dda391 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -509,35 +509,6 @@ static void usb_serial_realize(USBDevice *dev, Error *= *errp) } } =20 -static USBDevice *usb_serial_init(USBBus *bus, const char *filename) -{ - USBDevice *dev; - Chardev *cdrv; - char label[32]; - static int index; - - if (*filename =3D=3D ':') { - filename++; - } else if (*filename) { - error_report("unrecognized serial USB option %s", filename); - return NULL; - } - if (!*filename) { - error_report("character device specification needed"); - return NULL; - } - - snprintf(label, sizeof(label), "usbserial%d", index++); - cdrv =3D qemu_chr_new(label, filename); - if (!cdrv) - return NULL; - - dev =3D usb_create(bus, "usb-serial"); - qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); - - return dev; -} - static USBDevice *usb_braille_init(USBBus *bus, const char *unused) { USBDevice *dev; @@ -624,7 +595,6 @@ static void usb_serial_register_types(void) { type_register_static(&usb_serial_dev_type_info); type_register_static(&serial_info); - usb_legacy_register("usb-serial", "serial", usb_serial_init); type_register_static(&braille_info); usb_legacy_register("usb-braille", "braille", usb_braille_init); } diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 9722ac854c..e44a5c72cf 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -666,63 +666,6 @@ static void usb_msd_bot_realize(USBDevice *dev, Error = **errp) usb_msd_handle_reset(dev); } =20 -static USBDevice *usb_msd_init(USBBus *bus, const char *filename) -{ - static int nr=3D0; - Error *err =3D NULL; - char id[8]; - QemuOpts *opts; - DriveInfo *dinfo; - USBDevice *dev; - const char *p1; - char fmt[32]; - - /* parse -usbdevice disk: syntax into drive opts */ - do { - snprintf(id, sizeof(id), "usb%d", nr++); - opts =3D qemu_opts_create(qemu_find_opts("drive"), id, 1, NULL); - } while (!opts); - - p1 =3D strchr(filename, ':'); - if (p1++) { - const char *p2; - - if (strstart(filename, "format=3D", &p2)) { - int len =3D MIN(p1 - p2, sizeof(fmt)); - pstrcpy(fmt, len, p2); - qemu_opt_set(opts, "format", fmt, &error_abort); - } else if (*filename !=3D ':') { - error_report("unrecognized USB mass-storage option %s", filena= me); - return NULL; - } - filename =3D p1; - } - if (!*filename) { - error_report("block device specification needed"); - return NULL; - } - qemu_opt_set(opts, "file", filename, &error_abort); - qemu_opt_set(opts, "if", "none", &error_abort); - - /* create host drive */ - dinfo =3D drive_new(opts, 0); - if (!dinfo) { - qemu_opts_del(opts); - return NULL; - } - - /* create guest device */ - dev =3D usb_create(bus, "usb-storage"); - qdev_prop_set_drive(&dev->qdev, "drive", blk_by_legacy_dinfo(dinfo), - &err); - if (err) { - error_report_err(err); - object_unparent(OBJECT(dev)); - return NULL; - } - return dev; -} - static const VMStateDescription vmstate_usb_msd =3D { .name =3D "usb-storage", .version_id =3D 1, @@ -855,7 +798,6 @@ static void usb_msd_register_types(void) type_register_static(&usb_storage_dev_type_info); type_register_static(&msd_info); type_register_static(&bot_info); - usb_legacy_register("usb-storage", "disk", usb_msd_init); } =20 type_init(usb_msd_register_types) diff --git a/hw/usb/host-legacy.c b/hw/usb/host-legacy.c deleted file mode 100644 index 3b57e21b52..0000000000 --- a/hw/usb/host-legacy.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Linux host USB redirector - * - * Copyright (c) 2005 Fabrice Bellard - * - * Copyright (c) 2008 Max Krasnyansky - * Support for host device auto connect & disconnect - * Major rewrite to support fully async operation - * - * Copyright 2008 TJ - * Added flexible support for /dev/bus/usb /sys/bus/usb/devices in ad= dition - * to the legacy /proc/bus/usb USB device discovery and handling - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN - * THE SOFTWARE. - */ - -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "hw/usb.h" -#include "hw/usb/host.h" - -/* - * Autoconnect filter - * Format: - * auto:bus:dev[:vid:pid] - * auto:bus.dev[:vid:pid] - * - * bus - bus number (dec, * means any) - * dev - device number (dec, * means any) - * vid - vendor id (hex, * means any) - * pid - product id (hex, * means any) - * - * See 'lsusb' output. - */ -static int parse_filter(const char *spec, struct USBAutoFilter *f) -{ - enum { BUS, DEV, VID, PID, DONE }; - const char *p =3D spec; - int i; - - f->bus_num =3D 0; - f->addr =3D 0; - f->vendor_id =3D 0; - f->product_id =3D 0; - - for (i =3D BUS; i < DONE; i++) { - p =3D strpbrk(p, ":."); - if (!p) { - break; - } - p++; - - if (*p =3D=3D '*') { - continue; - } - switch (i) { - case BUS: - f->bus_num =3D strtol(p, NULL, 10); - break; - case DEV: - f->addr =3D strtol(p, NULL, 10); - break; - case VID: - f->vendor_id =3D strtol(p, NULL, 16); - break; - case PID: - f->product_id =3D strtol(p, NULL, 16); - break; - } - } - - if (i < DEV) { - fprintf(stderr, "husb: invalid auto filter spec %s\n", spec); - return -1; - } - - return 0; -} - -USBDevice *usb_host_device_open(USBBus *bus, const char *devname) -{ - struct USBAutoFilter filter; - USBDevice *dev; - char *p; - - dev =3D usb_create(bus, "usb-host"); - - if (strstr(devname, "auto:")) { - if (parse_filter(devname, &filter) < 0) { - goto fail; - } - } else { - p =3D strchr(devname, '.'); - if (p) { - filter.bus_num =3D strtoul(devname, NULL, 0); - filter.addr =3D strtoul(p + 1, NULL, 0); - filter.vendor_id =3D 0; - filter.product_id =3D 0; - } else { - p =3D strchr(devname, ':'); - if (p) { - filter.bus_num =3D 0; - filter.addr =3D 0; - filter.vendor_id =3D strtoul(devname, NULL, 16); - filter.product_id =3D strtoul(p + 1, NULL, 16); - } else { - goto fail; - } - } - } - - qdev_prop_set_uint32(&dev->qdev, "hostbus", filter.bus_num); - qdev_prop_set_uint32(&dev->qdev, "hostaddr", filter.addr); - qdev_prop_set_uint32(&dev->qdev, "vendorid", filter.vendor_id); - qdev_prop_set_uint32(&dev->qdev, "productid", filter.product_id); - return dev; - -fail: - object_unparent(OBJECT(dev)); - return NULL; -} - -static void usb_host_register_types(void) -{ - usb_legacy_register("usb-host", "host", usb_host_device_open); -} - -type_init(usb_host_register_types) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index bdfead6701..fbcd498c59 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -43,7 +43,7 @@ redirect.o-libs =3D $(USB_REDIR_LIBS) =20 # usb pass-through ifeq ($(CONFIG_USB_LIBUSB)$(CONFIG_USB),yy) -common-obj-y +=3D host-libusb.o host-legacy.o +common-obj-y +=3D host-libusb.o else common-obj-y +=3D host-stub.o endif diff --git a/qemu-options.hx b/qemu-options.hx index 5ff741a4af..1d73fb151d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1221,29 +1221,10 @@ Pointer device that uses absolute coordinates (like= a touchscreen). This means QEMU is able to report the mouse position without having to grab the mouse. Also overrides the PS/2 mouse emulation when activated. =20 -@item disk:[format=3D@var{format}]:@var{file} -Mass storage device based on file. The optional @var{format} argument -will be used rather than detecting the format. Can be used to specify -@code{format=3Draw} to avoid interpreting an untrusted format header. - -@item host:@var{bus}.@var{addr} -Pass through the host device identified by @var{bus}.@var{addr} (Linux onl= y). - -@item host:@var{vendor_id}:@var{product_id} -Pass through the host device identified by @var{vendor_id}:@var{product_id} -(Linux only). - -@item serial:[vendorid=3D@var{vendor_id}][,productid=3D@var{product_id}]:@= var{dev} -Serial converter to host character device @var{dev}, see @code{-serial} fo= r the -available devices. - @item braille Braille device. This will use BrlAPI to display the braille output on a r= eal or fake device. =20 -@item net:@var{options} -Network adapter that supports CDC ethernet and RNDIS protocols. - @end table ETEXI =20 --=20 2.9.3 From nobody Wed May 1 02:56:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516871919330906.4909867781595; Thu, 25 Jan 2018 01:18:39 -0800 (PST) Received: from localhost ([::1]:55572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedg0-0005B0-Aa for importer@patchew.org; Thu, 25 Jan 2018 04:18:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45097) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedeQ-0004OT-JP for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eedeL-0008Ea-U8 for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33904) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eedeL-0008Cl-MY for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:49 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF8191E2DD; Thu, 25 Jan 2018 09:16:48 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7562A5D6A8; Thu, 25 Jan 2018 09:16:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A571411ABD; Thu, 25 Jan 2018 10:16:43 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 10:16:42 +0100 Message-Id: <20180125091643.26195-3-kraxel@redhat.com> In-Reply-To: <20180125091643.26195-1-kraxel@redhat.com> References: <20180125091643.26195-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 25 Jan 2018 09:16:48 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/3] hw/usb/ccid: Make ccid_card_init() take an error parameter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mao Zhongyi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Cao jin Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Mao Zhongyi Replace init() of CCIDCardClass with realize, then convert ccid_card_init(), ccid_card_initfn() and it's callbacks to take an Error** in ordor to report the error more clearly. Cc: Gerd Hoffmann Cc: Marc-Andr=C3=A9 Lureau Cc: Cao jin Signed-off-by: Mao Zhongyi Signed-off-by: Cao jin Message-id: a8b7c670cb61b8096291f5730af62f4230a3e7fa.1514187411.git.maozy.f= nst@cn.fujitsu.com Signed-off-by: Gerd Hoffmann --- hw/usb/ccid.h | 2 +- hw/usb/ccid-card-emulated.c | 44 +++++++++++++++++++++------------------= ---- hw/usb/ccid-card-passthru.c | 12 ++++++------ hw/usb/dev-smartcard-reader.c | 34 ++++++++++++++++++--------------- 4 files changed, 48 insertions(+), 44 deletions(-) diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 1f070116d6..6c6c10188d 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -34,7 +34,7 @@ typedef struct CCIDCardClass { const uint8_t *apdu, uint32_t len); void (*exitfn)(CCIDCardState *card); - int (*initfn)(CCIDCardState *card); + void (*realize)(CCIDCardState *card, Error **errp); } CCIDCardClass; =20 /* diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index e646eb243b..daefd9f8f4 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -35,6 +35,7 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" #include "ccid.h" +#include "qapi/error.h" =20 #define DPRINTF(card, lvl, fmt, ...) \ do {\ @@ -401,10 +402,10 @@ static void card_event_handler(EventNotifier *notifie= r) qemu_mutex_unlock(&card->event_list_mutex); } =20 -static int init_event_notifier(EmulatedState *card) +static int init_event_notifier(EmulatedState *card, Error **errp) { if (event_notifier_init(&card->notifier, false) < 0) { - DPRINTF(card, 2, "event notifier creation failed\n"); + error_setg(errp, "ccid-card-emul: event notifier creation failed"); return -1; } event_notifier_set_handler(&card->notifier, card_event_handler); @@ -480,7 +481,7 @@ static uint32_t parse_enumeration(char *str, return ret; } =20 -static int emulated_initfn(CCIDCardState *base) +static void emulated_realize(CCIDCardState *base, Error **errp) { EmulatedState *card =3D EMULATED_CCID_CARD(base); VCardEmulError ret; @@ -494,8 +495,8 @@ static int emulated_initfn(CCIDCardState *base) qemu_cond_init(&card->handle_apdu_cond); card->reader =3D NULL; card->quit_apdu_thread =3D 0; - if (init_event_notifier(card) < 0) { - return -1; + if (init_event_notifier(card, errp) < 0) { + return; } =20 card->backend =3D 0; @@ -505,11 +506,11 @@ static int emulated_initfn(CCIDCardState *base) } =20 if (card->backend =3D=3D 0) { - printf("backend must be one of:\n"); + error_setg(errp, "backend must be one of:"); for (ptable =3D backend_enum_table; ptable->name !=3D NULL; ++ptab= le) { - printf("%s\n", ptable->name); + error_append_hint(errp, "%s\n", ptable->name); } - return -1; + return; } =20 /* TODO: a passthru backened that works on local machine. third card t= ype?*/ @@ -517,34 +518,33 @@ static int emulated_initfn(CCIDCardState *base) if (card->cert1 !=3D NULL && card->cert2 !=3D NULL && card->cert3 = !=3D NULL) { ret =3D emulated_initialize_vcard_from_certificates(card); } else { - printf("%s: you must provide all three certs for" - " certificates backend\n", TYPE_EMULATED_CCID); - return -1; + error_setg(errp, "%s: you must provide all three certs for" + " certificates backend", TYPE_EMULATED_CCID); + return; } } else { if (card->backend !=3D BACKEND_NSS_EMULATED) { - printf("%s: bad backend specified. The options are:\n%s (defau= lt)," - " %s.\n", TYPE_EMULATED_CCID, BACKEND_NSS_EMULATED_NAME, - BACKEND_CERTIFICATES_NAME); - return -1; + error_setg(errp, "%s: bad backend specified. The options are:%= s" + " (default), %s.", TYPE_EMULATED_CCID, + BACKEND_NSS_EMULATED_NAME, BACKEND_CERTIFICATES_NAM= E); + return; } if (card->cert1 !=3D NULL || card->cert2 !=3D NULL || card->cert3 = !=3D NULL) { - printf("%s: unexpected cert parameters to nss emulated backend= \n", - TYPE_EMULATED_CCID); - return -1; + error_setg(errp, "%s: unexpected cert parameters to nss emulat= ed " + "backend", TYPE_EMULATED_CCID); + return; } /* default to mirroring the local hardware readers */ ret =3D wrap_vcard_emul_init(NULL); } if (ret !=3D VCARD_EMUL_OK) { - printf("%s: failed to initialize vcard\n", TYPE_EMULATED_CCID); - return -1; + error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_C= CID); + return; } qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread, card, QEMU_THREAD_JOINABLE); qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thr= ead, card, QEMU_THREAD_JOINABLE); - return 0; } =20 static void emulated_exitfn(CCIDCardState *base) @@ -581,7 +581,7 @@ static void emulated_class_initfn(ObjectClass *klass, v= oid *data) DeviceClass *dc =3D DEVICE_CLASS(klass); CCIDCardClass *cc =3D CCID_CARD_CLASS(klass); =20 - cc->initfn =3D emulated_initfn; + cc->realize =3D emulated_realize; cc->exitfn =3D emulated_exitfn; cc->get_atr =3D emulated_get_atr; cc->apdu_from_guest =3D emulated_apdu_from_guest; diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 117711862e..b7dd3602dc 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "qemu/sockets.h" #include "ccid.h" +#include "qapi/error.h" =20 #define DPRINTF(card, lvl, fmt, ...) \ do { \ @@ -337,29 +338,28 @@ static const uint8_t *passthru_get_atr(CCIDCardState = *base, uint32_t *len) return card->atr; } =20 -static int passthru_initfn(CCIDCardState *base) +static void passthru_realize(CCIDCardState *base, Error **errp) { PassthruState *card =3D PASSTHRU_CCID_CARD(base); =20 card->vscard_in_pos =3D 0; card->vscard_in_hdr =3D 0; if (qemu_chr_fe_backend_connected(&card->cs)) { - DPRINTF(card, D_INFO, "initing chardev\n"); + error_setg(errp, "ccid-card-passthru: initing chardev"); qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read, ccid_card_vscard_read, ccid_card_vscard_event, NULL, card, NULL, true); ccid_card_vscard_send_init(card); } else { - error_report("missing chardev"); - return -1; + error_setg(errp, "missing chardev"); + return; } card->debug =3D parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE, card->debug); assert(sizeof(DEFAULT_ATR) <=3D MAX_ATR_SIZE); memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR)); card->atr_length =3D sizeof(DEFAULT_ATR); - return 0; } =20 static VMStateDescription passthru_vmstate =3D { @@ -387,7 +387,7 @@ static void passthru_class_initfn(ObjectClass *klass, v= oid *data) DeviceClass *dc =3D DEVICE_CLASS(klass); CCIDCardClass *cc =3D CCID_CARD_CLASS(klass); =20 - cc->initfn =3D passthru_initfn; + cc->realize =3D passthru_realize; cc->get_atr =3D passthru_get_atr; cc->apdu_from_guest =3D passthru_apdu_from_guest; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index e334d3be11..43c564fe7a 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -510,14 +510,18 @@ static void ccid_card_exitfn(CCIDCardState *card) =20 } =20 -static int ccid_card_initfn(CCIDCardState *card) +static void ccid_card_initfn(CCIDCardState *card, Error **errp) { CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); + Error *local_err =3D NULL; =20 - if (cc->initfn) { - return cc->initfn(card); + if (cc->realize) { + cc->realize(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } } - return 0; } =20 static bool ccid_has_pending_answers(USBCCIDState *s) @@ -1295,27 +1299,27 @@ static int ccid_card_exit(DeviceState *qdev) return 0; } =20 -static int ccid_card_init(DeviceState *qdev) +static void ccid_card_realize(DeviceState *qdev, Error **errp) { CCIDCardState *card =3D CCID_CARD(qdev); USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); - int ret =3D 0; + Error *local_err =3D NULL; =20 if (card->slot !=3D 0) { - warn_report("usb-ccid supports one slot, can't add %d", - card->slot); - return -1; + error_setg(errp, "usb-ccid supports one slot, can't add %d", + card->slot); + return; } if (s->card !=3D NULL) { - warn_report("usb-ccid card already full, not adding"); - return -1; + error_setg(errp, "usb-ccid card already full, not adding"); + return; } - ret =3D ccid_card_initfn(card); - if (ret =3D=3D 0) { + ccid_card_initfn(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); s->card =3D card; } - return ret; } =20 static void ccid_realize(USBDevice *dev, Error **errp) @@ -1477,7 +1481,7 @@ static void ccid_card_class_init(ObjectClass *klass, = void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); k->bus_type =3D TYPE_CCID_BUS; - k->init =3D ccid_card_init; + k->realize =3D ccid_card_realize; k->exit =3D ccid_card_exit; k->props =3D ccid_props; } --=20 2.9.3 From nobody Wed May 1 02:56:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516872036800102.3992689892466; Thu, 25 Jan 2018 01:20:36 -0800 (PST) Received: from localhost ([::1]:55692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedi0-0006nZ-31 for importer@patchew.org; Thu, 25 Jan 2018 04:20:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedeR-0004Oa-AT for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eedeP-0008Jd-Uo for qemu-devel@nongnu.org; Thu, 25 Jan 2018 04:16:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32198) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eedeP-0008JN-Ms; Thu, 25 Jan 2018 04:16:53 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 101194E8AC; Thu, 25 Jan 2018 09:16:53 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-227.ams2.redhat.com [10.36.116.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D09D2D32F; Thu, 25 Jan 2018 09:16:45 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AFA9911ABE; Thu, 25 Jan 2018 10:16:43 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 25 Jan 2018 10:16:43 +0100 Message-Id: <20180125091643.26195-4-kraxel@redhat.com> In-Reply-To: <20180125091643.26195-1-kraxel@redhat.com> References: <20180125091643.26195-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 25 Jan 2018 09:16:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] usb-storage: Fix share-rw option parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Fam Zheng , qemu-stable@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fam Zheng Because usb-storage creates an internal scsi device, we should propagate options. We already do so for bootindex etc, but failed to take care of share-rw. Fix it in an apparent way: add a new parameter to scsi_bus_legacy_add_drive and pass in s->conf.share_rw. Cc: qemu-stable@nongnu.org Signed-off-by: Fam Zheng Reviewed-by: Darren Kenny Message-id: 20180117005222.4781-1-famz@redhat.com Signed-off-by: Gerd Hoffmann --- include/hw/scsi/scsi.h | 1 + hw/scsi/scsi-bus.c | 9 ++++++++- hw/usb/dev-storage.c | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 23a8ee6a7d..802a647cdc 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -151,6 +151,7 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice = *d) =20 SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk, int unit, bool removable, int bootin= dex, + bool share_rw, const char *serial, Error **errp); void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool deprecated); void scsi_legacy_handle_cmdline(void); diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 965becf31f..05e501efd3 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -224,6 +224,7 @@ static void scsi_qdev_unrealize(DeviceState *qdev, Erro= r **errp) /* handle legacy '-drive if=3Dscsi,...' cmd line args */ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk, int unit, bool removable, int bootin= dex, + bool share_rw, const char *serial, Error **errp) { const char *driver; @@ -254,6 +255,12 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, Bl= ockBackend *blk, object_unparent(OBJECT(dev)); return NULL; } + object_property_set_bool(OBJECT(dev), share_rw, "share-rw", &err); + if (err !=3D NULL) { + error_propagate(errp, err); + object_unparent(OBJECT(dev)); + return NULL; + } object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err !=3D NULL) { error_propagate(errp, err); @@ -288,7 +295,7 @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool = deprecated) } } scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo), - unit, false, -1, NULL, &error_fatal); + unit, false, -1, false, NULL, &error_fat= al); } loc_pop(&loc); } diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index e44a5c72cf..b56c75a73a 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -633,7 +633,8 @@ static void usb_msd_storage_realize(USBDevice *dev, Err= or **errp) scsi_bus_new(&s->bus, sizeof(s->bus), DEVICE(dev), &usb_msd_scsi_info_storage, NULL); scsi_dev =3D scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable, - s->conf.bootindex, dev->serial, + s->conf.bootindex, s->conf.share_= rw, + dev->serial, errp); blk_unref(blk); if (!scsi_dev) { --=20 2.9.3