From nobody Wed Mar 15 02:39:42 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pbvk63RZlz3xrgk; Wed, 15 Mar 2023 02:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pbvk62yQGz4Pvq; Wed, 15 Mar 2023 02:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678847982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evzuXfcV7ZFgIvv3zMH28/+NvnSg8MBYhFrrTMpyvFU=; b=NLFViaYJ1ft9SX2/s37s0jt//4fLo5O+TRcXb0zq/jfdYnUdCMr1X6YD4k2g8HoJDySLqs tewTsbItaeiEh74NL+KuQOa9hmweD42XJRmnTRvYOt4f/hywZH6CwI2QMJ9tT34BwjSnPr hiaLc2ggzgd3W2d73b+CAE+wPwty/TfKddkuNlgbYRfmemCdewAVPRhi9mnZ6WWvO6NLc2 gQueqp0rA8NywYhmxVdcyb/sFlictVZcFEJrm/kQZnHQtczE2/xfBpeVHfR5RAhKhmq9vd BClPhl7wygzaVMcgZI/UgmfnPWWgF5gncm5BElkZ/BZgi4HtdRIh15izbXiLsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678847982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=evzuXfcV7ZFgIvv3zMH28/+NvnSg8MBYhFrrTMpyvFU=; b=Q6RsGk0+xrSpcB4B1YzW33juXD/wZxY7AJldRbpEtciaYeQrgQIFRBoVjEan3UtLzBV7ST B1ashPhXiwzsFbFtc6qNzoAipHN5YCLLgXCFyesMDoxNjZhs34qUw7zyF1cmEchtKobqvX vXMW9MLVnc/BStBF8rltJv8KFIFpZWUfwqqwGr1Eu4edkfBS5QfjLfM7hrqt6WhrTN1blo TLiuI3OogBahFsNAk1+MtEAMC0mR2YUBAY0pAE0ZSjesdJtSKmDiKQuDqIKc64p2Y9cmDn eZ7rmBjIE381sGZEZyL7UdTUHPVI0pZNaYiZy2V5OTJAuWoga+q6AAWCnwRdeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678847982; a=rsa-sha256; cv=none; b=V1fK2mhe/h+WdwCr614BS0NoJYmh8rPrWSs596Qw3W80UIQ+zqQSUfzOexh9gh3C9mzVdN BuKtCWX+hKz3tNeYpxtl+JrqBBGWsdF2yu+rq6RSmuugefsTIuNFnSh5NAXXaW/lZFgIjs qGvA2Obdy+1R2FHzeqX2hrQKCjaVHc7AGBAK646rnIDoSrSCVqXLFs4S6tBECnjBW4qcV6 rt33qaMAYYZ+833VkV+uXwJbvy9a37TEa4BTiAsU+3+ZPh0UsMwOv7E9CvjbS6hKH5LLgt ps0D+1EGISBC9padChQ9361yMEesrOiLDRG3aF/8XULKElJPgqfENv5oTnDldg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pbvk621r0z10cq; Wed, 15 Mar 2023 02:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32F2dgdn060125; Wed, 15 Mar 2023 02:39:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32F2dgU8060124; Wed, 15 Mar 2023 02:39:42 GMT (envelope-from git) Date: Wed, 15 Mar 2023 02:39:42 GMT Message-Id: <202303150239.32F2dgU8060124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1308a17bad88 - main - bhyve: Remove trailing semicolon List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1308a17bad883c4ec2242b1d4e7ddb00d25f3e12 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1308a17bad883c4ec2242b1d4e7ddb00d25f3e12 commit 1308a17bad883c4ec2242b1d4e7ddb00d25f3e12 Author: Elyes Haouas AuthorDate: 2023-03-15 02:09:16 +0000 Commit: Warner Losh CommitDate: 2023-03-15 02:39:34 +0000 bhyve: Remove trailing semicolon Macros shouldn't use trailing semicolon. Signed-off-by: Elyes Haouas 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