usr.sbin/bhyve/bhyverun.c
1582	pthread_create() returns a positive error number in the failure case, and this check won't catch it. I suspect it should just check `init_checkpoint_thread(ctx) != 0`.

This revision is now accepted and ready to land.Mar 2 2023, 10:03 PM

corvink accepted this revision.Mar 3 2023, 7:04 AM

Fix note, use init_checkpoint_thread(ctx) != 0

This revision now requires review to proceed.Mar 3 2023, 11:47 AM

gusev.vitaliy_gmail.com marked an inline comment as done.Mar 3 2023, 11:48 AM

gusev.vitaliy_gmail.com added inline comments.

usr.sbin/bhyve/bhyverun.c
1582	Done.

@markj @corvink Please re-accept.

markj accepted this revision as: markj.Mar 3 2023, 2:27 PM

This revision is now accepted and ready to land.Mar 3 2023, 2:27 PM

Closed by commit rGd213429e42d4: bhyve: exit with EX_OSERR if init checkpoint or restore time failed (authored by gusev.vitaliy_gmail.com, committed by corvink). · Explain WhyMar 6 2023, 1:06 PM

This revision was automatically updated to reflect the committed changes.

corvink added a commit: rGd213429e42d4: bhyve: exit with EX_OSERR if init checkpoint or restore time failed.

corvink added a commit: rG6efb053bea5f: bhyve: exit with EX_OSERR if init checkpoint or restore time failed.Mar 17 2023, 10:31 AM

Revision Contents
Changeset List

Path

Size

usr.sbin/

bhyve/

bhyverun.c

7 lines

Diff 118249

View Options

usr.sbin/bhyve/bhyverun.c

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
#include "stand.h"		#include "stand.h"
#include "net.h"		#include "net.h"
#include "netif.h"		#include "netif.h"
#include "bootp.h"		#include "bootp.h"


struct in_addr servip;		struct in_addr servip;

static n_long nmask, smask;

static time_t bot;		static time_t bot;

static char vm_rfc1048[4] = VM_RFC1048;		static char vm_rfc1048[4] = VM_RFC1048;
#ifdef BOOTP_VEND_CMU		#ifdef BOOTP_VEND_CMU
static char vm_cmu[4] = VM_CMU;		static char vm_cmu[4] = VM_CMU;
#endif		#endif

/* Local forwards */		/* Local forwards */
▲ Show 20 Lines • Show All 143 Lines • ▼ Show 20 Lines
#endif		#endif

myip = d->myip = rbuf.rbootp.bp_yiaddr;		myip = d->myip = rbuf.rbootp.bp_yiaddr;
servip = rbuf.rbootp.bp_siaddr;		servip = rbuf.rbootp.bp_siaddr;
if(rootip.s_addr == INADDR_ANY) rootip = servip;		if(rootip.s_addr == INADDR_ANY) rootip = servip;
bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));		bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));
bootfile[sizeof(bootfile) - 1] = '\0';		bootfile[sizeof(bootfile) - 1] = '\0';

if (IN_CLASSA(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSA_NET);
else if (IN_CLASSB(ntohl(myip.s_addr)))
nmask = htonl(IN_CLASSB_NET);
else
nmask = htonl(IN_CLASSC_NET);
#ifdef BOOTP_DEBUG		#ifdef BOOTP_DEBUG
if (debug)		if (debug)
printf("'native netmask' is %s\n", intoa(nmask));
#endif

/* Check subnet mask against net mask; toss if bogus */
if ((nmask & smask) != nmask) {
#ifdef BOOTP_DEBUG
if (debug)
printf("subnet mask (%s) bad\n", intoa(smask));
#endif
smask = 0;
}

/* Get subnet (or natural net) mask */
netmask = nmask;
if (smask)
netmask = smask;
#ifdef BOOTP_DEBUG
if (debug)
printf("mask: %s\n", intoa(netmask));		printf("mask: %s\n", intoa(netmask));
#endif		#endif

/* We need a gateway if root is on a different net */		/* We need a gateway if root is on a different net */
if (!SAMENET(myip, rootip, netmask)) {		if (!SAMENET(myip, rootip, netmask)) {
#ifdef BOOTP_DEBUG		#ifdef BOOTP_DEBUG
if (debug)		if (debug)
printf("need gateway for root ip\n");		printf("need gateway for root ip\n");
▲ Show 20 Lines • Show All 120 Lines • ▼ Show 20 Lines	#endif

while (cp < ep) {		while (cp < ep) {
tag = *cp++;		tag = *cp++;
size = *cp++;		size = *cp++;
if (tag == TAG_END)		if (tag == TAG_END)
break;		break;

if (tag == TAG_SUBNET_MASK) {		if (tag == TAG_SUBNET_MASK) {
bcopy(cp, &smask, sizeof(smask));		bcopy(cp, &netmask, sizeof(netmask));
}		}
if (tag == TAG_GATEWAY) {		if (tag == TAG_GATEWAY) {
bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));		bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));
}		}
if (tag == TAG_SWAPSERVER) {		if (tag == TAG_SWAPSERVER) {
/* let it override bp_siaddr */		/* let it override bp_siaddr */
bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr));		bcopy(cp, &rootip.s_addr, sizeof(rootip.s_addr));
}		}
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines

#ifdef BOOTP_DEBUG		#ifdef BOOTP_DEBUG
if (debug)		if (debug)
printf("vend_cmu bootp info.\n");		printf("vend_cmu bootp info.\n");
#endif		#endif
vp = (struct cmu_vend *)cp;		vp = (struct cmu_vend *)cp;

if (vp->v_smask.s_addr != 0) {		if (vp->v_smask.s_addr != 0) {
smask = vp->v_smask.s_addr;		netmask = vp->v_smask.s_addr;
}		}
if (vp->v_dgate.s_addr != 0) {		if (vp->v_dgate.s_addr != 0) {
gateip = vp->v_dgate;		gateip = vp->v_dgate;
}		}
}		}
#endif		#endif

#ifdef DHCP_ENV		#ifdef DHCP_ENV
▲ Show 20 Lines • Show All 315 Lines • Show Last 20 Lines

bhyve: Exit with EX_OSERR if init checkpoint or restore time failedClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 118249

usr.sbin/bhyve/bhyverun.c

bhyve: Exit with EX_OSERR if init checkpoint or restore time failed
ClosedPublic
Actions

Revision Contents
Changeset List