|
 |
9ae3a8 |
From c1565b1a48db60bb86d83ec00c86b6ddfaf12d62 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 2 Sep 2013 13:26:16 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 10/29] rhel6 compat: usb serial numbers
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1378128376-25930-3-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53987
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 2/2] rhel6 compat: usb serial numbers
|
|
|
9ae3a8 |
Bugzilla: 953304
|
|
|
9ae3a8 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Add serial number compat properties to the rhel6 machine types,
|
|
|
9ae3a8 |
to match rhel6 behavior. Two things we have to watch out here:
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
First the HID devices flipped serial from "1" to "42" to indicate
|
|
|
9ae3a8 |
remote wakeup capability, in RHEL-6.2.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
rhel6 commit 85ae0a096fdbc4a6f5a660bf60a74c092f9c0f7a
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Second devices get unique serial numbers, by appending host adapter
|
|
|
9ae3a8 |
pci address and port path, in RHEL-6.4, for usb-hub and usb-storage.
|
|
|
9ae3a8 |
Also usb-net + usb-serial + usb-wacom, but those are disabled in RHEL.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
rhel6 commit e91156bc452250291f72b82b43654540be7101be
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
usb-ccid has a unique serial in RHEL-7 but not in RHEL-6, so we need
|
|
|
9ae3a8 |
a compat property for all RHEL-6.x machine types.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
bugzilla: 953304
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc_piix.c | 24 ++++++++++++++++++++++++
|
|
|
9ae3a8 |
1 file changed, 24 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc_piix.c | 24 ++++++++++++++++++++++++
|
|
|
9ae3a8 |
1 files changed, 24 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
index da7701c..a19f155 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc_piix.c
|
|
|
9ae3a8 |
@@ -860,6 +860,10 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
9ae3a8 |
.driver = "486-" TYPE_X86_CPU,\
|
|
|
9ae3a8 |
.property = "level",\
|
|
|
9ae3a8 |
.value = stringify(0),\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "usb-ccid",\
|
|
|
9ae3a8 |
+ .property = "serial",\
|
|
|
9ae3a8 |
+ .value = "1",\
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void pc_init_rhel650(QEMUMachineInitArgs *args)
|
|
|
9ae3a8 |
@@ -959,6 +963,14 @@ static QEMUMachine pc_machine_rhel640 = {
|
|
|
9ae3a8 |
.driver = TYPE_X86_CPU,\
|
|
|
9ae3a8 |
.property = "pmu",\
|
|
|
9ae3a8 |
.value = "on",\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "usb-hub",\
|
|
|
9ae3a8 |
+ .property = "serial",\
|
|
|
9ae3a8 |
+ .value = "314159",\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "usb-storage",\
|
|
|
9ae3a8 |
+ .property = "serial",\
|
|
|
9ae3a8 |
+ .value = "1",\
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void pc_init_rhel630(QEMUMachineInitArgs *args)
|
|
|
9ae3a8 |
@@ -1041,6 +1053,18 @@ static QEMUMachine pc_machine_rhel620 = {
|
|
|
9ae3a8 |
.driver = "virtio-balloon-pci",\
|
|
|
9ae3a8 |
.property = "event_idx",\
|
|
|
9ae3a8 |
.value = "off",\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "usb-kbd",\
|
|
|
9ae3a8 |
+ .property = "serial",\
|
|
|
9ae3a8 |
+ .value = "1",\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "usb-mouse",\
|
|
|
9ae3a8 |
+ .property = "serial",\
|
|
|
9ae3a8 |
+ .value = "1",\
|
|
|
9ae3a8 |
+ },{\
|
|
|
9ae3a8 |
+ .driver = "usb-tablet",\
|
|
|
9ae3a8 |
+ .property = "serial",\
|
|
|
9ae3a8 |
+ .value = "1",\
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static void pc_init_rhel610(QEMUMachineInitArgs *args)
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|