From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id B2E3D5A0082 for ; Fri, 24 Feb 2023 19:49:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677264594; h=from:from: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; bh=WJ47ZmyqHt7szMcHKXI0NJjlb0CxLsnzCRalH6AzVQY=; b=TxE5SwhMhtEpxUTKN31Zf2JwAKTV3Fscp1P3ui9OEVWlRfiuCeL6o5gSgSxZqHf6PRROzi uCGgCJLzR4W1gnx1F1Hjms/ugOCDodZtsPEC0ooewkRDzXf1+vRx/CNAhc4FRDplDvfISf XGuImfOhAlmegkhO3HWb8gOxGnE0Guo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-640-En-cjVScMsOKxuZVdMBSjA-1; Fri, 24 Feb 2023 13:49:53 -0500 X-MC-Unique: En-cjVScMsOKxuZVdMBSjA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE936181E3EE for ; Fri, 24 Feb 2023 18:49:52 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.52]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6FCC6140EBF6 for ; Fri, 24 Feb 2023 18:49:52 +0000 (UTC) From: Andrea Bolognani To: passt-dev@passt.top Subject: [PATCH 2/5] qrap: Fix support for pc machines Date: Fri, 24 Feb 2023 19:49:46 +0100 Message-Id: <20230224184949.518615-3-abologna@redhat.com> In-Reply-To: <20230224184949.518615-1-abologna@redhat.com> References: <20230224184949.518615-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: LWVV557GYZ3YXM5FTUTVARBAH6GGHY5R X-Message-ID-Hash: LWVV557GYZ3YXM5FTUTVARBAH6GGHY5R X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The JSON version of the template is incorrect, making qrap completely unusable when JSON arguments are used together with the pc machine type. Fixes: b944ca185587 ("qrap: Support JSON syntax for -device") Signed-off-by: Andrea Bolognani --- qrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrap.c b/qrap.c index 2443fa3..5c18cec 100644 --- a/qrap.c +++ b/qrap.c @@ -94,7 +94,7 @@ static const struct pci_dev { { "pc-", "virtio-net-pci", "bus=pci.0,addr=0x", "", - "\"bus\":\"pci.0\",\"addr=0x", "", + "\"bus\":\"pci.0\",\"addr\":\"0x", "", 2, /* 1: ISA bridge */ 31 }, { -- 2.39.2