From nobody Tue Nov 26 01:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588630252; cv=none; d=zohomail.com; s=zohoarc; b=NFEPAQWEwTkBMHNo9L1aTcEmV04y7BqlBjbuTA4aRjvqb7Gcq76awS/mwhY//FNCInjLYQyNhYdbsrlsKiUjZSIMwoI8m25xHwhboeKnQEjMBjECwNA/Ub4ZciqaW5qQ5QjZNM47bfKGeIxmVHyRiscOJpH4ts0lFJzhC7uxmdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588630252; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Zens3A6o9NbP9daceIxMloBRDfkdvy6RIdAPVUIe6Gs=; b=OCGsM4BK2BRzIoobL00zVnVEc4a7B0ybA6iVg2PBH71mM+2UyXEcmv8LRo3zqfCkXyw1JpagjAJvMfqWb9lsDdnObXl0X2JD7Ey0f8/DwGp8skNO7qeC4mEmniyXycAH2/nbM5XJ1VPVLnMPboSn4/RfwIeEv7duvueOW4EW+1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1588630252192822.3083221008957; Mon, 4 May 2020 15:10:52 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-5vuJp52lNRO2X1cG0hSH1A-1; Mon, 04 May 2020 18:10:45 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFDDA1895A2B; Mon, 4 May 2020 22:10:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BF117053A; Mon, 4 May 2020 22:10:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 505C84CA94; Mon, 4 May 2020 22:10:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 044MAMjc010278 for ; Mon, 4 May 2020 18:10:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 94E0BB0793; Mon, 4 May 2020 22:10:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BE75B17E6 for ; Mon, 4 May 2020 22:10:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BEE88007C8 for ; Mon, 4 May 2020 22:10:18 +0000 (UTC) Received: from m4a0072g.houston.softwaregrp.com (m4a0072g.houston.softwaregrp.com [15.124.2.130]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-AuawdrsqN3KZfUd63m7dWQ-1; Mon, 04 May 2020 18:10:16 -0400 Received: FROM m4a0072g.houston.softwaregrp.com (15.120.17.147) BY m4a0072g.houston.softwaregrp.com WITH ESMTP FOR libvir-list@redhat.com; Mon, 4 May 2020 22:09:12 +0000 Received: from M9W0068.microfocus.com (2002:f79:bf::f79:bf) by M4W0335.microfocus.com (2002:f78:1193::f78:1193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Mon, 4 May 2020 22:09:42 +0000 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (15.124.72.14) by M9W0068.microfocus.com (15.121.0.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10 via Frontend Transport; Mon, 4 May 2020 22:09:42 +0000 Received: from CY4PR1801MB2071.namprd18.prod.outlook.com (2603:10b6:910:79::35) by CY4PR1801MB2021.namprd18.prod.outlook.com (2603:10b6:910:7d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Mon, 4 May 2020 22:09:41 +0000 Received: from CY4PR1801MB2071.namprd18.prod.outlook.com ([fe80::ed4d:fafd:1763:cc9c]) by CY4PR1801MB2071.namprd18.prod.outlook.com ([fe80::ed4d:fafd:1763:cc9c%3]) with mapi id 15.20.2958.030; Mon, 4 May 2020 22:09:41 +0000 Received: from linux-tbji.provo.novell.com (75.169.7.53) by SN4PR0701CA0009.namprd07.prod.outlook.com (2603:10b6:803:28::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Mon, 4 May 2020 22:09:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588630250; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Zens3A6o9NbP9daceIxMloBRDfkdvy6RIdAPVUIe6Gs=; b=EKSiHKYPtkH2TRl3KJD3UK+NckwCDQzNokO9Nd1d1q4F4i97sCmLkAmm+5hsjZsxRKV6Et bHdk0Hkixgv+1BzLir665IPzdr/EzXXSa33dyd61G0Bx+rxIaihYbn10qBv78QXigyeSrE ct84nR9wfdDFex5xzHPsFWAx5netGWs= X-MC-Unique: 5vuJp52lNRO2X1cG0hSH1A-1 X-MC-Unique: AuawdrsqN3KZfUd63m7dWQ-1 From: Jim Fehlig To: Subject: [PATCH 1/3] libxl: Use the name 'Xen' in driver tables Date: Mon, 4 May 2020 16:09:17 -0600 Message-ID: <20200504220919.23636-2-jfehlig@suse.com> In-Reply-To: <20200504220919.23636-1-jfehlig@suse.com> References: <20200504220919.23636-1-jfehlig@suse.com> X-ClientProxiedBy: SN4PR0701CA0009.namprd07.prod.outlook.com (2603:10b6:803:28::19) To CY4PR1801MB2071.namprd18.prod.outlook.com (2603:10b6:910:79::35) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Originating-IP: [75.169.7.53] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4edae50a-eff1-4c73-2773-08d7f077d818 X-MS-TrafficTypeDiagnostic: CY4PR1801MB2021: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 03932714EB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WJ9xVmZMhGwJjKqlsQExRw14qM0twVMvQ7RyMadDOEuQz4t6/l6UlFMBPfJHh2ksyW/dFVfvY0kiGZlvXXmXcEojmmiMJzzAVZoW4Ryy74dITYARm6Yf2vPWpgyXV4XxW39+MJKVC+i5qma9r31L9LoJclijP7f10yYO8iOH+d7x8osPY2c8h+yxAsCAsAIP4yK191Y4fXLpGv32++Bk7lxak7ZhBYwL26tn41cyK154c6ciI4NxGEO7zKpOvAmI/Dy9AmW0xTOohcCWgg1/Mpw8yNgHDlpGuCz8lDVZ+1N1iyd+42YLY071iWJT/1uI4M1Z72+VlWMrMW/04HfMMiNuaf8q7aKflBw46zv/x9nraoTx8Lrt00qSdDEp7fmbrauvNcSc1JVnE4GvKSxtEkjiMn/FIw58Tp5KKkhxnA5tWCL65mwxYW+dBpi4vKbxJkwzmvgvGNSho4pfAan5tLDvCu4wcUoMLri6QyEIy/7VsbyCjcWWaB1oQKWeiQBLXvU1HmOxTsTCRXAj2WekbA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CY4PR1801MB2071.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(396003)(346002)(136003)(39860400002)(376002)(33430700001)(1076003)(2906002)(6486002)(6916009)(8676002)(52116002)(6512007)(478600001)(33440700001)(6506007)(66946007)(4326008)(66556008)(5660300002)(66476007)(316002)(16526019)(956004)(26005)(8936002)(2616005)(36756003)(186003)(6666004)(107886003)(86362001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 9IUqS1WkkxudbFUil49HLAe2MfuOMT/xPWTIMQ8T6aj2ZPS8lviIOwdYivoIGkWtLMQlg8pOhRSYl+EUgoKwGdgHJuuvl3dt5As5js+ccTc+mb6N+OQDM94lYnV7kuhx/HKZIRadMAeIVLngl4Dk7RhOghz+abxjtrks6Wh57HGBgof6XITJyE7gR1fm5U9ZUVv4FfrUJG0/mw3KysmeJS8JPsNc4u18R7/WKr1D8fcT2jikeZ0AAzyCC7BQPmZjN5tzxtNnLtW6WGVb+bg8RnwunbduJUVQnlcu9xaWKnjcc4uRzv18Kqa0pwykC3S4XRrk28/4OhGlIraA752muoB3jt8N5+hOQzNm9+VNo8kKkJdlFkFFmwimiQGRpOK1M1ZjqXExEofpWK4czzKda1Bug5NNjGkBSRqa2nXpG49z3YfvvhAVBtnz8YQDvG8m7CpcQyyDCtgNfP+WArfvNlig1piDIKz3ccKvjJlRcnGfzzzvoD5j7o1WBAgIuL/QZStqGhBHq1yxQ1fEVeCXHGiKRbiNGPBgU8L+Dny+FAPrfKArWHnaYrHn/mBeApeiOePgWfJaLGraprIfZZF2a6fWVdI7E8qaZExz6pMj9igABya5l62kbCTjJHWLRajChHQZT4e8ldry/FDoB9f8qLM0Liv00oDfuWc61+OVrMLKuH5k+jf3IX4bR9KPTYL6Dqz7DZfp99DbeVR5S4AyDWEFXwn8CJiPI3+aE+TmCAPlqTefKdt0T0BGBYRpANfSgqGdOiJqeLxRYTiJehA/W3hXKppnvOhfQDLqM3O7ofA= X-MS-Exchange-CrossTenant-Network-Message-Id: 4edae50a-eff1-4c73-2773-08d7f077d818 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2020 22:09:41.6428 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 856b813c-16e5-49a5-85ec-6f081e13b527 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: izG1rNTiTgLxFIVWON55buyFWJ9owxELKFdHJo3Z8SXnAv1bXtB4odF4OMo5jiKyTJOgV9En6qSC+L+6/31r1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1801MB2021 X-OriginatorOrg: suse.com X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 044MAMjc010278 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The libxl driver declares its name as 'Xen' through the public virConnectGetType() API. In the virHypervisorDriver table the name is set to 'xenlight'. To add more confusion, the name is set to 'LIBXL' in the virStateDriver. For consistency, use the same name in the driver tables as reported in the public virConnectGetType() API. Signed-off-by: Jim Fehlig --- src/libxl/libxl_conf.h | 1 + src/libxl/libxl_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 07b3373170..11a922b10a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -38,6 +38,7 @@ #include "libxl_capabilities.h" #include "libxl_logger.h" =20 +#define LIBXL_DRIVER_EXTERNAL_NAME "Xen" #define LIBXL_DRIVER_NAME "xenlight" #define LIBXL_VNC_PORT_MIN 5900 #define LIBXL_VNC_PORT_MAX 65535 diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 980984b199..ebeb91af3c 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -911,7 +911,7 @@ libxlConnectGetType(virConnectPtr conn) if (virConnectGetTypeEnsureACL(conn) < 0) return NULL; =20 - return "Xen"; + return LIBXL_DRIVER_EXTERNAL_NAME; } =20 static int @@ -6608,7 +6608,7 @@ libxlDomainGetMetadata(virDomainPtr dom, } =20 static virHypervisorDriver libxlHypervisorDriver =3D { - .name =3D LIBXL_DRIVER_NAME, + .name =3D LIBXL_DRIVER_EXTERNAL_NAME, .connectURIProbe =3D libxlConnectURIProbe, .connectOpen =3D libxlConnectOpen, /* 0.9.0 */ .connectClose =3D libxlConnectClose, /* 0.9.0 */ @@ -6732,7 +6732,7 @@ static virConnectDriver libxlConnectDriver =3D { }; =20 static virStateDriver libxlStateDriver =3D { - .name =3D "LIBXL", + .name =3D LIBXL_DRIVER_EXTERNAL_NAME, .stateInitialize =3D libxlStateInitialize, .stateCleanup =3D libxlStateCleanup, .stateReload =3D libxlStateReload, --=20 2.26.0