From: Paul Durrant <paul@xen.org>
To: xen-devel@lists.xenproject.org
Cc: Paul Durrant <pdurrant@amazon.com>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [PATCH 06/25] libxl: remove extraneous arguments to do_pci_remove() in libxl_pci.c
Date: Fri, 23 Oct 2020 16:22:55 +0000 [thread overview]
Message-ID: <20201023162314.2235-7-paul@xen.org> (raw)
In-Reply-To: <20201023162314.2235-1-paul@xen.org>
From: Paul Durrant <pdurrant@amazon.com>
Both 'domid' and 'pci' are available in 'pci_remove_state' so there is no
need to also pass them as separate arguments.
Signed-off-by: Paul Durrant <pdurrant@amazon.com>
---
Cc: Ian Jackson <iwj@xenproject.org>
Cc: Wei Liu <wl@xen.org>
---
tools/libs/light/libxl_pci.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c
index 3936d60a14..97889fda49 100644
--- a/tools/libs/light/libxl_pci.c
+++ b/tools/libs/light/libxl_pci.c
@@ -1867,14 +1867,14 @@ static void pci_remove_stubdom_done(libxl__egc *egc,
static void pci_remove_done(libxl__egc *egc,
pci_remove_state *prs, int rc);
-static void do_pci_remove(libxl__egc *egc, uint32_t domid,
- libxl_device_pci *pci, int force,
- pci_remove_state *prs)
+static void do_pci_remove(libxl__egc *egc, pci_remove_state *prs)
{
STATE_AO_GC(prs->aodev->ao);
libxl_ctx *ctx = libxl__gc_owner(gc);
libxl_device_pci *assigned;
+ uint32_t domid = prs->domid;
libxl_domain_type type = libxl__domain_type(gc, domid);
+ libxl_device_pci *pci = prs->pci;
int rc, num;
assigned = libxl_device_pci_list(ctx, domid, &num);
@@ -2269,7 +2269,6 @@ static void device_pci_remove_common_next(libxl__egc *egc,
EGC_GC;
/* Convenience aliases */
- libxl_domid domid = prs->domid;
libxl_device_pci *const pci = prs->pci;
libxl__ao_device *const aodev = prs->aodev;
const unsigned int pfunc_mask = prs->pfunc_mask;
@@ -2287,7 +2286,7 @@ static void device_pci_remove_common_next(libxl__egc *egc,
} else {
pci->vdevfn = orig_vdev;
}
- do_pci_remove(egc, domid, pci, prs->force, prs);
+ do_pci_remove(egc, prs);
return;
}
}
--
2.11.0
next prev parent reply other threads:[~2020-10-23 16:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 16:22 [PATCH 00/25] xl / libxl: named PCI pass-through devices Paul Durrant
2020-10-23 16:22 ` [PATCH 01/25] xl / libxl: s/pcidev/pci and remove DEFINE_DEVICE_TYPE_STRUCT_X Paul Durrant
2020-10-23 16:22 ` [PATCH 02/25] libxl: use LIBXL_DEFINE_DEVICE_LIST for pci devices Paul Durrant
2020-10-23 16:22 ` [PATCH 03/25] libxl: use LIBXL_DEFINE_DEVICE_LIST for nic devices Paul Durrant
2020-10-23 16:22 ` [PATCH 04/25] libxl: s/domainid/domid/g in libxl_pci.c Paul Durrant
2020-10-23 16:22 ` [PATCH 05/25] libxl: s/detatched/detached " Paul Durrant
2020-10-23 16:22 ` Paul Durrant [this message]
2020-10-23 16:22 ` [PATCH 07/25] libxl: stop using aodev->device_config in libxl__device_pci_add() Paul Durrant
2020-10-23 16:22 ` [PATCH 08/25] libxl: generalise 'driver_path' xenstore access functions in libxl_pci.c Paul Durrant
2020-10-23 16:22 ` [PATCH 09/25] libxl: remove unnecessary check from libxl__device_pci_add() Paul Durrant
2020-10-23 16:22 ` [PATCH 10/25] libxl: remove get_all_assigned_devices() from libxl_pci.c Paul Durrant
2020-10-23 16:23 ` [PATCH 11/25] libxl: make sure callers of libxl_device_pci_list() free the list after use Paul Durrant
2020-10-23 16:23 ` [PATCH 12/25] libxl: add libxl_device_pci_assignable_list_free() Paul Durrant
2020-10-23 16:23 ` [PATCH 13/25] libxl: use COMPARE_PCI() macro is_pci_in_array() Paul Durrant
2020-10-23 16:23 ` [PATCH 14/25] libxl: add/recover 'rdm_policy' to/from PCI backend in xenstore Paul Durrant
2020-10-23 16:23 ` [PATCH 15/25] libxl: Make sure devices added by pci-attach are reflected in the config Paul Durrant
2020-10-23 16:23 ` [PATCH 16/25] docs/man: extract documentation of PCI_SPEC_STRING from the xl.cfg manpage Paul Durrant
2020-10-23 16:23 ` [PATCH 17/25] docs/man: improve documentation of PCI_SPEC_STRING Paul Durrant
2020-10-23 16:23 ` [PATCH 18/25] docs/man: fix xl(1) documentation for 'pci' operations Paul Durrant
2020-10-23 16:23 ` [PATCH 19/25] libxl: introduce 'libxl_pci_bdf' in the idl Paul Durrant
2020-10-23 16:23 ` [PATCH 20/25] libxlu: introduce xlu_pci_parse_spec_string() Paul Durrant
2020-10-23 16:23 ` [PATCH 21/25] libxl: modify libxl_device_pci_assignable_add/remove/list/list_free() Paul Durrant
2020-10-23 16:23 ` [PATCH 22/25] docs/man: modify xl(1) in preparation for naming of assignable devices Paul Durrant
2020-10-23 16:23 ` [PATCH 23/25] xl / libxl: support " Paul Durrant
2020-10-23 16:23 ` [PATCH 24/25] docs/man: modify xl-pci-configuration(5) to add 'name' field to PCI_SPEC_STRING Paul Durrant
2020-10-23 16:23 ` [PATCH 25/25] xl / libxl: support 'xl pci-attach/detach' by name Paul Durrant
2020-10-26 9:10 ` [PATCH 00/25] xl / libxl: named PCI pass-through devices Christian Lindig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201023162314.2235-7-paul@xen.org \
--to=paul@xen.org \
--cc=iwj@xenproject.org \
--cc=pdurrant@amazon.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.