From patchwork Sun Nov 20 14:00:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kfir Manor X-Patchwork-Id: 1706825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20210112.gappssmtp.com header.i=@daynix-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=tELvGH2H; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFXT71YShz23lt for ; Mon, 21 Nov 2022 01:09:31 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owl0Z-0004Hi-M9; Sun, 20 Nov 2022 09:09:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owl0P-0004EY-LK for qemu-devel@nongnu.org; Sun, 20 Nov 2022 09:09:11 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owl0E-0005Hq-LG for qemu-devel@nongnu.org; Sun, 20 Nov 2022 09:08:59 -0500 Received: by mail-wr1-x42d.google.com with SMTP id d1so4188196wrs.12 for ; Sun, 20 Nov 2022 06:08:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YhAHnmrx+CQ/2ALBHE3+4B+wBTEvTWuybDYJSaad6Is=; b=tELvGH2HJ6DKs+lS9o6H6w8+DiH4i1HbWoyCz2K+MFkeLkGoqJwVj3+JxuFLCITzqp WcKyEy5Qy7noOtjtl0jzyJwCc3RC6M3miaV92YBG4A5xkfnQ2aLrS9HkupR5xiGZDRfk aiSUwrEER31IqoBh3pe19hhr47F5/0XsY6Eo2qYe+Uy7xq1uVnGjdusZxsOOR/Wx572j sZ8RQP4TWDopb+ifPcsw9ef4ZdYQA2KsG35m3YMCIKZPdkRxHJQkGXrZDuCRrXRWWx8c YBhoUgpc6JEkLpGBI/UElX9whEoV+uPqqRcLuORQ+C/W8VLkqYhciSJAei0FPHnftJO4 eFtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YhAHnmrx+CQ/2ALBHE3+4B+wBTEvTWuybDYJSaad6Is=; b=FEOXE7W6vzZHRt2rdm4SufMkpoKild6+Sjji2ph3mjx5a0L1VS2tEqJYt4P9BfD1ZB oFMdIVEWWReuZvmny+HZHh3BF3+vbEyzm52Ei/86PcBJEfn9jEqMCTk682qfamveHEj5 izVZB/hbddgcFR4LmtuLXL6wUwmK5MWBO22MmwdeaqvIGlpt8bnhbEXn+yEXbRot1Rvi Z+oO8RLx0jobHVypqnMCI6+2Tv/Ak59evvetZxqropdfxXw+vmiYALv94KyvCItNkReE LtFNNe3LLvSiqXmQrLVlIq1Y2OPfgV8UQN8/7efPnk1MqMPL45nxyoif1QAcHmvKuiy2 iE+g== X-Gm-Message-State: ANoB5pmxtULBzzOftopoSK7kXn4Fw/TdD5saVDIpG64/mqUVwHhJv9lN AMRxLgYGWnz4y74GEd2hSrHWCIMFtHyA1w== X-Google-Smtp-Source: AA0mqf5ySVMy2NiSjaGQ5f+gVecl2380WFfs/Bn32ukWisAla/HiTZSnvQnvjDPadm5XSMfENUy/sQ== X-Received: by 2002:adf:e88e:0:b0:22e:68a1:ddab with SMTP id d14-20020adfe88e000000b0022e68a1ddabmr8611027wrm.496.1668952853206; Sun, 20 Nov 2022 06:00:53 -0800 (PST) Received: from bark.. (bzq-84-110-34-91.static-ip.bezeqint.net. [84.110.34.91]) by smtp.gmail.com with ESMTPSA id d5-20020adffbc5000000b002417e7f0685sm10432310wrs.9.2022.11.20.06.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:00:52 -0800 (PST) From: Kfir Manor To: qemu-devel@nongnu.org, Konstantin Kostiuk , Michael Roth Cc: Yan Vugenfirer Subject: [PATCH 1/2] qga:/qga-win: adding a empty PCI address creation function Date: Sun, 20 Nov 2022 16:00:43 +0200 Message-Id: <20221120140044.752503-2-kfir@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221120140044.752503-1-kfir@daynix.com> References: <20221120140044.752503-1-kfir@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::42d; envelope-from=kfir@daynix.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 Refactoring code to avoid duplication of creating an empty PCI address code. Signed-off-by: Kfir Manor Reviewed-by: Konstantin Kostiuk --- qga/commands-win32.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ec9f55b453..a645480496 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -599,6 +599,18 @@ static void get_pci_address_for_device(GuestPCIAddress *pci, } } +static GuestPCIAddress *get_empty_pci_address(void) +{ + GuestPCIAddress *pci = NULL; + + pci = g_malloc0(sizeof(*pci)); + pci->domain = -1; + pci->slot = -1; + pci->function = -1; + pci->bus = -1; + return pci; +} + static GuestPCIAddress *get_pci_info(int number, Error **errp) { HDEVINFO dev_info = INVALID_HANDLE_VALUE; @@ -608,13 +620,7 @@ static GuestPCIAddress *get_pci_info(int number, Error **errp) SP_DEVICE_INTERFACE_DATA dev_iface_data; HANDLE dev_file; int i; - GuestPCIAddress *pci = NULL; - - pci = g_malloc0(sizeof(*pci)); - pci->domain = -1; - pci->slot = -1; - pci->function = -1; - pci->bus = -1; + GuestPCIAddress *pci = get_empty_pci_address(); dev_info = SetupDiGetClassDevs(&GUID_DEVINTERFACE_DISK, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); From patchwork Sun Nov 20 14:00:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kfir Manor X-Patchwork-Id: 1706819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20210112.gappssmtp.com header.i=@daynix-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=Kwg2YLrf; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NFXJd56pHz23mR for ; Mon, 21 Nov 2022 01:02:08 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owksW-0001M5-AO; Sun, 20 Nov 2022 09:01:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owksU-0001Ld-Hr for qemu-devel@nongnu.org; Sun, 20 Nov 2022 09:00:58 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owksS-0003z1-TR for qemu-devel@nongnu.org; Sun, 20 Nov 2022 09:00:58 -0500 Received: by mail-wm1-x332.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso11015111wme.5 for ; Sun, 20 Nov 2022 06:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fXr2yIflE9cM49dRguvSTfU6A0v+R6OEUzqbThGVfWk=; b=Kwg2YLrfhTxtzg4pKlnEp6s1bIiAMG737eK6Y6MP1c+tanfTw4t2bAP2Elb5ufo1qH vO0i+z4PFGnJmmGfA0h5IJfShs2Rn/h1yntugouMaBB9r0siCRLjcYTWkKdLZDy0UHOG 92xStgDN0HxhHREta1IJbnPdhUc7wfuX8RZHl/ubG7PEY/a098NVNnX41y9O72lat9E2 lOtgg1/aDxVZ78QdtnR21abGzf9+9a5sw3YOaduLny4hvo7qDy96O1ezxusKcHy4B71+ /RXYkf2nR8b+4sDwtGUEkZT6SUSGsgvaQtt4LV67pVmLZ7odMMJjNpS+zRpnn4KJJoER 1rkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fXr2yIflE9cM49dRguvSTfU6A0v+R6OEUzqbThGVfWk=; b=s4kagjIl9IAwYv/YlWpZ8IAs23JpqCeqpMgU8KIP1LlBHl8WlW/idIieBx4IELVshi CFSEZVsQARQByTtQ6k1Cb2WNHS4jP0VXfmBPmQwXMoj74241znxwejI0m1shbRJY92ej KRoRh5jV233NYYabyBGRW4t3v4B0XlkvWWAeXsTJTH4HoKOVqLOO9IMm1Oo4hAcPdyuI KW4aWtIrtNYFW+FFRcSlrS30ESgVHE7xaObCu21qsHeLHUQmnorePRQ+Gz3igMI9AW9A euuHnkNs4Sd3hG2jYjgNTvqRuXYXvz4i5AB9syqv+vj3x87kRncq+uflQ4PsHiyHRauM fwOA== X-Gm-Message-State: ANoB5plrDEGuQVGaAQtLW+Cu9lXeRy5XaHyZIfp8JHW1xA1g2qkmtfAS b2bhrrYxZhvHTWW20HWAGJmw+8XP0QnFEA== X-Google-Smtp-Source: AA0mqf7R/MCzOZRYZM/gW5SlexZqF1HyhdQo30vYOWXckOzlon3jUF76KGjIb4Y8ihIRyC/7GmG3VA== X-Received: by 2002:a05:600c:42d2:b0:3cf:c907:a05a with SMTP id j18-20020a05600c42d200b003cfc907a05amr13152864wme.177.1668952854274; Sun, 20 Nov 2022 06:00:54 -0800 (PST) Received: from bark.. (bzq-84-110-34-91.static-ip.bezeqint.net. [84.110.34.91]) by smtp.gmail.com with ESMTPSA id d5-20020adffbc5000000b002417e7f0685sm10432310wrs.9.2022.11.20.06.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:00:53 -0800 (PST) From: Kfir Manor To: qemu-devel@nongnu.org, Konstantin Kostiuk , Michael Roth Cc: Yan Vugenfirer Subject: [PATCH 2/2] qga:/qga-win: skip getting pci info for USB disks Date: Sun, 20 Nov 2022 16:00:44 +0200 Message-Id: <20221120140044.752503-3-kfir@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221120140044.752503-1-kfir@daynix.com> References: <20221120140044.752503-1-kfir@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::332; envelope-from=kfir@daynix.com; helo=mail-wm1-x332.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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 Skip getting PCI info from disks type USB and give them an empty PCI address instead. Signed-off-by: Kfir Manor Reviewed-by: Konstantin Kostiuk --- qga/commands-win32.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index a645480496..14c43b3de5 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -878,10 +878,14 @@ static void get_single_disk_info(int disk_number, * if that doesn't hold since that suggests some other unexpected * breakage */ - disk->pci_controller = get_pci_info(disk_number, &local_err); - if (local_err) { - error_propagate(errp, local_err); - goto err_close; + if (disk->bus_type == GUEST_DISK_BUS_TYPE_USB) { + disk->pci_controller = get_empty_pci_address(); + } else { + disk->pci_controller = get_pci_info(disk_number, &local_err); + if (local_err) { + error_propagate(errp, local_err); + goto err_close; + } } if (disk->bus_type == GUEST_DISK_BUS_TYPE_SCSI || disk->bus_type == GUEST_DISK_BUS_TYPE_IDE