The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1308a17bad883c4ec2242b1d4e7ddb00d25f3e12
commit 1308a17bad883c4ec2242b1d4e7ddb00d25f3e12 Author: Elyes Haouas <[email protected]> AuthorDate: 2023-03-15 02:09:16 +0000 Commit: Warner Losh <[email protected]> CommitDate: 2023-03-15 02:39:34 +0000 bhyve: Remove trailing semicolon Macros shouldn't use trailing semicolon. Signed-off-by: Elyes Haouas <[email protected]> Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/654 --- usr.sbin/bhyve/acpi.c | 4 ++-- usr.sbin/bhyve/ipc.h | 2 +- usr.sbin/bhyve/pci_emul.h | 2 +- usr.sbin/bhyve/pci_hda.h | 2 +- usr.sbin/bhyve/pci_nvme.c | 2 +- usr.sbin/bhyve/usb_emul.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 84a54cc485c5..d53785c4bfba 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -101,10 +101,10 @@ struct basl_fio { }; #define EFPRINTF(...) \ - if (fprintf(__VA_ARGS__) < 0) goto err_exit; + if (fprintf(__VA_ARGS__) < 0) goto err_exit #define EFFLUSH(x) \ - if (fflush(x) != 0) goto err_exit; + if (fflush(x) != 0) goto err_exit /* * A list for additional ACPI devices like a TPM. diff --git a/usr.sbin/bhyve/ipc.h b/usr.sbin/bhyve/ipc.h index 674fc210e0fb..cff7c126efed 100644 --- a/usr.sbin/bhyve/ipc.h +++ b/usr.sbin/bhyve/ipc.h @@ -41,7 +41,7 @@ struct ipc_command { #define IPC_COMMAND(set, name, function) \ static struct ipc_command name ## _ipc_command = \ { #name, function }; \ - DATA_SET(set, name ## _ipc_command); + DATA_SET(set, name ## _ipc_command) #define IPC_COMMAND_FOREACH(pvar, set) SET_FOREACH(pvar, set) diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h index 117fc78898a2..b54f3f15fbad 100644 --- a/usr.sbin/bhyve/pci_emul.h +++ b/usr.sbin/bhyve/pci_emul.h @@ -82,7 +82,7 @@ struct pci_devemu { int (*pe_resume)(struct pci_devinst *pi); }; -#define PCI_EMUL_SET(x) DATA_SET(pci_devemu_set, x); +#define PCI_EMUL_SET(x) DATA_SET(pci_devemu_set, x) enum pcibar_type { PCIBAR_NONE, diff --git a/usr.sbin/bhyve/pci_hda.h b/usr.sbin/bhyve/pci_hda.h index a021aa9c28da..12d80a92f60a 100644 --- a/usr.sbin/bhyve/pci_hda.h +++ b/usr.sbin/bhyve/pci_hda.h @@ -87,6 +87,6 @@ struct hda_ops { uint8_t dir, uint8_t *buf, size_t count); }; -#define HDA_EMUL_SET(x) DATA_SET(hda_codec_class_set, x); +#define HDA_EMUL_SET(x) DATA_SET(hda_codec_class_set, x) #endif /* _HDA_EMUL_H_ */ diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index cf1c815096d3..2ba893de000b 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -129,7 +129,7 @@ static int nvme_debug = 0; /* Encode number of SQ's and CQ's for Set/Get Features */ #define NVME_FEATURE_NUM_QUEUES(sc) \ (ZERO_BASED((sc)->num_squeues) & 0xffff) | \ - (ZERO_BASED((sc)->num_cqueues) & 0xffff) << 16; + (ZERO_BASED((sc)->num_cqueues) & 0xffff) << 16 #define NVME_DOORBELL_OFFSET offsetof(struct nvme_registers, doorbell) diff --git a/usr.sbin/bhyve/usb_emul.h b/usr.sbin/bhyve/usb_emul.h index 9a2844a8db1e..b5bc0fb6b4d2 100644 --- a/usr.sbin/bhyve/usb_emul.h +++ b/usr.sbin/bhyve/usb_emul.h @@ -65,7 +65,7 @@ struct usb_devemu { int (*ue_stop)(void *sc); int (*ue_snapshot)(void *scarg, struct vm_snapshot_meta *meta); }; -#define USB_EMUL_SET(x) DATA_SET(usb_emu_set, x); +#define USB_EMUL_SET(x) DATA_SET(usb_emu_set, x) /* * USB device events to notify HCI when state changes
