From nobody Tue May 21 22:15:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1623961888602635.63938518468; Thu, 17 Jun 2021 13:31:28 -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-502-P-mWoiZXMjCA-kHZO2fEzA-1; Thu, 17 Jun 2021 16:31:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AD1848186F5; Thu, 17 Jun 2021 20:31:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71C785D6DC; Thu, 17 Jun 2021 20:31:15 +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 B200E1809CBC; Thu, 17 Jun 2021 20:31:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15HKUsuo016555 for ; Thu, 17 Jun 2021 16:30:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5D652062C09; Thu, 17 Jun 2021 20:30:54 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C03382079779 for ; Thu, 17 Jun 2021 20:30:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 769A390DE26 for ; Thu, 17 Jun 2021 20:30:51 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-170-ks7KbAf_NXi1uwzurZoM8w-1; Thu, 17 Jun 2021 16:30:41 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2057.outbound.protection.outlook.com [104.47.1.57]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-16-cyiz_f2xMAqoZGH__uYvUw-1; Thu, 17 Jun 2021 22:30:38 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM0PR04MB4228.eurprd04.prod.outlook.com (2603:10a6:208:66::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Thu, 17 Jun 2021 20:30:37 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::d8b:c94:eae2:7b22]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::d8b:c94:eae2:7b22%6]) with mapi id 15.20.4242.021; Thu, 17 Jun 2021 20:30:37 +0000 Received: from localhost (192.150.153.194) by FR0P281CA0010.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.7 via Frontend Transport; Thu, 17 Jun 2021 20:30:36 +0000 X-MC-Unique: P-mWoiZXMjCA-kHZO2fEzA-1 X-MC-Unique: ks7KbAf_NXi1uwzurZoM8w-1 X-MC-Unique: cyiz_f2xMAqoZGH__uYvUw-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 1/2] Xen: Remove unneeded LIBXL_HAVE_* ifdefs Date: Thu, 17 Jun 2021 14:30:28 -0600 Message-ID: <20210617203029.8893-2-jfehlig@suse.com> In-Reply-To: <20210617203029.8893-1-jfehlig@suse.com> References: <20210617203029.8893-1-jfehlig@suse.com> X-Originating-IP: [192.150.153.194] X-ClientProxiedBy: FR0P281CA0010.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::15) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a7cfeb38-dbe1-48e4-2ff2-08d931cec3d4 X-MS-TrafficTypeDiagnostic: AM0PR04MB4228: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: y2+A7DrZOmloTOUfFaxoF6180R14UI1VEJ9dVps9PLhfTteWqo22TDVB3RCGf27a3a0ztDh+t5CDAMyR6BXKgqXKHZLuFQLZdgD0YlDqcKPPbBE9Nt1xXc39O1Yzl8tJkDtS/eTARYfiB+bL1Y2rhs9GLGmjGwZ5tEU342WnaZjf2wJ2cAv4BOLaLYZdJ8Xw9A5xjXajAo35qKF0eK9RXo1PwKxcp7bfEgpUgRIPF0JaAX7Z+t+kKQ8dB3lO71pagWUTEUnl1MCyXpoxLDU6fMEjpLUHzVmVowKDDTD/YePx9OdGAksL5S2Ispe44EWa4ZL23I1Jpt6hS+D6DVSeQ99oWNagTK+sMBOwgcCpDpK1Gc8vkDhRa8bVv40nn5axjaz+dt+NfgMjazOW905RmbGFxqFam5UHELIe/7V8L7Zq3a4VZes8oczpE9wev1gpYaDz2SjkFzuVBIwydrA4wfmPS7XPjJntzqtK4fT72lKBigRV0bjb5oZGs6w0TbihOBaGM8spwFPKaGpfQYXzCABtPfSRWFgclJVhhyYfeMsUmBMKe72CWu0+UPXRe8ZAXqmqx5wUEXWMX99F1nqpABlRuc1fkl+8njcv4fgbEek= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(39850400004)(366004)(346002)(376002)(396003)(2906002)(186003)(2616005)(4326008)(478600001)(38100700002)(956004)(16526019)(316002)(1076003)(83380400001)(8676002)(30864003)(6486002)(66476007)(6916009)(8936002)(66946007)(6666004)(86362001)(36756003)(66556008)(26005)(5660300002)(6496006); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z1FiZJtzOBzKp4oOllvDm8sJeqkuNt6VrUdkTZoAbKkPt/ilRCmRa95JDsOB?= =?us-ascii?Q?O/vaxUp4oMkj84xaV7/z9WkRiZ8aXY5tHo9OOU2WRaZKKC3heujtvzIxfzLr?= =?us-ascii?Q?/eTTw5pe53MGskdI23PyoCmOs0mV5f4akm1EP7B6TqmRH8MvtWIEJ+vZqHPp?= =?us-ascii?Q?GmqbdE0enzIp8Q2p4tbtGD42Zrth9sJdFMyOCPi3C/LCuV432ZW4JGlg5QUN?= =?us-ascii?Q?p8hYSoXo9Vt6q9hLFeftysxfx2xZJ5Kn7SnKho6Adttd2dUrQC5XNQSWkF6I?= =?us-ascii?Q?/uh6ky1xixskM0xBXGCDWhivpKYlrYPwUNlkoWhIoYbCTKQQNwYB0m6PAepr?= =?us-ascii?Q?ezqWpC3Zk/PKxInix1gSWuaBfRA+OqaV64veSm74TJ+k/+qjKWJJI62pexM/?= =?us-ascii?Q?eaPnHZiYqU3Y3HHlwLn/ECzV0R1rLkHLqlKU/K9Ee9LX3iZGwDkQTKCfpsgW?= =?us-ascii?Q?oKIQZaVpFPLem1ZhL9C75lDpcLJvJs9+7EuJwU8ttAYJxkGROwfqhWthTtI2?= =?us-ascii?Q?hu/MGUuQA0DeZyd14mTCbz4UkZtVU4HZGjVhXSVJtINcpR5BH7VuvNUlCAXF?= =?us-ascii?Q?recU88/+qe8D/MdRukcUbSRAktvNuB0RtMSZgwO8pm3qMIMb6wSpBP1h559q?= =?us-ascii?Q?q86oLeT4nl4PzWSDv+OiGx0dhTldEYmJ+Hg+y5BJRLID1q9z2fWgLv82WWeO?= =?us-ascii?Q?UnkylsZKSN7oNP2DQ8mGh+CNoKfFiCHwwcOZsZoUj+c+g0cp+H8p7opo7tOo?= =?us-ascii?Q?Ji62P1WIL+xoPjLvTyWiVNMBclRy7JzVmh0voBYSj+ruFwQWh3OytFD6CCum?= =?us-ascii?Q?9oc7fBtta6usWBt4LZKHAOlgXDIE+9snOGd/pDE31vGiXNFKc6RovB+WW0XX?= =?us-ascii?Q?V4TEC6Z2qjQvK5E9l+vGr0kw0b5XWSOgfW1/wpnQJcTo5sSYigU9CTTfOsYl?= =?us-ascii?Q?oSh4EhjndpmQQFI9vVPx5t8rOrvwDE0i9cIxlDQgTbmjlFOSeJCOMh0RyKIv?= =?us-ascii?Q?xaJuc25AF4ZlYhxE1gR/MuD4JAobE/BhrVzaOhju7XoXEiKigffSiAVPrGz9?= =?us-ascii?Q?zz7sUjyh7sGSBYGlAJwhv5i3Y5WfT+ApyVaByMDRvFeaPfjDlAY9qogGUvpm?= =?us-ascii?Q?3zzx+p0MRaEN1na/UdoZDqnR6oSDgHWk5f/KvqC1pKpw3Uykg+4TIrhY3ZG9?= =?us-ascii?Q?T4MllS5p5qGMYxFL0QVQBMNCul3xrMhr056ahurzSmOiHJDrHQFOG39xEWoi?= =?us-ascii?Q?AMzm/Q1qbdsDqtAJ2UcF0SCrnkdp7P5PW7YCc2sE6aAu6cAji2/lA2LB+p93?= =?us-ascii?Q?XSmHX3y8V/cIM0yxJsfmcpL4?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7cfeb38-dbe1-48e4-2ff2-08d931cec3d4 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 20:30:37.3807 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kzxT4iAaBAXvXYOLwGgki+siuIaUQvHFZHvtZ1gQczjs16xNQKv6IzA+SOZO3rQA3rdxgQSllWBb7vAyloNDqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4228 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15HKUsuo016555 X-loop: libvir-list@redhat.com Cc: olaf@aepfle.de 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.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that the minimum supported Xen version has bumped to 4.9, all uses of LIBXL_HAVE_* that are included in Xen 4.9 can be removed from the libxl driver. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/libxl_capabilities.c | 14 ++--------- src/libxl/libxl_capabilities.h | 2 -- src/libxl/libxl_conf.c | 45 ---------------------------------- src/libxl/libxl_domain.c | 20 +-------------- src/libxl/libxl_driver.c | 29 +--------------------- src/libxl/xen_xl.c | 24 ++---------------- tests/domaincapsmock.c | 11 --------- tests/libxlxml2domconfigtest.c | 6 ----- tests/xlconfigtest.c | 12 --------- 9 files changed, 6 insertions(+), 157 deletions(-) diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c index 7385ad0d38..b4bd1d7e62 100644 --- a/src/libxl/libxl_capabilities.c +++ b/src/libxl/libxl_capabilities.c @@ -646,15 +646,6 @@ libxlMakeDomainDeviceVideoCaps(virDomainCapsDeviceVide= o *dev) return 0; } =20 -bool libxlCapsHasPVUSB(void) -{ -#ifdef LIBXL_HAVE_PVUSB - return true; -#else - return false; -#endif -} - static int libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHostdev *dev) { @@ -678,9 +669,8 @@ libxlMakeDomainDeviceHostdevCaps(virDomainCapsDeviceHos= tdev *dev) VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI); =20 - if (libxlCapsHasPVUSB()) - VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, - VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); + VIR_DOMAIN_CAPS_ENUM_SET(dev->subsysType, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB); =20 /* No virDomainHostdevCapsType for libxl */ virDomainCapsEnumClear(&dev->capsType); diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index 4e0b55e321..fd2b72620b 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -39,8 +39,6 @@ * by libvirt for Xen, and cannot be used for a persistent network name. = */ #define LIBXL_GENERATED_PREFIX_XEN "vif" =20 -bool libxlCapsHasPVUSB(void) G_GNUC_NO_INLINE; - virCaps * libxlMakeCapabilities(libxl_ctx *ctx); =20 diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index aef93fae53..56cb9abd5d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -619,11 +619,9 @@ libxlMakeDomBuildInfo(virDomainDef *def, } b_info->u.hvm.boot =3D g_strdup(bootorder); =20 -#ifdef LIBXL_HAVE_BUILDINFO_KERNEL b_info->cmdline =3D g_strdup(def->os.cmdline); b_info->kernel =3D g_strdup(def->os.kernel); b_info->ramdisk =3D g_strdup(def->os.initrd); -#endif =20 /* * Currently libxl only allows specifying the type of BIOS. @@ -677,7 +675,6 @@ libxlMakeDomBuildInfo(virDomainDef *def, 0) return -1; } else { -#ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST b_info->u.hvm.serial_list =3D *g_new0(libxl_string_list, d= ef->nserials + 1); for (i =3D 0; i < def->nserials; i++) { if (libxlMakeChrdevStr(def->serials[i], @@ -688,12 +685,6 @@ libxlMakeDomBuildInfo(virDomainDef *def, } } b_info->u.hvm.serial_list[i] =3D NULL; -#else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", - _("Only one serial device is supported by l= ibxl")); - return -1; -#endif } } =20 @@ -714,22 +705,8 @@ libxlMakeDomBuildInfo(virDomainDef *def, if (def->inputs[i]->bus !=3D VIR_DOMAIN_INPUT_BUS_USB) continue; =20 -#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1); -#else - nusbdevice++; - if (nusbdevice > 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("libxenlight supports only one input device")); - return -1; - } -#endif - -#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST usbdevice =3D &b_info->u.hvm.usbdevice_list[nusbdevice - 1]; -#else - usbdevice =3D &b_info->u.hvm.usbdevice; -#endif switch (def->inputs[i]->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: VIR_FREE(*usbdevice); @@ -746,11 +723,9 @@ libxlMakeDomBuildInfo(virDomainDef *def, } } =20 -#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST /* NULL-terminate usbdevice_list */ if (nusbdevice > 0) VIR_EXPAND_N(b_info->u.hvm.usbdevice_list, nusbdevice, 1); -#endif } else if (pvh) { b_info->cmdline =3D g_strdup(def->os.cmdline); b_info->kernel =3D g_strdup(def->os.kernel); @@ -840,7 +815,6 @@ libxlMakeDomBuildInfo(virDomainDef *def, return 0; } =20 -#ifdef LIBXL_HAVE_VNUMA static int libxlMakeVnumaList(virDomainDef *def, libxl_ctx *ctx, @@ -948,7 +922,6 @@ libxlMakeVnumaList(virDomainDef *def, =20 return ret; } -#endif =20 static int libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) @@ -1136,12 +1109,10 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_devic= e_disk *x_disk) x_disk->format =3D LIBXL_DISK_FORMAT_RAW; x_disk->backend =3D LIBXL_DISK_BACKEND_TAP; break; -#ifdef LIBXL_HAVE_QED case VIR_STORAGE_FILE_QED: x_disk->format =3D LIBXL_DISK_FORMAT_QED; x_disk->backend =3D LIBXL_DISK_BACKEND_QDISK; break; -#endif default: virReportError(VIR_ERR_INTERNAL_ERROR, _("libxenlight does not support disk format= %s " @@ -1159,11 +1130,9 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device= _disk *x_disk) case VIR_STORAGE_FILE_QCOW2: x_disk->format =3D LIBXL_DISK_FORMAT_QCOW2; break; -#ifdef LIBXL_HAVE_QED case VIR_STORAGE_FILE_QED: x_disk->format =3D LIBXL_DISK_FORMAT_QED; break; -#endif case VIR_STORAGE_FILE_VHD: x_disk->format =3D LIBXL_DISK_FORMAT_VHD; break; @@ -1712,7 +1681,6 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphics= ports, break; } =20 -#ifdef LIBXL_HAVE_SPICE_VDAGENT if (l_vfb->data.spice.copypaste =3D=3D VIR_TRISTATE_BOOL_YES) { libxl_defbool_set(&b_info->u.hvm.spice.vdagent, true); libxl_defbool_set(&b_info->u.hvm.spice.clipboard_sharing, true= ); @@ -1720,7 +1688,6 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphics= ports, libxl_defbool_set(&b_info->u.hvm.spice.vdagent, false); libxl_defbool_set(&b_info->u.hvm.spice.clipboard_sharing, fals= e); } -#endif =20 return 0; } @@ -2000,7 +1967,6 @@ libxlDriverGetDom0MaxmemConf(libxlDriverConfig *cfg, } =20 =20 -#ifdef LIBXL_HAVE_DEVICE_CHANNEL static int libxlPrepareChannel(virDomainChrDef *channel, const char *channelDir, @@ -2096,9 +2062,7 @@ libxlMakeChannelList(const char *channelDir, VIR_FREE(x_channels); return -1; } -#endif =20 -#ifdef LIBXL_HAVE_PVUSB int libxlMakeUSBController(virDomainControllerDef *controller, libxl_device_usbctrl *usbctrl) @@ -2315,7 +2279,6 @@ libxlMakeUSBList(virDomainDef *def, libxl_domain_conf= ig *d_config) VIR_FREE(x_usbdevs); return -1; } -#endif =20 int libxlMakePCI(virDomainHostdevDef *hostdev, libxl_device_pci *pcidev) @@ -2429,7 +2392,6 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config= *d_config) } break; =20 -#ifdef LIBXL_HAVE_QXL case VIR_DOMAIN_VIDEO_TYPE_QXL: b_info->u.hvm.vga.kind =3D LIBXL_VGA_INTERFACE_TYPE_QXL; if (def->videos[0]->vram < 128 * 1024) { @@ -2438,7 +2400,6 @@ libxlMakeVideo(virDomainDef *def, libxl_domain_config= *d_config) return -1; } break; -#endif =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -2509,10 +2470,8 @@ libxlBuildDomainConfig(virPortAllocatorRange *graphi= csports, if (libxlMakeDomBuildInfo(def, cfg, caps, d_config) < 0) return -1; =20 -#ifdef LIBXL_HAVE_VNUMA if (libxlMakeVnumaList(def, ctx, d_config) < 0) return -1; -#endif =20 if (libxlMakeDiskList(def, d_config) < 0) return -1; @@ -2529,18 +2488,14 @@ libxlBuildDomainConfig(virPortAllocatorRange *graph= icsports, if (libxlMakePCIList(def, d_config) < 0) return -1; =20 -#ifdef LIBXL_HAVE_PVUSB if (libxlMakeUSBControllerList(def, d_config) < 0) return -1; =20 if (libxlMakeUSBList(def, d_config) < 0) return -1; -#endif =20 -#ifdef LIBXL_HAVE_DEVICE_CHANNEL if (libxlMakeChannelList(cfg->channelDir, def, d_config) < 0) return -1; -#endif =20 /* * Now that any potential VFBs are defined, update the build info with diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 59d26d5e2b..af20434843 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -597,7 +597,6 @@ libxlDomainShutdownThread(void *opaque) case VIR_DOMAIN_LIFECYCLE_ACTION_LAST: goto endjob; } -#ifdef LIBXL_HAVE_SOFT_RESET } else if (xl_reason =3D=3D LIBXL_SHUTDOWN_REASON_SOFT_RESET) { libxlDomainObjPrivate *priv =3D vm->privateData; =20 @@ -624,7 +623,6 @@ libxlDomainShutdownThread(void *opaque) } libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->death= W); libxlDomainUnpauseWrapper(cfg->ctx, vm->def->id); -#endif } else { VIR_INFO("Unhandled shutdown_reason %d", xl_reason); } @@ -878,9 +876,7 @@ libxlDomainCleanup(libxlDriverPrivate *driver, VIR_DEBUG("Cleaning up domain with id '%d' and name '%s'", vm->def->id, vm->def->name); =20 -#ifdef LIBXL_HAVE_PVUSB hostdev_flags |=3D VIR_HOSTDEV_SP_USB; -#endif =20 /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LIBXL)) { @@ -1188,7 +1184,6 @@ libxlDomainUpdateDiskParams(virDomainDef *def, libxl_= ctx *ctx) VIR_FREE(disks); } =20 -#ifdef LIBXL_HAVE_DEVICE_CHANNEL static void libxlDomainCreateChannelPTY(virDomainDef *def, libxl_ctx *ctx) { @@ -1222,13 +1217,6 @@ libxlDomainCreateChannelPTY(virDomainDef *def, libxl= _ctx *ctx) for (i =3D 0; i < nchannels; i++) libxl_device_channel_dispose(&x_channels[i]); } -#endif - -#ifdef LIBXL_HAVE_SRM_V2 -# define LIBXL_DOMSTART_RESTORE_VER_ATTR /* empty */ -#else -# define LIBXL_DOMSTART_RESTORE_VER_ATTR G_GNUC_UNUSED -#endif =20 /* * Start a domain through libxenlight. @@ -1240,7 +1228,7 @@ libxlDomainStart(libxlDriverPrivate *driver, virDomainObj *vm, bool start_paused, int restore_fd, - uint32_t restore_ver LIBXL_DOMSTART_RESTORE_VER_ATTR) + uint32_t restore_ver) { libxl_domain_config d_config; virDomainDef *def =3D NULL; @@ -1259,9 +1247,7 @@ libxlDomainStart(libxlDriverPrivate *driver, unsigned int hostdev_flags =3D VIR_HOSTDEV_SP_PCI; g_autofree char *config_json =3D NULL; =20 -#ifdef LIBXL_HAVE_PVUSB hostdev_flags |=3D VIR_HOSTDEV_SP_USB; -#endif =20 libxl_domain_config_init(&d_config); =20 @@ -1385,9 +1371,7 @@ libxlDomainStart(libxlDriverPrivate *driver, &domid, NULL, &aop_console_how); } else { libxl_domain_restore_params_init(¶ms); -#ifdef LIBXL_HAVE_SRM_V2 params.stream_version =3D restore_ver; -#endif ret =3D libxlDomainCreateRestoreWrapper(cfg->ctx, &d_config, &domi= d, restore_fd, ¶ms, &aop_console_how); @@ -1431,10 +1415,8 @@ libxlDomainStart(libxlDriverPrivate *driver, libxlDomainCreateIfaceNames(vm->def, &d_config); libxlDomainUpdateDiskParams(vm->def, cfg->ctx); =20 -#ifdef LIBXL_HAVE_DEVICE_CHANNEL if (vm->def->nchannels > 0) libxlDomainCreateChannelPTY(vm->def, cfg->ctx); -#endif =20 if ((dom_xml =3D virDomainDefFormat(vm->def, driver->xmlopt, 0)) =3D= =3D NULL) goto destroy_dom; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 6a4378b2f2..c97b2fb485 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -394,9 +394,7 @@ libxlReconnectDomain(virDomainObj *vm, unsigned int hostdev_flags =3D VIR_HOSTDEV_SP_PCI; int ret =3D -1; =20 -#ifdef LIBXL_HAVE_PVUSB hostdev_flags |=3D VIR_HOSTDEV_SP_USB; -#endif =20 virObjectRef(vm); virObjectLock(vm); @@ -567,11 +565,7 @@ static const libxl_osevent_hooks libxl_osevent_callbac= ks =3D { }; =20 static const libxl_childproc_hooks libxl_child_hooks =3D { -#ifdef LIBXL_HAVE_SIGCHLD_OWNER_SELECTIVE_REAP .chldowner =3D libxl_sigchld_owner_libxl_always_selective_reap, -#else - .chldowner =3D libxl_sigchld_owner_libxl, -#endif }; =20 const struct libxl_event_hooks ev_hooks =3D { @@ -3144,7 +3138,6 @@ libxlDomainAttachHostPCIDevice(libxlDriverPrivate *dr= iver, return ret; } =20 -#ifdef LIBXL_HAVE_PVUSB static int libxlDomainAttachControllerDevice(libxlDriverPrivate *driver, virDomainObj *vm, @@ -3276,7 +3269,6 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivate *dr= iver, libxl_device_usbdev_dispose(&usbdev); return ret; } -#endif =20 static int libxlDomainAttachHostDevice(libxlDriverPrivate *driver, @@ -3296,12 +3288,10 @@ libxlDomainAttachHostDevice(libxlDriverPrivate *dri= ver, return -1; break; =20 -#ifdef LIBXL_HAVE_PVUSB case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: if (libxlDomainAttachHostUSBDevice(driver, vm, hostdev) < 0) return -1; break; -#endif =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -3482,13 +3472,11 @@ libxlDomainAttachDeviceLive(libxlDriverPrivate *dri= ver, dev->data.disk =3D NULL; break; =20 -#ifdef LIBXL_HAVE_PVUSB case VIR_DOMAIN_DEVICE_CONTROLLER: ret =3D libxlDomainAttachControllerDevice(driver, vm, dev->dat= a.controller); if (!ret) dev->data.controller =3D NULL; break; -#endif =20 case VIR_DOMAIN_DEVICE_NET: ret =3D libxlDomainAttachNetDevice(driver, vm, @@ -3569,9 +3557,7 @@ libxlDomainAttachDeviceConfig(virDomainDef *vmdef, vi= rDomainDeviceDef *dev) =20 switch (hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: -#ifndef LIBXL_HAVE_PVUSB case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: -#endif case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: return -1; } @@ -3689,7 +3675,6 @@ libxlDomainDetachHostPCIDevice(libxlDriverPrivate *dr= iver, return ret; } =20 -#ifdef LIBXL_HAVE_PVUSB static int libxlDomainDetachControllerDevice(libxlDriverPrivate *driver, virDomainObj *vm, @@ -3808,7 +3793,6 @@ libxlDomainDetachHostUSBDevice(libxlDriverPrivate *dr= iver, libxl_device_usbdev_dispose(&usbdev); return ret; } -#endif =20 static int libxlDomainDetachHostDevice(libxlDriverPrivate *driver, @@ -3828,10 +3812,8 @@ libxlDomainDetachHostDevice(libxlDriverPrivate *driv= er, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: return libxlDomainDetachHostPCIDevice(driver, vm, hostdev); =20 -#ifdef LIBXL_HAVE_PVUSB case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: return libxlDomainDetachHostUSBDevice(driver, vm, hostdev); -#endif =20 default: virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3914,11 +3896,9 @@ libxlDomainDetachDeviceLive(libxlDriverPrivate *driv= er, ret =3D libxlDomainDetachDeviceDiskLive(vm, dev); break; =20 -#ifdef LIBXL_HAVE_PVUSB case VIR_DOMAIN_DEVICE_CONTROLLER: ret =3D libxlDomainDetachControllerDevice(driver, vm, dev); break; -#endif =20 case VIR_DOMAIN_DEVICE_NET: ret =3D libxlDomainDetachNetDevice(driver, vm, @@ -4856,12 +4836,8 @@ libxlDomainSetSchedulerParameters(virDomainPtr dom, = virTypedParameterPtr params, return libxlDomainSetSchedulerParametersFlags(dom, params, nparams, 0); } =20 -/* NUMA node affinity information is available through libxl - * starting from Xen 4.3. */ -#ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY - /* Number of Xen NUMA parameters */ -# define LIBXL_NUMA_NPARAM 2 +#define LIBXL_NUMA_NPARAM 2 =20 static int libxlDomainGetNumaParameters(virDomainPtr dom, @@ -4978,7 +4954,6 @@ libxlDomainGetNumaParameters(virDomainPtr dom, virObjectUnref(cfg); return ret; } -#endif =20 static int libxlDomainIsActive(virDomainPtr dom) @@ -6535,9 +6510,7 @@ static virHypervisorDriver libxlHypervisorDriver =3D { .domainGetSchedulerParametersFlags =3D libxlDomainGetSchedulerParamete= rsFlags, /* 0.9.2 */ .domainSetSchedulerParameters =3D libxlDomainSetSchedulerParameters, /= * 0.9.0 */ .domainSetSchedulerParametersFlags =3D libxlDomainSetSchedulerParamete= rsFlags, /* 0.9.2 */ -#ifdef LIBXL_HAVE_DOMAIN_NODEAFFINITY .domainGetNumaParameters =3D libxlDomainGetNumaParameters, /* 1.1.1 */ -#endif .nodeGetFreeMemory =3D libxlNodeGetFreeMemory, /* 0.9.0 */ .nodeGetCellsFreeMemory =3D libxlNodeGetCellsFreeMemory, /* 1.1.1 */ .domainGetJobInfo =3D libxlDomainGetJobInfo, /* 1.3.1 */ diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 8fa91ce66a..c0905b08d8 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -128,7 +128,6 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps = *caps) if (xenConfigCopyStringOpt(conf, "acpi_firmware", &def->os.slic_ta= ble) < 0) return -1; =20 -#ifdef LIBXL_HAVE_BUILDINFO_KERNEL if (xenConfigCopyStringOpt(conf, "kernel", &def->os.kernel) < 0) return -1; =20 @@ -137,7 +136,6 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps = *caps) =20 if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; -#endif =20 if (xenConfigGetString(conf, "boot", &boot, "c") < 0) return -1; @@ -402,7 +400,6 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) return -1; } =20 -#ifdef LIBXL_HAVE_VNUMA static int xenParseXLVnuma(virConf *conf, virDomainDef *def) @@ -591,7 +588,6 @@ xenParseXLVnuma(virConf *conf, =20 return ret; } -#endif =20 static int xenParseXLXenbusLimits(virConf *conf, virDomainDef *def) @@ -756,11 +752,9 @@ xenParseXLDisk(virConf *conf, virDomainDef *def) case LIBXL_DISK_FORMAT_EMPTY: break; =20 -#ifdef LIBXL_HAVE_QED case LIBXL_DISK_FORMAT_QED: disk->src->format =3D VIR_STORAGE_FILE_QED; break; -#endif =20 default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -833,15 +827,9 @@ xenParseXLInputDevs(virConf *conf, virDomainDef *def) if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) { val =3D virConfGetValue(conf, "usbdevice"); /* usbdevice can be defined as either a single string or a list */ - if (val && val->type =3D=3D VIR_CONF_LIST) { -#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST + if (val && val->type =3D=3D VIR_CONF_LIST) val =3D val->list; -#else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("multiple USB devices not supported")); - return -1; -#endif - } + /* otherwise val->next is NULL, so can be handled by the same code= */ while (val) { if (val->type !=3D VIR_CONF_STRING) { @@ -1162,10 +1150,8 @@ xenParseXL(virConf *conf, if (xenParseXLOS(conf, def, caps) < 0) goto cleanup; =20 -#ifdef LIBXL_HAVE_VNUMA if (xenParseXLVnuma(conf, def) < 0) goto cleanup; -#endif =20 if (xenParseXLXenbusLimits(conf, def) < 0) goto cleanup; @@ -1224,7 +1210,6 @@ xenFormatXLOS(virConf *conf, virDomainDef *def) xenConfigSetString(conf, "acpi_firmware", def->os.slic_table) = < 0) return -1; =20 -#ifdef LIBXL_HAVE_BUILDINFO_KERNEL if (def->os.kernel && xenConfigSetString(conf, "kernel", def->os.kernel) < 0) return -1; @@ -1236,7 +1221,6 @@ xenFormatXLOS(virConf *conf, virDomainDef *def) if (def->os.cmdline && xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0) return -1; -#endif =20 for (i =3D 0; i < def->os.nBootDevs; i++) { switch (def->os.bootDevs[i]) { @@ -1390,7 +1374,6 @@ xenFormatXLCPUID(virConf *conf, virDomainDef *def) return ret; } =20 -#ifdef LIBXL_HAVE_VNUMA static int xenFormatXLVnode(virConfValue *list, virBuffer *buf) @@ -1511,7 +1494,6 @@ xenFormatXLDomainVnuma(virConf *conf, virConfFreeValue(vnumaVal); return -1; } -#endif =20 static int xenFormatXLXenbusLimits(virConf *conf, virDomainDef *def) @@ -2196,10 +2178,8 @@ xenFormatXL(virDomainDef *def, virConnectPtr conn) if (xenFormatXLCPUID(conf, def) < 0) return NULL; =20 -#ifdef LIBXL_HAVE_VNUMA if (xenFormatXLDomainVnuma(conf, def) < 0) return NULL; -#endif =20 if (xenFormatXLXenbusLimits(conf, def) < 0) return NULL; diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c index d81a898dc0..b03f75199b 100644 --- a/tests/domaincapsmock.c +++ b/tests/domaincapsmock.c @@ -17,17 +17,6 @@ #include =20 #include "virhostcpu.h" -#ifdef WITH_LIBXL -# include "libxl/libxl_capabilities.h" -#endif - -#ifdef WITH_LIBXL -bool -libxlCapsHasPVUSB(void) -{ - return true; -} -#endif =20 int virHostCPUGetKVMMaxVCPUs(void) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 484c2121cb..19385c6fb5 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -105,13 +105,7 @@ testCompareXMLToDomConfig(const char *xmlfile, */ # ifndef LIBXL_HAVE_BUILDINFO_APIC if (expectconfig.c_info.type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { -# ifdef LIBXL_HAVE_MEMKB_64BITS - /* - * This part of the libxl API was changed without a guard in Xen 4= .8. - * Reuse another Xen 4.8 specific conditional. - */ libxl_defbool_unset(&expectconfig.b_info.acpi); -# endif libxl_defbool_set(&expectconfig.b_info.u.hvm.apic, true); libxl_defbool_set(&expectconfig.b_info.u.hvm.acpi, true); } diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 7c6931000a..e5c4a053bc 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -244,9 +244,7 @@ mymain(void) DO_TEST("new-disk"); DO_TEST_FORMAT("disk-positional-parms-full", false); DO_TEST_FORMAT("disk-positional-parms-partial", false); -#ifdef LIBXL_HAVE_QED DO_TEST_FORMAT("disk-qed", false); -#endif DO_TEST("net-fakemodel"); DO_TEST("spice"); DO_TEST("spice-features"); @@ -260,12 +258,10 @@ mymain(void) DO_TEST("fullvirt-cpuid"); DO_TEST("fullvirt-acpi-slic"); DO_TEST("fullvirt-pci"); -#ifdef LIBXL_HAVE_VNUMA DO_TEST("fullvirt-vnuma"); DO_TEST_PARSE("fullvirt-vnuma-autocomplete", false); DO_TEST_PARSE("fullvirt-vnuma-nodistances", false); DO_TEST_PARSE("fullvirt-vnuma-partialdist", false); -#endif =20 DO_TEST("paravirt-cmdline"); DO_TEST_FORMAT("paravirt-cmdline-extra-root", false); @@ -275,21 +271,13 @@ mymain(void) DO_TEST_FORMAT("fullvirt-type", false); DO_TEST("pvh-type"); =20 -#ifdef LIBXL_HAVE_DEVICE_CHANNEL DO_TEST("channel-pty"); DO_TEST("channel-unix"); -#endif -#ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST DO_TEST("fullvirt-multiserial"); -#endif -#ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST DO_TEST("fullvirt-multiusb"); -#endif -#ifdef LIBXL_HAVE_BUILDINFO_KERNEL DO_TEST("fullvirt-direct-kernel-boot"); DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra", false); DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra", false); -#endif #ifdef LIBXL_HAVE_BUILDINFO_GRANT_LIMITS DO_TEST("max-gntframes"); #endif --=20 2.31.1 From nobody Tue May 21 22:15:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623961913769226.80172907547944; Thu, 17 Jun 2021 13:31:53 -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-563-qz28JWZPN9ik2AeaL32QDw-1; Thu, 17 Jun 2021 16:31:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE0C4C73A2; Thu, 17 Jun 2021 20:31:09 +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 030ED1F6; Thu, 17 Jun 2021 20:31:09 +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 371BB4ED7A; Thu, 17 Jun 2021 20:31:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15HKUmOv016537 for ; Thu, 17 Jun 2021 16:30:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4E5AC117DB11; Thu, 17 Jun 2021 20:30:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48B36117DB0F for ; Thu, 17 Jun 2021 20:30:48 +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-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32598811E9C for ; Thu, 17 Jun 2021 20:30:48 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-444-HBB8pB4KM8CD2vMN26X94Q-1; Thu, 17 Jun 2021 16:30:44 -0400 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp2054.outbound.protection.outlook.com [104.47.1.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-26-0z_kyrViMXinfXx3gOXWXA-1; Thu, 17 Jun 2021 22:30:42 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM0PR04MB4228.eurprd04.prod.outlook.com (2603:10a6:208:66::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Thu, 17 Jun 2021 20:30:41 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::d8b:c94:eae2:7b22]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::d8b:c94:eae2:7b22%6]) with mapi id 15.20.4242.021; Thu, 17 Jun 2021 20:30:41 +0000 Received: from localhost (192.150.153.194) by FR0P281CA0017.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.7 via Frontend Transport; Thu, 17 Jun 2021 20:30:40 +0000 X-MC-Unique: qz28JWZPN9ik2AeaL32QDw-1 X-MC-Unique: HBB8pB4KM8CD2vMN26X94Q-1 X-MC-Unique: 0z_kyrViMXinfXx3gOXWXA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 2/2] News: Mention bump in minimum supported Xen version Date: Thu, 17 Jun 2021 14:30:29 -0600 Message-ID: <20210617203029.8893-3-jfehlig@suse.com> In-Reply-To: <20210617203029.8893-1-jfehlig@suse.com> References: <20210617203029.8893-1-jfehlig@suse.com> X-Originating-IP: [192.150.153.194] X-ClientProxiedBy: FR0P281CA0017.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:15::22) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6342795-afd0-4d8a-754c-08d931cec672 X-MS-TrafficTypeDiagnostic: AM0PR04MB4228: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: ZQF3xy60iZ2gR3H26fyp71tFIihS9oaICMNLYT23grBCNO/zRWN9FhGTpzd34avCy1AOCNF+y/UfqGNV+1NZZw8+q1gdwQ4s0DsPAdP686TXEEtFX84Ibw4BXbamww+EziVn9SHY61UtJPHJq7Pj8itjPpnBkrVUE21mYmq7UJACf+xYh1Y9Oem0lVETeG4fIRRJQLJjs7z7tximyfShzEjGIxZbOv+xq1bkQFn3nhjqtxjRFhwEp5ZjlAUHvah4FDpxB7nh+ifcNm/YwLpA+8b0WF6UZ/Ta61bUD5SAMX1BNC55b+Oum3FmhbG/6ga0SoEC0+RN7zSI9Y27u2QbYerI1BMMKXtK5s4VZSkgB5xVQFT9QJsYnvZZPAaj31sox1ffE72/8IvWeCiTkyL3UUxtHQs7H9TO0XWPMLz5TKOCYOm31vOc8shdkSbBBnnAIfxRP1sTCQuxX4H/2uq+V+Thh9msr3KjZ54xHnylMmqwF4RyOxJ7cVFHKkd5UQF0GzTsxF0rya4FubcrP30sElwVk0l3OPDSKHxmt7poi+uemXWIy9X46waB84alnnNANrAkkJvC1872TJYY8aFhb4j0vOGji+DUVCsorRorSNs= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(39850400004)(366004)(346002)(376002)(396003)(2906002)(186003)(2616005)(4326008)(478600001)(38100700002)(956004)(16526019)(316002)(1076003)(8676002)(6486002)(4744005)(66476007)(6916009)(8936002)(66946007)(6666004)(86362001)(36756003)(66556008)(26005)(5660300002)(6496006); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3zst9JLdeNkpM88uYzULCDWuB30AgHcTlaFR+PzBBYjuCZRMJiQacXpYGTh1?= =?us-ascii?Q?cLtlH7zT+nrzl/7uIk9IgLziAC9ktKBN7qNhrAuoYIlcnRvnWHtI14OiZP+J?= =?us-ascii?Q?ZIwWfk/6WCSZsSWqF4qI2vtxrJJujooXSVgYhhJTQBMH1egSYT2jT3+6NmQI?= =?us-ascii?Q?WPEHQ+Z5pjEUrbdfQ6//lJ5Ou8W19MQYf96AqVU5ShrbflYKT62zv8jhvGAj?= =?us-ascii?Q?iwpTO7iKhBVDPMdxmf/oLMsQahCErSz/usZH27hS4J1O1ceOGt5Gw32fQdXd?= =?us-ascii?Q?TneoWu3MYqKbdVze+7+yRct9HL7uM/cSfLXjc5YSvm0dRpO52x01C8aU8VkR?= =?us-ascii?Q?2Ojt4k0bh2kXQPEmABa8kAgT3OUgWNzDqOcR2/oc1PMzaxavDjc8xICuWV+Z?= =?us-ascii?Q?T0YC35OmSP2zpgwF05wFm1sIlukQwWMszdKQY4PqYPDW00x08TrGH1CZuTwv?= =?us-ascii?Q?pvUTYwl9Ha6cIb+D0iAbO/NFT0oQ3HOntsCxARg+cX6UpNLzLgMxcGe+HdIT?= =?us-ascii?Q?+kDeH74E4DPsXkCvw9Z/01XU/r1YysjmX/Or+oX5lqQu7FzCfbVz1EHVD30R?= =?us-ascii?Q?zE/7vrNh+ow7em7zaZw2yTUqC0JUdYmiLZRgID9vgHs3Smy6urTuOUvzv/GA?= =?us-ascii?Q?7Y+wtT1pqS3LaRkQQX0nD9r1gKqtqAr0MEX/+1LVUvKmh0WA0SvO4kXnzRzc?= =?us-ascii?Q?StqmuHrSG80FdErvpkCE1SnfFaWYIszgz7tE0E6fI/GfhWfZ63A3qlZaGptY?= =?us-ascii?Q?4D+n+jWtk3an72vXqC42N6rifWi5UZ7+w3vPXdf74nh/SARjEJppCTqr1SdN?= =?us-ascii?Q?CMY5WkGYdkT4o+qE+LwuKKzQ5gsEFwn3ssqOwRcrQkK+ni4p6B1YSnviFKgJ?= =?us-ascii?Q?ty3BQ3KOTc92RL+60J7SAkMzc3CjLarvu2NznJx67iRQ1hJfsJvV/DFh9Nu+?= =?us-ascii?Q?ANvqr2v5KsxEs/fX1lVMrfwlQNcufQsrQz2OSfwc9rNwZ+4iPikdZVVQbvi8?= =?us-ascii?Q?Ka928VkrfmTodgkSX0Ou+wvu+JG0lP5djVimMwYywazEXgQ/PJeyHWjQpmj2?= =?us-ascii?Q?p4UkkZMfY3SCY1zAPNOpc3NZEIuUvcPpjf+C1l3+GGEvfJV8BntwFyDR3tv/?= =?us-ascii?Q?A4idVvnKO3lb8SBT/DhnZiC98QjSU5a1zwu0jPOuanl0+2qTZFS7xd2SJiln?= =?us-ascii?Q?1FYMalyteF1ZMe8rCsqLGBwvnuR8It+jkefem1j2gwZKybUmofWxte9UZSMb?= =?us-ascii?Q?bBm+d0kp47MCVrk3MCIMwirtg45nAnH4C34szaJp+KCdKNG3LU3gFXgTIr+H?= =?us-ascii?Q?Uo/XuneGOlGH35YiiQQ37e4T?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6342795-afd0-4d8a-754c-08d931cec672 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2021 20:30:41.2985 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tjW7TY4camYKep0WJyqf+g2/1LbTr+0KucOpBbFnZO7cnz7vX1nx0s3Qd4enFSy1sE+XRa14wVCX9LZAUu796w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4228 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15HKUmOv016537 X-loop: libvir-list@redhat.com Cc: olaf@aepfle.de 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.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- NEWS.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index ef1e123606..2c7180cb95 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -11,6 +11,13 @@ For a more fine-grained view, use the `git log`_. v7.5.0 (unreleased) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +* **Removed features** + + * xen: Remove support for Xen < 4.9 + + In accordance with our platform support policy, the oldest supported X= en + version is now bumped from 4.6 to 4.9. + * **New features** =20 * **Improvements** --=20 2.31.1