|
 |
cbdfe66 |
From f32e21e2828cf7a8aba2fb27945dc46ca2debe09 Mon Sep 17 00:00:00 2001
|
|
|
cbdfe66 |
From: Amit Shah <amit.shah@redhat.com>
|
|
|
cbdfe66 |
Date: Thu, 25 Feb 2010 18:41:14 +0530
|
|
|
cbdfe66 |
Subject: [PATCH] pc: Add backward compatibility options for virtio-serial
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
virtio-serial-pci can support multiple ports in the current F-13
|
|
|
cbdfe66 |
version that will become upstream version 0.13. Add compatibility options
|
|
|
cbdfe66 |
for the 0.12, 0.11 and 0.10 pc machine types.
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
Based on upstream commit 8bfbde6d35c82cc376681289dae2de5e18a087a4
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
|
cbdfe66 |
---
|
|
|
cbdfe66 |
hw/pc.c | 28 ++++++++++++++++++++++++++++
|
|
|
cbdfe66 |
1 files changed, 28 insertions(+), 0 deletions(-)
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
diff --git a/hw/pc.c b/hw/pc.c
|
|
|
cbdfe66 |
index 26c65c1..90bbfe8 100644
|
|
|
cbdfe66 |
--- a/hw/pc.c
|
|
|
cbdfe66 |
+++ b/hw/pc.c
|
|
|
cbdfe66 |
@@ -1330,6 +1330,18 @@ static QEMUMachine pc_machine = {
|
|
|
cbdfe66 |
.desc = "Standard PC",
|
|
|
cbdfe66 |
.init = pc_init_pci,
|
|
|
cbdfe66 |
.max_cpus = 255,
|
|
|
cbdfe66 |
+ .compat_props = (GlobalProperty[]) {
|
|
|
cbdfe66 |
+ {
|
|
|
cbdfe66 |
+ .driver = "virtio-serial-pci",
|
|
|
cbdfe66 |
+ .property = "max_nr_ports",
|
|
|
cbdfe66 |
+ .value = stringify(1),
|
|
|
cbdfe66 |
+ },{
|
|
|
cbdfe66 |
+ .driver = "virtio-serial-pci",
|
|
|
cbdfe66 |
+ .property = "vectors",
|
|
|
cbdfe66 |
+ .value = stringify(0),
|
|
|
cbdfe66 |
+ },
|
|
|
cbdfe66 |
+ { /* end of list */ }
|
|
|
cbdfe66 |
+ }
|
|
|
cbdfe66 |
};
|
|
|
cbdfe66 |
|
|
|
cbdfe66 |
static QEMUMachine pc_machine_v0_11 = {
|
|
|
cbdfe66 |
@@ -1351,6 +1363,14 @@ static QEMUMachine pc_machine_v0_11 = {
|
|
|
cbdfe66 |
.property = "ver",
|
|
|
cbdfe66 |
.value = "0.11",
|
|
|
cbdfe66 |
},{
|
|
|
cbdfe66 |
+ .driver = "virtio-serial-pci",
|
|
|
cbdfe66 |
+ .property = "max_nr_ports",
|
|
|
cbdfe66 |
+ .value = stringify(1),
|
|
|
cbdfe66 |
+ },{
|
|
|
cbdfe66 |
+ .driver = "virtio-serial-pci",
|
|
|
cbdfe66 |
+ .property = "vectors",
|
|
|
cbdfe66 |
+ .value = stringify(0),
|
|
|
cbdfe66 |
+ },{
|
|
|
cbdfe66 |
.driver = "PCI",
|
|
|
cbdfe66 |
.property = "rombar",
|
|
|
cbdfe66 |
.value = stringify(0),
|
|
|
cbdfe66 |
@@ -1374,6 +1394,14 @@ static QEMUMachine pc_machine_v0_10 = {
|
|
|
cbdfe66 |
.property = "class",
|
|
|
cbdfe66 |
.value = stringify(PCI_CLASS_DISPLAY_OTHER),
|
|
|
cbdfe66 |
},{
|
|
|
cbdfe66 |
+ .driver = "virtio-serial-pci",
|
|
|
cbdfe66 |
+ .property = "max_nr_ports",
|
|
|
cbdfe66 |
+ .value = stringify(1),
|
|
|
cbdfe66 |
+ },{
|
|
|
cbdfe66 |
+ .driver = "virtio-serial-pci",
|
|
|
cbdfe66 |
+ .property = "vectors",
|
|
|
cbdfe66 |
+ .value = stringify(0),
|
|
|
cbdfe66 |
+ },{
|
|
|
cbdfe66 |
.driver = "virtio-net-pci",
|
|
|
cbdfe66 |
.property = "vectors",
|
|
|
cbdfe66 |
.value = stringify(0),
|
|
|
cbdfe66 |
--
|
|
|
cbdfe66 |
1.6.6.1
|
|
|
cbdfe66 |
|