Patchwork [09/10] ide: Drop redundant IDEState member model

login
register
mail settings
Submitter Markus Armbruster
Date Dec. 17, 2012, 2:05 p.m.
Message ID <1355753160-17544-10-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/206869/
State New
Headers show

Comments

Markus Armbruster - Dec. 17, 2012, 2:05 p.m.
It's a copy of dev->serial.  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 <armbru@redhat.com>
---
 hw/ide/core.c     | 22 +++-------------------
 hw/ide/internal.h |  2 --
 hw/ide/qdev.c     | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 22 deletions(-)

Patch

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 2608f67..a45a03f 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -99,7 +99,7 @@  static void ide_identify(IDEState *s)
     put_le16(p + 21, 512); /* cache size in sectors */
     put_le16(p + 22, 4); /* ecc bytes */
     padstr((char *)(p + 23), s->dev->version, 8); /* firmware version */
-    padstr((char *)(p + 27), s->drive_model_str, 40); /* model */
+    padstr((char *)(p + 27), s->dev->model, 40);  /* model */
 #if MAX_MULT_SECTORS > 1
     put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS);
 #endif
@@ -203,7 +203,7 @@  static void ide_atapi_identify(IDEState *s)
     put_le16(p + 21, 512); /* cache size in sectors */
     put_le16(p + 22, 4); /* ecc bytes */
     padstr((char *)(p + 23), s->dev->version, 8); /* firmware version */
-    padstr((char *)(p + 27), s->drive_model_str, 40); /* model */
+    padstr((char *)(p + 27), s->dev->model, 40);  /* model */
     put_le16(p + 48, 1); /* dword I/O (XXX: should not be set on CDROM) */
 #ifdef USE_DMA_CDROM
     put_le16(p + 49, 1 << 9 | 1 << 8); /* DMA and LBA supported */
@@ -260,7 +260,7 @@  static void ide_cfata_identify(IDEState *s)
     padstr((char *)(p + 10), s->dev->serial, 20); /* serial number */
     put_le16(p + 22, 0x0004);			/* ECC bytes */
     padstr((char *) (p + 23), s->dev->version, 8); /* Firmware Revision */
-    padstr((char *) (p + 27), s->drive_model_str, 40);/* Model number */
+    padstr((char *) (p + 27), s->dev->model, 40);  /* Model number */
 #if MAX_MULT_SECTORS > 1
     put_le16(p + 47, 0x8000 | MAX_MULT_SECTORS);
 #else
@@ -1931,7 +1931,6 @@  static const BlockDevOps ide_cd_block_ops = {
 };
 
 int ide_init_drive(IDEState *s, IDEDriveKind kind,
-                   const char *model,
                    uint64_t wwn)
 {
     BlockDriverState *bs = s->dev->conf.bs;
@@ -1961,21 +1960,6 @@  int ide_init_drive(IDEState *s, IDEDriveKind kind,
             return -1;
         }
     }
-    if (model) {
-        pstrcpy(s->drive_model_str, sizeof(s->drive_model_str), model);
-    } else {
-        switch (kind) {
-        case IDE_CD:
-            strcpy(s->drive_model_str, "QEMU DVD-ROM");
-            break;
-        case IDE_CFATA:
-            strcpy(s->drive_model_str, "QEMU MICRODRIVE");
-            break;
-        default:
-            strcpy(s->drive_model_str, "QEMU HARDDISK");
-            break;
-        }
-    }
 
     ide_reset(s);
     bdrv_iostatus_enable(bs);
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 28b60aa..e5546c1 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;
-    char drive_model_str[41];
     uint64_t wwn;
     /* ide regs */
     uint8_t feature;
@@ -542,7 +541,6 @@  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,
-                   const char *model,
                    uint64_t wwn);
 void ide_init2(IDEBus *bus, qemu_irq irq);
 void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index ef7af1f..b1d25d7 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -156,8 +156,22 @@  static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)
         dev->version = g_strdup(qemu_get_version());
     }
 
+    if (!dev->model) {
+        switch (kind) {
+        case IDE_CD:
+            dev->model = g_strdup("QEMU DVD-ROM");
+            break;
+        case IDE_CFATA:
+            dev->model = g_strdup("QEMU MICRODRIVE");
+            break;
+        default:
+            dev->model = g_strdup("QEMU HARDDISK");
+            break;
+        }
+    }
+
     if (ide_init_drive(s, kind,
-                       dev->model, dev->wwn) < 0) {
+                       dev->wwn) < 0) {
         return -1;
     }