mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-17 15:27:36 +00:00
Code Issues Releases Activity

Give AHCI disk serial based on backing file path same as for virtio block.

Browse Source 
It is still not good that they may intersect on different hosts, but that
is better then intersecting on the same host.

MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2015-03-15 15:29:03 +00:00
parent 9dcce6e267
commit e72d4950e1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=280040
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/bhyve/pci_ahci.c
View File

@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <pthread.h>
#include <pthread_np.h>
#include <inttypes.h>
#include <md5.h>
#include "bhyverun.h"
#include "pci_emul.h"
@ -131,6 +132,7 @@ struct ahci_port {
struct pci_ahci_softc *pr_sc;
uint8_t *cmd_lst;
uint8_t *rfis;
char ident[20 + 1];
int atapi;
int reset;
int mult_sectors;
@ -855,8 +857,7 @@ handle_identify(struct ahci_port *p, int slot, uint8_t *cfis)
buf[1] = cyl;
buf[3] = heads;
buf[6] = sech;
/* TODO emulate different serial? */
ata_string((uint8_t *)(buf+10), "123456", 20);
ata_string((uint8_t *)(buf+10), p->ident, 20);
ata_string((uint8_t *)(buf+23), "001", 8);
ata_string((uint8_t *)(buf+27), "BHYVE SATA DISK", 40);
buf[47] = (0x8000 | 128);
@ -946,8 +947,7 @@ handle_atapi_identify(struct ahci_port *p, int slot, uint8_t *cfis)
memset(buf, 0, sizeof(buf));
buf[0] = (2 << 14 | 5 << 8 | 1 << 7 | 2 << 5);
/* TODO emulate different serial? */
ata_string((uint8_t *)(buf+10), "123456", 20);
ata_string((uint8_t *)(buf+10), p->ident, 20);
ata_string((uint8_t *)(buf+23), "001", 8);
ata_string((uint8_t *)(buf+27), "BHYVE SATA DVD ROM", 40);
buf[49] = (1 << 9 | 1 << 8);
@ -2167,6 +2167,8 @@ pci_ahci_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts, int atapi)
struct blockif_ctxt *bctxt;
struct pci_ahci_softc *sc;
int ret, slots;
MD5_CTX mdctx;
u_char digest[16];
ret = 0;
@ -2203,6 +2205,16 @@ pci_ahci_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts, int atapi)
sc->port[0].bctx = bctxt;
sc->port[0].pr_sc = sc;
/*
* Create an identifier for the backing file. Use parts of the
* md5 sum of the filename
*/
MD5Init(&mdctx);
MD5Update(&mdctx, opts, strlen(opts));
MD5Final(digest, &mdctx);
sprintf(sc->port[0].ident, "BHYVE-%02X%02X-%02X%02X-%02X%02X",
digest[0], digest[1], digest[2], digest[3], digest[4], digest[5]);
/*
* Allocate blockif request structures and add them
* to the free list