D5042.id12624.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D5042.id12624.diff
View Options

	Index: usr.sbin/bhyve/block_if.c
	===================================================================
	--- usr.sbin/bhyve/block_if.c
	+++ usr.sbin/bhyve/block_if.c
	@@ -692,9 +692,7 @@
	blockif_close(struct blockif_ctxt *bc)
	{
	void *jval;
	- int err, i;
	-
	- err = 0;
	+ int i;

	assert(bc->bc_magic == BLOCKIF_SIG);

	Index: usr.sbin/bhyve/pci_ahci.c
	===================================================================
	--- usr.sbin/bhyve/pci_ahci.c
	+++ usr.sbin/bhyve/pci_ahci.c
	@@ -1201,10 +1201,9 @@
	{
	int msf, size;
	uint64_t sectors;
	- uint8_t start_track, *bp, buf[50];
	+ uint8_t *bp, buf[50];

	msf = (acmd[1] >> 1) & 1;
	- start_track = acmd[6];
	bp = buf + 2;
	*bp++ = 1;
	*bp++ = 1;
	@@ -1312,13 +1311,11 @@
	struct ahci_cmd_hdr *hdr;
	struct ahci_prdt_entry *prdt;
	struct blockif_req *breq;
	- struct pci_ahci_softc *sc;
	uint8_t *acmd;
	uint64_t lba;
	uint32_t len;
	int err;

	- sc = p->pr_sc;
	acmd = cfis + 0x40;
	hdr = (struct ahci_cmd_hdr )(p->cmd_lst + slot AHCI_CL_SIZE);
	prdt = (struct ahci_prdt_entry *)(cfis + 0x80);