From patchwork Tue Nov 1 16:07:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 123101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 92600B6F7E for ; Wed, 2 Nov 2011 04:08:13 +1100 (EST) Received: from localhost ([::1]:39162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLGtM-0002e8-Qc for incoming@patchwork.ozlabs.org; Tue, 01 Nov 2011 12:08:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:54472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLGsl-0001HO-6D for qemu-devel@nongnu.org; Tue, 01 Nov 2011 12:08:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RLGsj-0004fq-BZ for qemu-devel@nongnu.org; Tue, 01 Nov 2011 12:08:11 -0400 Received: from smtp.citrix.com ([66.165.176.89]:28281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RLGsi-0004eo-Sz for qemu-devel@nongnu.org; Tue, 01 Nov 2011 12:08:09 -0400 X-IronPort-AV: E=Sophos;i="4.69,438,1315195200"; d="scan'208";a="18718750" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Nov 2011 12:08:08 -0400 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.137.0; Tue, 1 Nov 2011 12:08:08 -0400 Received: from perard.uk.xensource.com (dhcp-3-28.uk.xensource.com [10.80.3.28] (may be forged)) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id pA1G7YNO014577; Tue, 1 Nov 2011 09:08:06 -0700 From: Anthony PERARD To: QEMU-devel , Stefano Stabellini Date: Tue, 1 Nov 2011 16:07:24 +0000 Message-ID: <1320163646-24291-12-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1320163646-24291-1-git-send-email-anthony.perard@citrix.com> References: <1320163646-24291-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: Anthony PERARD , Xen Devel Subject: [Qemu-devel] [PATCH V3 11/13] libxl: Use QMP to insert a passthrough device when using upstream QEMU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also move the xenstore specif code to a new function and add a message if sscanf fail. Signed-off-by: Anthony PERARD --- tools/libxl/libxl_pci.c | 74 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 52 insertions(+), 22 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 33dd060..207ee33 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -599,11 +599,52 @@ static int pci_ins_check(libxl__gc *gc, uint32_t domid, const char *state, void return 1; } -static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting) +static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, + libxl_device_pci *pcidev) { libxl_ctx *ctx = libxl__gc_owner(gc); + int rc = 0; char *path; char *state, *vdevfn; + + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); + state = libxl__xs_read(gc, XBT_NULL, path); + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", + domid); + if (pcidev->vdevfn) { + libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->vdevfn); + } else { + libxl__xs_write(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); + } + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/command", + domid); + xs_write(ctx->xsh, XBT_NULL, path, "pci-ins", strlen("pci-ins")); + rc = libxl__wait_for_device_model(gc, domid, NULL, NULL, + pci_ins_check, state); + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", + domid); + vdevfn = libxl__xs_read(gc, XBT_NULL, path); + path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", + domid); + if ( rc < 0 ) + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "qemu refused to add device: %s", vdevfn); + else if ( sscanf(vdevfn, "0x%x", &pcidev->vdevfn) != 1 ) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "wrong format for the vdevfn: '%s'", vdevfn); + rc = -1; + } + xs_write(ctx->xsh, XBT_NULL, path, state, strlen(state)); + + return rc; +} + +static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting) +{ + libxl_ctx *ctx = libxl__gc_owner(gc); int rc, hvm = 0; switch (libxl__domain_type(gc, domid)) { @@ -613,27 +654,16 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i NULL, NULL, NULL) < 0) { return ERROR_FAIL; } - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); - state = libxl__xs_read(gc, XBT_NULL, path); - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); - if (pcidev->vdevfn) - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func, pcidev->vdevfn); - else - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/command", domid); - xs_write(ctx->xsh, XBT_NULL, path, "pci-ins", strlen("pci-ins")); - rc = libxl__wait_for_device_model(gc, domid, NULL, NULL, - pci_ins_check, state); - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/parameter", domid); - vdevfn = libxl__xs_read(gc, XBT_NULL, path); - path = libxl__sprintf(gc, "/local/domain/0/device-model/%d/state", domid); - if ( rc < 0 ) - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu refused to add device: %s", vdevfn); - else if ( sscanf(vdevfn, "0x%x", &pcidev->vdevfn) != 1 ) - rc = -1; - xs_write(ctx->xsh, XBT_NULL, path, state, strlen(state)); + switch (libxl__device_model_version_running(gc, domid)) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + rc = qemu_pci_add_xenstore(gc, domid, pcidev); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + rc = libxl__qmp_pci_add(gc, domid, pcidev); + break; + default: + return ERROR_INVAL; + } if ( rc ) return ERROR_FAIL; break;