From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XQwYy-0004Em-35 for qemu-devel@nongnu.org; Mon, 08 Sep 2014 06:52:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XQwYr-0007vq-RB for qemu-devel@nongnu.org; Mon, 08 Sep 2014 06:52:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XQwYr-0007va-Kq for qemu-devel@nongnu.org; Mon, 08 Sep 2014 06:52:41 -0400 From: Stefan Hajnoczi Date: Mon, 8 Sep 2014 11:51:45 +0100 Message-Id: <1410173509-26667-21-git-send-email-stefanha@redhat.com> In-Reply-To: <1410173509-26667-1-git-send-email-stefanha@redhat.com> References: <1410173509-26667-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 20/24] ide: Add wwn support to IDE-ATAPI drive List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , John Snow , Stefan Hajnoczi From: John Snow Although it is possible to specify the wwn property for cdrom devices on the command line, the underlying driver fails to relay this information to the guest operating system via IDENTIFY. This is a simple patch to correct that. See ATA8-ACS, Table 22 parts 5, 6, and 9. Signed-off-by: John Snow Reviewed-by: Fam Zheng Signed-off-by: Stefan Hajnoczi --- hw/ide/core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/ide/core.c b/hw/ide/core.c index b48127f..de0e5e9 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -230,9 +230,23 @@ static void ide_atapi_identify(IDEState *s) } put_le16(p + 80, 0x1e); /* support up to ATA/ATAPI-4 */ + if (s->wwn) { + put_le16(p + 84, (1 << 8)); /* supports WWN for words 108-111 */ + put_le16(p + 87, (1 << 8)); /* WWN enabled */ + } + #ifdef USE_DMA_CDROM put_le16(p + 88, 0x3f | (1 << 13)); /* udma5 set and supported */ #endif + + if (s->wwn) { + /* LE 16-bit words 111-108 contain 64-bit World Wide Name */ + put_le16(p + 108, s->wwn >> 48); + put_le16(p + 109, s->wwn >> 32); + put_le16(p + 110, s->wwn >> 16); + put_le16(p + 111, s->wwn); + } + memcpy(s->identify_data, p, sizeof(s->identify_data)); s->identify_set = 1; } -- 1.9.3