Commit 35c2c8dc authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Paolo Bonzini
Browse files

osdep: Rename qemu_{get, set}_version() to qemu_{, set_}hw_version() 



This makes the purpose of the function clearer: it is not about the
version of QEMU that's running, but the version string exposed in the
emulated hardware.

Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: John Snow <jsnow@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1446233769-7892-3-git-send-email-ehabkost@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent de796d93

hw/arm/nseries.c

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ static int n8x0_atag_setup(void *p, int model) 
    strcpy((void *) w, "hw-build");		/* char component[12] */

    w += 6;

    strcpy((void *) w, "QEMU ");

    pstrcat((void *) w, 12, qemu_get_version()); /* char version[12] */

    pstrcat((void *) w, 12, qemu_hw_version()); /* char version[12] */

    w += 6;



    tag = (model == 810) ? "1.1.10-qemu" : "1.1.6-qemu";

hw/ide/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2312,7 +2312,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind, 
    if (version) {

        pstrcpy(s->version, sizeof(s->version), version);

    } else {

        pstrcpy(s->version, sizeof(s->version), qemu_get_version());

        pstrcpy(s->version, sizeof(s->version), qemu_hw_version());

    }



    ide_reset(s);

hw/scsi/scsi-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static bool scsi_target_emulate_inquiry(SCSITargetReq *r) 
        r->buf[7] = 0x10 | (r->req.bus->info->tcq ? 0x02 : 0); /* Sync, TCQ.  */

        memcpy(&r->buf[8], "QEMU    ", 8);

        memcpy(&r->buf[16], "QEMU TARGET     ", 16);

        pstrcpy((char *) &r->buf[32], 4, qemu_get_version());

        pstrcpy((char *) &r->buf[32], 4, qemu_hw_version());

    }

    return true;

}

hw/scsi/scsi-disk.c

+1 −1
Original line number Diff line number Diff line
@@ -2315,7 +2315,7 @@ static void scsi_realize(SCSIDevice *dev, Error **errp) 
    }



    if (!s->version) {

        s->version = g_strdup(qemu_get_version());

        s->version = g_strdup(qemu_hw_version());

    }

    if (!s->vendor) {

        s->vendor = g_strdup("QEMU");

include/qemu/osdep.h

+2 −2
Original line number Diff line number Diff line
@@ -247,8 +247,8 @@ static inline void qemu_timersub(const struct timeval *val1, 


void qemu_set_cloexec(int fd);



void qemu_set_version(const char *);

const char *qemu_get_version(void);

void qemu_set_hw_version(const char *);

const char *qemu_hw_version(void);



void fips_set_state(bool requested);

bool fips_get_state(void);