[Qemu-devel] [PATCH 10/10] ide: Drop redundant IDEState member wwn

[Markus Armbruster]

It's a copy of dev->wwn.  The copy was needed for non-qdevified
controllers, which lacked dev.

Note that pci_piix3_xen_ide_unplug() did not clear the copy (it only
cleared the copy of bs).  Begs the question whether stale data could
have been used after unplug.  As far as I can tell, the copy was used
only when the copy of bs was non-null, thus no bug there.

Signed-off-by: Markus Armbruster <address@hidden>
---
 hw/ide/core.c     | 18 ++++++++----------
 hw/ide/internal.h |  4 +---
 hw/ide/qdev.c     |  3 +--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/hw/ide/core.c b/hw/ide/core.c
index a45a03f..a54a64b 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -142,7 +142,7 @@ static void ide_identify(IDEState *s)
     /* 13=flush_cache_ext,12=flush_cache,10=lba48 */
     put_le16(p + 83, (1 << 14) | (1 << 13) | (1 <<12) | (1 << 10));
     /* 14=set to 1, 8=has WWN, 1=SMART self test, 0=SMART error logging */
-    if (s->wwn) {
+    if (s->dev->wwn) {
         put_le16(p + 84, (1 << 14) | (1 << 8) | 0);
     } else {
         put_le16(p + 84, (1 << 14) | 0);
@@ -156,7 +156,7 @@ static void ide_identify(IDEState *s)
     /* 13=flush_cache_ext,12=flush_cache,10=lba48 */
     put_le16(p + 86, (1 << 13) | (1 <<12) | (1 << 10));
     /* 14=set to 1, 8=has WWN, 1=SMART self test, 0=SMART error logging */
-    if (s->wwn) {
+    if (s->dev->wwn) {
         put_le16(p + 87, (1 << 14) | (1 << 8) | 0);
     } else {
         put_le16(p + 87, (1 << 14) | 0);
@@ -170,12 +170,12 @@ static void ide_identify(IDEState *s)
 
     if (dev && dev->conf.physical_block_size)
         put_le16(p + 106, 0x6000 | get_physical_block_exp(&dev->conf));
-    if (s->wwn) {
+    if (s->dev->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);
+        put_le16(p + 108, s->dev->wwn >> 48);
+        put_le16(p + 109, s->dev->wwn >> 32);
+        put_le16(p + 110, s->dev->wwn >> 16);
+        put_le16(p + 111, s->dev->wwn);
     }
     if (dev && dev->conf.discard_granularity) {
         put_le16(p + 169, 1); /* TRIM support */
@@ -1930,8 +1930,7 @@ static const BlockDevOps ide_cd_block_ops = {
     .is_medium_locked = ide_cd_is_medium_locked,
 };
 
-int ide_init_drive(IDEState *s, IDEDriveKind kind,
-                   uint64_t wwn)
+int ide_init_drive(IDEState *s, IDEDriveKind kind)
 {
     BlockDriverState *bs = s->dev->conf.bs;
     uint64_t nb_sectors;
@@ -1940,7 +1939,6 @@ int ide_init_drive(IDEState *s, IDEDriveKind kind,
 
     bdrv_get_geometry(bs, &nb_sectors);
     s->nb_sectors = nb_sectors;
-    s->wwn = wwn;
     /* The SMART values should be preserved across power cycles
        but they aren't.  */
     s->smart_enabled = 1;
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index e5546c1..352c87c 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -351,7 +351,6 @@ struct IDEState {
     int identify_set;
     uint8_t identify_data[512];
     int drive_serial;
-    uint64_t wwn;
     /* ide regs */
     uint8_t feature;
     uint8_t error;
@@ -540,8 +539,7 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr);
 void ide_data_writel(void *opaque, uint32_t addr, uint32_t val);
 uint32_t ide_data_readl(void *opaque, uint32_t addr);
 
-int ide_init_drive(IDEState *s, IDEDriveKind kind,
-                   uint64_t wwn);
+int ide_init_drive(IDEState *s, IDEDriveKind kind);
 void ide_init2(IDEBus *bus, qemu_irq irq);
 void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
                                     DriveInfo *hd1, qemu_irq irq);
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index b1d25d7..d7e4f7b 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -170,8 +170,7 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)
         }
     }
 
-    if (ide_init_drive(s, kind,
-                       dev->wwn) < 0) {
+    if (ide_init_drive(s, kind) < 0) {
         return -1;
     }
 
-- 
1.7.11.7