From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5zo2-0003iB-Rv for qemu-devel@nongnu.org; Fri, 19 Jun 2015 13:10:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5zny-0008LW-NG for qemu-devel@nongnu.org; Fri, 19 Jun 2015 13:10:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5zny-0008LN-Et for qemu-devel@nongnu.org; Fri, 19 Jun 2015 13:10:14 -0400 Message-ID: <55844CEF.8080300@redhat.com> Date: Fri, 19 Jun 2015 11:10:07 -0600 From: Eric Blake MIME-Version: 1.0 References: <1434733075-24240-1-git-send-email-den@openvz.org> <1434733075-24240-10-git-send-email-den@openvz.org> In-Reply-To: <1434733075-24240-10-git-send-email-den@openvz.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="s08Px6rJvoL7AlSRDcg39sqE8mVrqMbdp" Subject: Re: [Qemu-devel] [PATCH 09/10] qga: added bus type and disk location path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Olga Krishtal , qemu-devel@nongnu.org, Michael Roth This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --s08Px6rJvoL7AlSRDcg39sqE8mVrqMbdp Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 06/19/2015 10:57 AM, Denis V. Lunev wrote: > From: Olga Krishtal >=20 > According to Microsoft disk location path can be obtained via > IOCTL_SCSI_GET_ADDRESS. Unfortunately this ioctl can not be used for al= l > devices. There are certain bus types which could be obtained with this > API. Please refer to the following link for more details > https://technet.microsoft.com/en-us/library/ee851589(v=3Dws.10).aspx >=20 > Bus type could be obtained using IOCTL_STORAGE_QUERY_PROPERTY. Enum > STORAGE_BUS_TYPE describes all buses supported by OS. >=20 > Windows defines more bus types that Linux. Thus some values have been a= dded s/that/than/ > to GuestDiskBusType. >=20 > Signed-off-by: Olga Krishtal > Signed-off-by: Denis V. Lunev > CC: Eric Blake > CC: Michael Roth > --- > qga/commands-win32.c | 127 +++++++++++++++++++++++++++++++++++++++++++= +++++++- > qga/qapi-schema.json | 15 +++++- > 2 files changed, 139 insertions(+), 3 deletions(-) >=20 > +static WinToLin buses[] =3D { > + {BusTypeUnknown, GUEST_DISK_BUS_TYPE_UNKNOWN}, > + {BusTypeScsi, GUEST_DISK_BUS_TYPE_SCSI}, > + {BusTypeAtapi, GUEST_DISK_BUS_TYPE_IDE}, > + {BusTypeAta, GUEST_DISK_BUS_TYPE_IDE}, > + {BusType1394, GUEST_DISK_BUS_TYPE_1394}, > + {BusTypeSsa, GUEST_DISK_BUS_TYPE_SSA}, > + {BusTypeFibre, GUEST_DISK_BUS_TYPE_SSA}, > + {BusTypeUsb, GUEST_DISK_BUS_TYPE_USB}, > + {BusTypeRAID, GUEST_DISK_BUS_TYPE_RAID}, > +#if (_WIN32_WINNT >=3D 0x0600) > + {BusTypeiScsi, GUEST_DISK_BUS_TYPE_I_SCSI}, > + {BusTypeSas, GUEST_DISK_BUS_TYPE_SAS}, > + {BusTypeSata, GUEST_DISK_BUS_TYPE_SATA}, > + {BusTypeSd, GUEST_DISK_BUS_TYPE_SD}, > + {BusTypeMmc, GUEST_DISK_BUS_TYPE_MMC}, > + {BusTypeVirtual, GUEST_DISK_BUS_TYPE_VIRTUAL }, > + {BusTypeFileBackedVirtuaul, GUEST_DISK_BUS_TYPE_FBIRTUAL}, > + {BusTypeSpaces, GUEST_DISK_BUS_TYPE_SPACES} > +#endif I'd use a trailing comma, so that future additions can be pure additions rather than amending existing lines. > +++ b/qga/qapi-schema.json > @@ -711,6 +711,7 @@ > # @GuestDiskBusType > # > # An enumeration of bus type of disks > +# is devided a bit on Linux and Windows guest > # s/devided/divided/ > # @ide: IDE disks > # @fdc: floppy disks > @@ -721,12 +722,22 @@ > # @uml: UML disks > # @sata: SATA disks > # @sd: SD cards > -# > +# @Unknown: Unknown bus type > +# @1394: Win IEEE 1394 bus type > +# @Ssa: Win SSA bus type > +# @Fibre: Win fiber channel bus type > +# @Raid: Win RAID bus type > +# @iScsi: Win iScsi bus type > +# @Sas: Win serial-attaches SCSI bus type > +# @Mmc: Win multimedia card (MMC) bus type > +# @Virtual: Win virtual bus type > +# @FB: Win file-backed bus type > # Since: 2.2 Missing information about when elements were added: simplest (but redundant) by adding '(since 2.4)' everywhere, or shorter (but might cause grief down the road if we try to automate doc generation) by doing something like: # Since: 2.2; 'Unknown' and all later entries since 2.4 > ## > { 'enum': 'GuestDiskBusType', > 'data': [ 'ide', 'fdc', 'scsi', 'virtio', 'xen', 'usb', 'uml', 'sata= ', > - 'sd' ] } > + 'sd', 'unknown', '1394','Ssa', 'fibre', 'RAID', 'iScsi', '= sas', Uggh - '1394' is a purely numeric enum name. Not the first time (so the qapi generator allows it), but we considered blacklisting future additions of it: https://lists.gnu.org/archive/html/qemu-devel/2015-05/msg00229.html --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --s08Px6rJvoL7AlSRDcg39sqE8mVrqMbdp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJVhEzvAAoJEKeha0olJ0Nqe0sH/0AN2rL8DflcC2oDCDEEfC/V K49S1ojnckkhwQ0iaR1zpQiRwBQLPMtxt+V9qk29q+r7hwPlQ6UKRP3OcCkkC08n qy/4YoY7bfI4vy7kVrpXJ7v45l5ZxH7GQ/iD090B/DACHEyW2GN5NRU9ZYMfBO6/ llD9b7jYdIk+RzsfjSyK+apLitOkMCHUMyqEVm/0QSCf5TRn+taMdEdJDftzbS+9 LzBDNwyxHdVVwPrV7/M1mMh9I8YD3efFKnFZWiBMTR6gODemVZLpi3Jd5GFReVMH kA9ET2crQK14nLWXpdc8vmZGaVyS+BAqe+Q8KbUm+uMrpxD81KzYL+JDq0alowM= =DcaE -----END PGP SIGNATURE----- --s08Px6rJvoL7AlSRDcg39sqE8mVrqMbdp--